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 v2 17/19] CIFS: SMBD: Implement SMB READ via RDMA write through memory registration
Date: Sun, 20 Aug 2017 12:04:41 -0700 [thread overview]
Message-ID: <1503255883-3041-18-git-send-email-longli@exchange.microsoft.com> (raw)
In-Reply-To: <1503255883-3041-1-git-send-email-longli@exchange.microsoft.com>
From: Long Li <longli@microsoft.com>
If I/O size is larger than rdma_readwrite_threshold, use RDMA write for SMB READ by specifying channel SMB2_CHANNEL_RDMA_V1 or SMB2_CHANNEL_RDMA_V1_INVALIDATE, depending on SMB dialect used. When RDMA write is used, there is no need to read from the transport for incoming payload. At the time SMB READ response comes back, the data is already transfered and placed in the pages by RDMA.
Signed-off-by: Long Li <longli@microsoft.com>
---
fs/cifs/file.c | 5 +++++
fs/cifs/smb2pdu.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index dec70b3..41460a5 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -42,6 +42,7 @@
#include "cifs_debug.h"
#include "cifs_fs_sb.h"
#include "fscache.h"
+#include "smbdirect.h"
static inline int cifs_convert_flags(unsigned int flags)
@@ -3037,6 +3038,8 @@ uncached_fill_pages(struct TCP_Server_Info *server,
}
if (iter)
result = copy_page_from_iter(page, 0, n, iter);
+ else if (rdata->mr)
+ result = n;
else
result = cifs_read_page_from_socket(server, page, n);
if (result < 0)
@@ -3606,6 +3609,8 @@ readpages_fill_pages(struct TCP_Server_Info *server,
if (iter)
result = copy_page_from_iter(page, 0, n, iter);
+ else if (rdata->mr)
+ result = n;
else
result = cifs_read_page_from_socket(server, page, n);
if (result < 0)
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index fbad987..1f08c75 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2392,6 +2392,39 @@ smb2_new_read_req(void **buf, unsigned int *total_len,
req->Length = cpu_to_le32(io_parms->length);
req->Offset = cpu_to_le64(io_parms->offset);
+ /*
+ * If we want to do a RDMA write, fill in and append
+ * smbd_buffer_descriptor_v1 to the end of read request
+ */
+ if (server->rdma && rdata &&
+ rdata->bytes > server->smbd_conn->rdma_readwrite_threshold) {
+
+ struct smbd_buffer_descriptor_v1 *v1;
+ bool need_invalidate =
+ io_parms->tcon->ses->server->dialect == SMB30_PROT_ID;
+
+ rdata->mr = smbd_register_mr(
+ server->smbd_conn, rdata->pages,
+ rdata->nr_pages, rdata->tailsz,
+ true, need_invalidate);
+ if (!rdata->mr)
+ return -ENOBUFS;
+
+ req->Channel = SMB2_CHANNEL_RDMA_V1_INVALIDATE;
+ if (need_invalidate)
+ req->Channel = SMB2_CHANNEL_RDMA_V1;
+ req->ReadChannelInfoOffset =
+ offsetof(struct smb2_read_plain_req, Buffer);
+ req->ReadChannelInfoLength =
+ sizeof(struct smbd_buffer_descriptor_v1);
+ v1 = (struct smbd_buffer_descriptor_v1 *) &req->Buffer[0];
+ v1->offset = rdata->mr->mr->iova;
+ v1->token = rdata->mr->mr->rkey;
+ v1->length = rdata->mr->mr->length;
+
+ *total_len += sizeof(*v1) - 1;
+ }
+
if (request_type & CHAINED_REQUEST) {
if (!(request_type & END_OF_CHAIN)) {
/* next 8-byte aligned request */
--
2.7.4
next prev parent reply other threads:[~2017-08-20 19:04 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-20 19:04 [Patch v2 00/19] CIFS: Implement SMBDirect Long Li
[not found] ` <1503255883-3041-1-git-send-email-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-20 19:04 ` [Patch v2 01/19] CIFS: Add RDMA mount option Long Li
[not found] ` <1503255883-3041-2-git-send-email-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-08-21 4:36 ` Leon Romanovsky
2017-08-21 18:18 ` Long Li
2017-08-20 19:04 ` [Patch v2 02/19] CIFS: SMBD: Add SMBDirect protocol and transport constants Long Li
2017-08-21 19:15 ` [Patch v2 00/19] CIFS: Implement SMBDirect Steve Wise
2017-08-21 19:50 ` Long Li
2017-08-21 19:56 ` Steve Wise
2017-08-21 20:23 ` Long Li
2017-08-29 18:10 ` Long Li
[not found] ` <MWHPR21MB0190050F3699CDF6F52B51A2CE9F0-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-09-05 16:30 ` Steve Wise
2017-09-05 17:42 ` Long Li
2017-08-29 18:20 ` Roland Dreier
[not found] ` <CAL1RGDUGiOqjB8n0mJmF079jm7vXrdzE2rHdzoNOexvgHScjUQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-29 19:31 ` Long Li
[not found] ` <CY4PR21MB01821B704C2F64F72A8A92A9CE9F0-kUhI0YP1syo7ifcEnHlXec1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-30 5:16 ` Stefan Metzmacher
2017-08-20 19:04 ` [Patch v2 03/19] CIFS: SMBD: " Long Li
2017-08-20 19:04 ` [Patch v2 04/19] CIFS: SMBD: Add SMBDirect transport to SMB connection and Makefile Long Li
2017-08-20 19:04 ` [Patch v2 05/19] CIFS: SMBD: Connect to SMBDirect session Long Li
2017-08-20 19:04 ` [Patch v2 06/19] CIFS: SMBD: Reconnect " Long Li
2017-08-20 19:04 ` [Patch v2 07/19] CIFS: SMBD: Destroy SMBDirect session on shutdown or umount Long Li
2017-08-20 19:04 ` [Patch v2 08/19] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O Long Li
2017-08-20 19:04 ` [Patch v2 09/19] CIFS: SMBD: Read data from SMBDirect Long Li
2017-08-20 19:04 ` [Patch v2 10/19] CIFS: SMBD: Send data through SMBDirect Long Li
2017-08-20 19:04 ` [Patch v2 11/19] CIFS: SMBD: Define memory registration for I/O data Long Li
2017-08-20 19:04 ` [Patch v2 12/19] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
2017-08-20 19:04 ` [Patch v2 13/19] CIFS: SMBD: Use registered memory RDMA read for SMB write Long Li
2017-08-23 13:52 ` Leon Romanovsky
[not found] ` <20170823135200.GP1724-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-08-23 18:09 ` Long Li
[not found] ` <MWHPR21MB0190DBBDE3317D973FEF0E43CE850-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-23 19:02 ` Leon Romanovsky
[not found] ` <20170823190214.GY1724-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-08-23 19:10 ` Long Li
[not found] ` <MWHPR21MB0190DDCDB0B5F8FED3265A60CE850-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-08-23 19:23 ` Leon Romanovsky
2017-08-23 19:39 ` Steve French
2017-08-20 19:04 ` [Patch v2 14/19] CIFS: SMBD: Deregister memory when finishing " Long Li
2017-08-20 19:04 ` [Patch v2 15/19] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-08-20 19:04 ` [Patch v2 16/19] CIFS: SMBD: Read correct returned data length for RDMA write (SMB READ) I/O Long Li
2017-08-20 19:04 ` Long Li [this message]
2017-08-20 19:04 ` [Patch v2 18/19] CIFS: SMBD: Deregister memory when finishing SMB READ Long Li
2017-08-20 19:04 ` [Patch v2 19/19] CIFS: SMBD: Add SMBDirect 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=1503255883-3041-18-git-send-email-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