Skip to content

Commit 4a93d1e

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: correct value for smbd_max_fragmented_recv_size
When we download a file without rdma offload or get a large directly enumeration from the server, the server might want to send up to smbd_max_fragmented_recv_size bytes, but if it is too large all our recv buffers might already be moved to the recv_io.reassembly.list and we're no longer able to grant recv credits. The maximum fragmented upper-layer payload receive size supported Assume max_payload_per_credit is smbd_max_receive_size - 24 = 1340 The maximum number would be smbd_receive_credit_max * max_payload_per_credit 1340 * 255 = 341700 (0x536C4) The minimum value from the spec is 131072 (0x20000) For now we use the logic we used in ksmbd before: (1364 * 255) / 2 = 173910 (0x2A756) Fixes: 03bee01 ("CIFS: SMBD: Add SMB Direct protocol initial values and constants") 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: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 77ffbca commit 4a93d1e

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

fs/smb/client/smbdirect.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,23 @@ int smbd_send_credit_target = 255;
101101
/* The maximum single message size can be sent to remote peer */
102102
int smbd_max_send_size = 1364;
103103

104-
/* The maximum fragmented upper-layer payload receive size supported */
105-
int smbd_max_fragmented_recv_size = 1024 * 1024;
104+
/*
105+
* The maximum fragmented upper-layer payload receive size supported
106+
*
107+
* Assume max_payload_per_credit is
108+
* smbd_max_receive_size - 24 = 1340
109+
*
110+
* The maximum number would be
111+
* smbd_receive_credit_max * max_payload_per_credit
112+
*
113+
* 1340 * 255 = 341700 (0x536C4)
114+
*
115+
* The minimum value from the spec is 131072 (0x20000)
116+
*
117+
* For now we use the logic we used in ksmbd before:
118+
* (1364 * 255) / 2 = 173910 (0x2A756)
119+
*/
120+
int smbd_max_fragmented_recv_size = (1364 * 255) / 2;
106121

107122
/* The maximum single-message size which can be received */
108123
int smbd_max_receive_size = 1364;

0 commit comments

Comments
 (0)