diff mbox series

scsi: target: cxgbit: increase max DataSegmentLength

Message ID 1634135087-4996-1-git-send-email-varun@chelsio.com (mailing list archive)
State Accepted
Commit 7f96c7a67e4018317570bb8678e1c44265aba897
Headers show
Series scsi: target: cxgbit: increase max DataSegmentLength | expand

Commit Message

Varun Prakash Oct. 13, 2021, 2:24 p.m. UTC
Current value of max DataSegmentLength is 8K, T5/T6 adapters supports
max DataSegmentLength upto 16K, so increase max DataSegmentLength.

Signed-off-by: Varun Prakash <varun@chelsio.com>
---
 drivers/target/iscsi/cxgbit/cxgbit_main.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Comments

Martin K. Petersen Oct. 17, 2021, 2:44 a.m. UTC | #1
Varun,

> Current value of max DataSegmentLength is 8K, T5/T6 adapters supports
> max DataSegmentLength upto 16K, so increase max DataSegmentLength.

Applied to 5.16/scsi-staging, thanks!
Martin K. Petersen Oct. 21, 2021, 3:42 a.m. UTC | #2
On Wed, 13 Oct 2021 19:54:47 +0530, Varun Prakash wrote:

> Current value of max DataSegmentLength is 8K, T5/T6 adapters supports
> max DataSegmentLength upto 16K, so increase max DataSegmentLength.
> 
> 

Applied to 5.16/scsi-queue, thanks!

[1/1] scsi: target: cxgbit: increase max DataSegmentLength
      https://git.kernel.org/mkp/scsi/c/7f96c7a67e40
diff mbox series

Patch

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_main.c b/drivers/target/iscsi/cxgbit/cxgbit_main.c
index bd37f2a..c6678dc 100644
--- a/drivers/target/iscsi/cxgbit/cxgbit_main.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_main.c
@@ -33,11 +33,18 @@  static void cxgbit_set_mdsl(struct cxgbit_device *cdev)
 	struct cxgb4_lld_info *lldi = &cdev->lldi;
 	u32 mdsl;
 
-#define ULP2_MAX_PKT_LEN 16224
-#define ISCSI_PDU_NONPAYLOAD_LEN 312
-	mdsl = min_t(u32, lldi->iscsi_iolen - ISCSI_PDU_NONPAYLOAD_LEN,
-		     ULP2_MAX_PKT_LEN - ISCSI_PDU_NONPAYLOAD_LEN);
-	mdsl = min_t(u32, mdsl, 8192);
+#define CXGBIT_T5_MAX_PDU_LEN 16224
+#define CXGBIT_PDU_NONPAYLOAD_LEN 312 /* 48(BHS) + 256(AHS) + 8(Digest) */
+	if (is_t5(lldi->adapter_type)) {
+		mdsl = min_t(u32, lldi->iscsi_iolen - CXGBIT_PDU_NONPAYLOAD_LEN,
+			     CXGBIT_T5_MAX_PDU_LEN - CXGBIT_PDU_NONPAYLOAD_LEN);
+	} else {
+		mdsl = lldi->iscsi_iolen - CXGBIT_PDU_NONPAYLOAD_LEN;
+		mdsl = min(mdsl, 16384U);
+	}
+
+	mdsl = round_down(mdsl, 4);
+	mdsl = min_t(u32, mdsl, 4 * PAGE_SIZE);
 	mdsl = min_t(u32, mdsl, (MAX_SKB_FRAGS - 1) * PAGE_SIZE);
 
 	cdev->mdsl = mdsl;