[2/2] RDMA/SRP: calculate max_it_iu_size if remote max_it_iu length available

Commit Message

Honggang LI Sept. 17, 2019, 1:39 a.m. UTC

From: Honggang Li <[e-mail]>

The default maximum immediate size is too big for old srp clients,
which without immediate data support.

According to the SRP and SRP-2 specifications, the IOControllerProfile
attributes for SRP target ports contains the maximum initiator to target
iu length.

The maximum initiator to target iu length can be get from the subnet
manager, such as opensm and opafm. We should calculate the
max_it_iu_size instead of the default value, when remote maximum
initiator to target iu length available.

Signed-off-by: Honggang Li <[e-mail]>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 2eadb038b257..3b0ca663c6cf 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -76,6 +76,7 @@  static bool register_always = true;
 static bool never_register;
 static int topspin_workarounds = 1;
 static uint32_t srp_opt_max_it_iu_size;
+static unsigned int srp_max_imm_data;
 
 module_param(srp_sg_tablesize, uint, 0444);
 MODULE_PARM_DESC(srp_sg_tablesize, "Deprecated name for cmd_sg_entries");
@@ -138,9 +139,9 @@  module_param_named(use_imm_data, srp_use_imm_data, bool, 0644);
 MODULE_PARM_DESC(use_imm_data,
 		 "Whether or not to request permission to use immediate data during SRP login.");
 
-static unsigned int srp_max_imm_data = 8 * 1024;
-module_param_named(max_imm_data, srp_max_imm_data, uint, 0644);
-MODULE_PARM_DESC(max_imm_data, "Maximum immediate data size.");
+static unsigned int srp_default_max_imm_data = 8 * 1024;
+module_param_named(max_imm_data, srp_default_max_imm_data, uint, 0644);
+MODULE_PARM_DESC(max_imm_data, "Default maximum immediate data size.");
 
 static unsigned ch_count;
 module_param(ch_count, uint, 0444);
@@ -1369,9 +1370,20 @@  static uint32_t srp_max_it_iu_len(int cmd_sg_cnt, bool use_imm_data)
 		sizeof(struct srp_indirect_buf) +
 		cmd_sg_cnt * sizeof(struct srp_direct_buf);
 
-	if (use_imm_data)
-		max_iu_len = max(max_iu_len, SRP_IMM_DATA_OFFSET +
-				 srp_max_imm_data);
+	if (use_imm_data) {
+		if (srp_opt_max_it_iu_size == 0) {
+			srp_max_imm_data = srp_default_max_imm_data;
+			max_iu_len = max(max_iu_len,
+			   SRP_IMM_DATA_OFFSET + srp_max_imm_data);
+		}
+		else {
+			srp_max_imm_data =
+			   srp_opt_max_it_iu_size - SRP_IMM_DATA_OFFSET;
+			max_iu_len = srp_opt_max_it_iu_size;
+		}
+		pr_debug("srp_max_imm_data = %d, max_iu_len = %d\n",
+			srp_max_imm_data, max_iu_len);
+	}
 
 	return max_iu_len;
 }
@@ -3829,6 +3841,8 @@  static ssize_t srp_create_target(struct device *dev,
 	if (ret < 0)
 		goto put;
 
+	srp_opt_max_it_iu_size = 0;
+
 	ret = srp_parse_options(target->net, buf, target);
 	if (ret)
 		goto out;