Commit 735610d0 authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: smbdirect: change smbdirect_socket_parameters.{initiator_depth,responder_resources} to __u16 



We still limit this to U8_MAX as the rdma api only uses __u8
and that's also the limit for Infiniband and RoCE*,
while iWarp would be able to support larger values at
the protocol level.

As struct smbdirect_socket_parameters will be part
of the uapi for IPPROTO_SMBDIRECT in future, change it
now even if userspace sockets won't be supported yet.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Acked-by: default avatarHenrique Carvalho <henrique.carvalho@suse.com>
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent aa43bb2c

fs/smb/common/smbdirect/smbdirect.h

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ struct smbdirect_socket_parameters { 
	__u32 resolve_route_timeout_msec;

	__u32 rdma_connect_timeout_msec;

	__u32 negotiate_timeout_msec;

	__u8  initiator_depth;

	__u8  responder_resources;

	__u16 initiator_depth;     /* limited to U8_MAX */

	__u16 responder_resources; /* limited to U8_MAX */

	__u16 recv_credit_max;

	__u16 send_credit_target;

	__u32 max_send_size;

fs/smb/common/smbdirect/smbdirect_socket.c

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ int smbdirect_socket_set_initial_parameters(struct smbdirect_socket *sc, 
	if (sp->flags & ~SMBDIRECT_FLAG_PORT_RANGE_MASK)

		return -EINVAL;



	if (sp->initiator_depth > U8_MAX)

		return -EINVAL;

	if (sp->responder_resources > U8_MAX)

		return -EINVAL;



	if (sp->flags & SMBDIRECT_FLAG_PORT_RANGE_ONLY_IB &&

	    sp->flags & SMBDIRECT_FLAG_PORT_RANGE_ONLY_IW)

		return -EINVAL;