public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
From: Long Li <longli@exchange.microsoft.com>
To: Steve French <sfrench@samba.org>,
	linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
	linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>,
	Tom Talpey <ttalpey@microsoft.com>,
	Matthew Wilcox <mawilcox@microsoft.com>
Cc: Long Li <longli@microsoft.com>
Subject: [Patch v3 08/19] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O
Date: Tue, 29 Aug 2017 12:29:04 -0700	[thread overview]
Message-ID: <20170829192915.26251-9-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20170829192915.26251-1-longli@exchange.microsoft.com>

From: Long Li <longli@microsoft.com>

When connecting over SMBDirect, the transport negotiates its maximum I/O sizes
with the server and determines how to choose to do RDMA send/recv vs
read/write. Expose these maximum I/O sizes to upper layer so we will get the
correct sized payloads.

Signed-off-by: Long Li <longli@microsoft.com>
---
 fs/cifs/smb2ops.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 06494e1..e67f5f0 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -32,6 +32,7 @@
 #include "smb2status.h"
 #include "smb2glob.h"
 #include "cifs_ioctl.h"
+#include "smbdirect.h"
 
 static int
 change_conf(struct TCP_Server_Info *server)
@@ -249,7 +250,11 @@ smb2_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
 
 	/* start with specified wsize, or default */
 	wsize = volume_info->wsize ? volume_info->wsize : CIFS_DEFAULT_IOSIZE;
-	wsize = min_t(unsigned int, wsize, server->max_write);
+	if (server->rdma)
+		wsize = min_t(unsigned int,
+				wsize, server->smbd_conn->max_readwrite_size);
+	else
+		wsize = min_t(unsigned int, wsize, server->max_write);
 
 	if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU))
 		wsize = min_t(unsigned int, wsize, SMB2_MAX_BUFFER_SIZE);
@@ -265,7 +270,11 @@ smb2_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
 
 	/* start with specified rsize, or default */
 	rsize = volume_info->rsize ? volume_info->rsize : CIFS_DEFAULT_IOSIZE;
-	rsize = min_t(unsigned int, rsize, server->max_read);
+	if (server->rdma)
+		rsize = min_t(unsigned int,
+				rsize, server->smbd_conn->max_readwrite_size);
+	else
+		rsize = min_t(unsigned int, rsize, server->max_read);
 
 	if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU))
 		rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE);
-- 
2.7.4

  parent reply	other threads:[~2017-08-29 19:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-29 19:28 [Patch v3 00/19] CIFS: Implement SMB Direct Long Li
2017-08-29 19:28 ` [Patch v3 02/19] CIFS: SMBD: Add SMBDirect protocol and transport constants Long Li
     [not found]   ` <20170829192915.26251-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 22:44     ` Pavel Shilovsky
     [not found]       ` <CAKywueQ3Vz9NUwfqgk36pnaXN=r3DDrrNAumMP418EkcXQPT9g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 23:00         ` Long Li
     [not found]           ` <MWHPR21MB0190D3CB134749B54A0F709ECE9F0-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-30 18:19             ` Pavel Shilovsky
     [not found]               ` <CAKywueTyhmP+p=bLCmvK8pzGNKRfeh1x_B9OGWKzt77eAz3Sdg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30 18:24                 ` Long Li
     [not found]                   ` <MWHPR21MB01907DFB1D1CBEDB17FD995ECE9C0-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-30 18:30                     ` Pavel Shilovsky
2017-09-01 15:48                       ` Steve French
2017-08-29 19:28 ` [Patch v3 03/19] CIFS: SMBD: Implement SMBDirect transport Long Li
2017-08-29 19:29 ` [Patch v3 04/19] CIFS: SMBD: Add SMBDirect transport to SMB connection and Makefile Long Li
     [not found]   ` <20170829192915.26251-5-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 23:11     ` Pavel Shilovsky
     [not found]       ` <CAKywueRaTqR1yw_PbdcOYQTY9msweboej_6ZPcbsuyJfmiVgng-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 23:14         ` Long Li
2017-08-29 19:29 ` [Patch v3 05/19] CIFS: SMBD: Connect to SMBDirect session Long Li
2017-08-29 19:29 ` [Patch v3 06/19] CIFS: SMBD: Reconnect " Long Li
     [not found]   ` <20170829192915.26251-7-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 23:15     ` Pavel Shilovsky
2017-08-29 23:39       ` Long Li
2017-08-29 19:29 ` Long Li [this message]
2017-08-29 19:29 ` [Patch v3 10/19] CIFS: SMBD: Send data through SMBDirect Long Li
2017-08-29 19:29 ` [Patch v3 11/19] CIFS: SMBD: Define memory registration for I/O data Long Li
     [not found]   ` <20170829192915.26251-12-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-30  0:48     ` Pavel Shilovsky
     [not found]       ` <CAKywueSMXWN1tsHbFDGK9d9STL1qcC9G_VMfV2hz9YZhxhhH+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30  2:12         ` Long Li
2017-08-29 19:29 ` [Patch v3 14/19] CIFS: SMBD: Deregister memory on finishing SMB write Long Li
2017-08-29 19:29 ` [Patch v3 15/19] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-08-29 19:29 ` [Patch v3 19/19] CIFS: SMBD: Add SMBDirect debug counters Long Li
     [not found] ` <20170829192915.26251-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 19:28   ` [Patch v3 01/19] CIFS: Add rdma mount option Long Li
     [not found]     ` <20170829192915.26251-2-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-29 22:37       ` Pavel Shilovsky
     [not found]         ` <CAKywueRsjjG6BDbkZL_qeVn3V129N2OFwAaw60ZeZXmWbX-32A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 22:56           ` Long Li
2017-08-29 19:29   ` [Patch v3 07/19] CIFS: SMBD: Destroy SMBDirect session on shutdown or umount Long Li
2017-08-29 19:29   ` [Patch v3 09/19] CIFS: SMBD: Receive data from SMBDirect Long Li
2017-08-29 19:29   ` [Patch v3 12/19] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
     [not found]     ` <20170829192915.26251-13-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-30  0:50       ` Pavel Shilovsky
     [not found]         ` <CAKywueS4=RzCyodOYKDPEWvRrgpwsAX+s+v2KwfbrJWDTy10qg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-30  2:11           ` Long Li
2017-08-29 19:29   ` [Patch v3 13/19] CIFS: SMBD: Implement SMB write via RDMA read through memory registration Long Li
2017-08-29 19:29   ` [Patch v3 16/19] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-08-29 19:29   ` [Patch v3 17/19] CIFS: SMBD: Implement SMB read via RDMA write through memory registration Long Li
2017-08-29 19:29   ` [Patch v3 18/19] CIFS: SMBD: Deregister memory when finishing SMB read Long Li
2017-08-30 18:40   ` [Patch v3 00/19] CIFS: Implement SMB Direct Long Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170829192915.26251-9-longli@exchange.microsoft.com \
    --to=longli@exchange.microsoft.com \
    --cc=hch@infradead.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=longli@microsoft.com \
    --cc=mawilcox@microsoft.com \
    --cc=samba-technical@lists.samba.org \
    --cc=sfrench@samba.org \
    --cc=ttalpey@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox