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>,
	Stephen Hemminger <sthemmin@microsoft.com>
Cc: Long Li <longli@microsoft.com>
Subject: [Patch v6 13/22] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O
Date: Sat,  4 Nov 2017 22:43:55 -0700	[thread overview]
Message-ID: <20171105054404.23886-14-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171105054404.23886-1-longli@exchange.microsoft.com>

From: Long Li <longli@microsoft.com>

When connecting over SMB Direct, 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index fb2934b..25028da 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -32,6 +32,9 @@
 #include "smb2status.h"
 #include "smb2glob.h"
 #include "cifs_ioctl.h"
+#ifdef CONFIG_CIFS_SMB_DIRECT
+#include "smbdirect.h"
+#endif
 
 static int
 change_conf(struct TCP_Server_Info *server)
@@ -250,7 +253,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);
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+	if (server->rdma)
+		wsize = min_t(unsigned int,
+				wsize, server->smbd_conn->max_readwrite_size);
+#endif
 	if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU))
 		wsize = min_t(unsigned int, wsize, SMB2_MAX_BUFFER_SIZE);
 
@@ -266,6 +273,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);
+#ifdef CONFIG_CIFS_SMB_DIRECT
+	if (server->rdma)
+		rsize = min_t(unsigned int,
+				rsize, server->smbd_conn->max_readwrite_size);
+#endif
 
 	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-11-05  5:43 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-05  5:43 [Patch v6 00/22] CIFS: Implement SMB Direct protocol Long Li
2017-11-05  5:43 ` [Patch v6 01/22] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-11-05  5:43 ` [Patch v6 02/22] CIFS: SMBD: Introduce kernel config option CONFIG_CIFS_SMB_DIRECT Long Li
2017-11-05  5:43 ` [Patch v6 03/22] CIFS: SMBD: Add rdma mount option Long Li
2017-11-05  5:43 ` [Patch v6 04/22] CIFS: SMBD: Add SMB Direct protocol initial values and constants Long Li
     [not found]   ` <20171105054404.23886-5-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-20  3:53     ` Steve French
2017-11-05  5:43 ` [Patch v6 09/22] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport Long Li
2017-11-05  5:43 ` Long Li [this message]
     [not found] ` <20171105054404.23886-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-05  5:43   ` [Patch v6 05/22] CIFS: SMBD: Establish SMB Direct connection Long Li
2017-11-05  5:43   ` [Patch v6 06/22] CIFS: SMBD: export protocol initial values Long Li
2017-11-05  5:43   ` [Patch v6 07/22] CIFS: SMBD: Implement function to create a SMB Direct connection Long Li
     [not found]     ` <20171105054404.23886-8-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-20  7:38       ` Leif Sahlberg
2017-11-20 16:56     ` Steve French
2017-11-05  5:43   ` [Patch v6 08/22] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li
2017-11-05  5:43   ` [Patch v6 10/22] CIFS: SMBD: Upper layer reconnects to SMB Direct session Long Li
2017-11-05  5:43   ` [Patch v6 11/22] CIFS: SMBD: Implement function to destroy a SMB Direct connection Long Li
2017-11-05  5:43   ` [Patch v6 12/22] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount Long Li
2017-11-05  5:43   ` [Patch v6 14/22] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li
2017-11-05  5:43   ` [Patch v6 15/22] CIFS: SMBD: Upper layer receives " Long Li
2017-11-05  5:43   ` [Patch v6 16/22] CIFS: SMBD: Implement function to send data via RDMA send Long Li
2017-11-05  5:43   ` [Patch v6 17/22] CIFS: SMBD: Upper layer sends " Long Li
2017-11-05  5:44   ` [Patch v6 18/22] CIFS: SMBD: Implement RDMA memory registration Long Li
2017-11-05  5:44   ` [Patch v6 19/22] CIFS: SMBD: Upper layer performs SMB write via RDMA read through " Long Li
2017-11-05  5:44   ` [Patch v6 20/22] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-11-05  5:44   ` [Patch v6 21/22] CIFS: SMBD: Upper layer performs SMB read via RDMA write through memory registration Long Li
2017-11-05  5:44 ` [Patch v6 22/22] CIFS: SMBD: Add SMB Direct debug counters 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=20171105054404.23886-14-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=sthemmin@microsoft.com \
    --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