Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 24 Apr 2021 00:43:16 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f0077b4c1dcf - stable/13 - mpt(4): Remove incorrect S/G segments limits.
Message-ID:  <202104240043.13O0hGoC091881@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch stable/13 has been updated by mav:

URL: https://cgit.FreeBSD.org/src/commit/?id=f0077b4c1dcfa7eda6efadf197e8423fe002ac5d

commit f0077b4c1dcfa7eda6efadf197e8423fe002ac5d
Author:     Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-04-17 14:41:35 +0000
Commit:     Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-04-24 00:43:14 +0000

    mpt(4): Remove incorrect S/G segments limits.
    
    First, two of those four checks are unreachable.
    Second, I don't believe there should be ">=" instead of ">".
    Third, bus_dma(9) already returns the same EFBIG if ">".
    
    This fixes false I/O errors in worst S/G cases with maxphys >= 2MB.
    
    MFC after:      1 week
    
    (cherry picked from commit 0f29396e493bd87ffa6a63fcb602b12e79d21a1e)
---
 sys/dev/mpt/mpt_cam.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 90c84eee2442..64776d673674 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -1292,10 +1292,6 @@ mpt_execute_req_a64(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 	hdrp = req->req_vbuf;
 	mpt_off = req->req_vbuf;
 
-	if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) {
-		error = EFBIG;
-	}
-
 	if (error == 0) {
 		switch (hdrp->Function) {
 		case MPI_FUNCTION_SCSI_IO_REQUEST:
@@ -1315,12 +1311,6 @@ mpt_execute_req_a64(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 		}
 	}
 
-	if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) {
-		error = EFBIG;
-		mpt_prt(mpt, "segment count %d too large (max %u)\n",
-		    nseg, mpt->max_seg_cnt);
-	}
-
 bad:
 	if (error != 0) {
 		if (error != EFBIG && error != ENOMEM) {
@@ -1694,10 +1684,6 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 	hdrp = req->req_vbuf;
 	mpt_off = req->req_vbuf;
 
-	if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) {
-		error = EFBIG;
-	}
-
 	if (error == 0) {
 		switch (hdrp->Function) {
 		case MPI_FUNCTION_SCSI_IO_REQUEST:
@@ -1716,12 +1702,6 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 		}
 	}
 
-	if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) {
-		error = EFBIG;
-		mpt_prt(mpt, "segment count %d too large (max %u)\n",
-		    nseg, mpt->max_seg_cnt);
-	}
-
 bad:
 	if (error != 0) {
 		if (error != EFBIG && error != ENOMEM) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104240043.13O0hGoC091881>