[v3,1/2] RDMA/srp: Add parse function for maximum initiator to target IU size
diff mbox series

Message ID 20190919035032.31373-1-honli@redhat.com
State Superseded
Headers show
Series
  • [v3,1/2] RDMA/srp: Add parse function for maximum initiator to target IU size
Related show

Commit Message

Honggang LI Sept. 19, 2019, 3:50 a.m. UTC
From: Honggang Li <honli@redhat.com>

According to SRP specifications 'srp-r16a' and 'srp2r06',
IOControllerProfile attributes for SRP target port include
the maximum initiator to target IU size.

SRP connection daemons, such as srp_daemon, can get the value
from subnet manager. The SRP connection daemon can pass this
value to kernel.

This patch add parse function for it.

Upstream commit [1] enables the kernel parameter, 'use_imm_data',
by default. [1] also use (8 * 1024) as the default value for
kernel parameter 'max_imm_data'. With those default values, the
maximum initiator to target IU size will be 8260.

In case the SRPT modules, which include the in-tree 'ib_srpt.ko'
module, do not support SRP-2 'immediate data' feature, the default
maximum initiator to target IU size is significantly smaller than
8260. For 'ib_srpt.ko' module, which built from source before
[2], the default maximum initiator to target IU is 2116.

[1] introduces a regression issue for old srp target with default
kernel parameters, as the connection will be reject because of
too large maximum initiator to target IU size.

[1] commit 882981f4a411 ("RDMA/srp: Add support for immediate data")
[2] commit 5dabcd0456d7 ("RDMA/srpt: Add support for immediate data")

Signed-off-by: Honggang Li <honli@redhat.com>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 10 ++++++++++
 drivers/infiniband/ulp/srp/ib_srp.h |  1 +
 2 files changed, 11 insertions(+)

Comments

Bart Van Assche Sept. 20, 2019, 4:11 p.m. UTC | #1
On 9/18/19 8:50 PM, Honggang LI wrote:
> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
> index b5960351bec0..b829dab0df77 100644
> --- a/drivers/infiniband/ulp/srp/ib_srp.c
> +++ b/drivers/infiniband/ulp/srp/ib_srp.c
> @@ -3411,6 +3411,7 @@ enum {
>   	SRP_OPT_IP_SRC		= 1 << 15,
>   	SRP_OPT_IP_DEST		= 1 << 16,
>   	SRP_OPT_TARGET_CAN_QUEUE= 1 << 17,
> +	SRP_OPT_MAX_IT_IU_SIZE  = 1 << 18,
>   };
>   
>   static unsigned int srp_opt_mandatory[] = {
> @@ -3443,6 +3444,7 @@ static const match_table_t srp_opt_tokens = {
>   	{ SRP_OPT_QUEUE_SIZE,		"queue_size=%d"		},
>   	{ SRP_OPT_IP_SRC,		"src=%s"		},
>   	{ SRP_OPT_IP_DEST,		"dest=%s"		},
> +	{ SRP_OPT_MAX_IT_IU_SIZE,	"max_it_iu_size=%d"	},
>   	{ SRP_OPT_ERR,			NULL 			}
>   };
>   
> @@ -3736,6 +3738,14 @@ static int srp_parse_options(struct net *net, const char *buf,
>   			target->tl_retry_count = token;
>   			break;
>   
> +		case SRP_OPT_MAX_IT_IU_SIZE:
> +			if (match_int(args, &token) || token < 0) {
> +				pr_warn("bad maximum initiator to target IU size '%s'\n", p);
> +				goto out;
> +			}
> +			target->max_it_iu_size = token;
> +			break;
> +
>   		default:
>   			pr_warn("unknown parameter or missing value '%s' in target creation request\n",
>   				p);
> diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
> index b2861cd2087a..105b2bc6aa2f 100644
> --- a/drivers/infiniband/ulp/srp/ib_srp.h
> +++ b/drivers/infiniband/ulp/srp/ib_srp.h
> @@ -209,6 +209,7 @@ struct srp_target_port {
>   	u32			ch_count;
>   	u32			lkey;
>   	enum srp_target_state	state;
> +	uint32_t		max_it_iu_size;
>   	unsigned int		cmd_sg_cnt;
>   	unsigned int		indirect_size;
>   	bool			allow_ext_sg;
> 

Something I forgot to mention last time: since this patch adds a new 
login parameter Documentation/ABI/stable/sysfs-driver-ib_srp should be 
updated. I don't have a strong opinion about whether that should happen 
through a separate patch or not. Since the code changes look fine to me:

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Honggang LI Sept. 23, 2019, 3:30 a.m. UTC | #2
On Fri, Sep 20, 2019 at 09:11:06AM -0700, Bart Van Assche wrote:
> 
> Something I forgot to mention last time: since this patch adds a new login
> parameter Documentation/ABI/stable/sysfs-driver-ib_srp should be updated. I

I will submit a new patch to update 'sysfs-driver-ib_srp'.

thanks
Bart Van Assche Sept. 23, 2019, 3:12 p.m. UTC | #3
On 9/22/19 8:30 PM, Honggang LI wrote:
> On Fri, Sep 20, 2019 at 09:11:06AM -0700, Bart Van Assche wrote:
>>
>> Something I forgot to mention last time: since this patch adds a new login
>> parameter Documentation/ABI/stable/sysfs-driver-ib_srp should be updated. I
> 
> I will submit a new patch to update 'sysfs-driver-ib_srp'.

Thanks!

Bart.

Patch
diff mbox series

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index b5960351bec0..b829dab0df77 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3411,6 +3411,7 @@  enum {
 	SRP_OPT_IP_SRC		= 1 << 15,
 	SRP_OPT_IP_DEST		= 1 << 16,
 	SRP_OPT_TARGET_CAN_QUEUE= 1 << 17,
+	SRP_OPT_MAX_IT_IU_SIZE  = 1 << 18,
 };
 
 static unsigned int srp_opt_mandatory[] = {
@@ -3443,6 +3444,7 @@  static const match_table_t srp_opt_tokens = {
 	{ SRP_OPT_QUEUE_SIZE,		"queue_size=%d"		},
 	{ SRP_OPT_IP_SRC,		"src=%s"		},
 	{ SRP_OPT_IP_DEST,		"dest=%s"		},
+	{ SRP_OPT_MAX_IT_IU_SIZE,	"max_it_iu_size=%d"	},
 	{ SRP_OPT_ERR,			NULL 			}
 };
 
@@ -3736,6 +3738,14 @@  static int srp_parse_options(struct net *net, const char *buf,
 			target->tl_retry_count = token;
 			break;
 
+		case SRP_OPT_MAX_IT_IU_SIZE:
+			if (match_int(args, &token) || token < 0) {
+				pr_warn("bad maximum initiator to target IU size '%s'\n", p);
+				goto out;
+			}
+			target->max_it_iu_size = token;
+			break;
+
 		default:
 			pr_warn("unknown parameter or missing value '%s' in target creation request\n",
 				p);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index b2861cd2087a..105b2bc6aa2f 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -209,6 +209,7 @@  struct srp_target_port {
 	u32			ch_count;
 	u32			lkey;
 	enum srp_target_state	state;
+	uint32_t		max_it_iu_size;
 	unsigned int		cmd_sg_cnt;
 	unsigned int		indirect_size;
 	bool			allow_ext_sg;