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,
Tom Talpey <ttalpey@microsoft.com>,
Matthew Wilcox <mawilcox@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>
Cc: Long Li <longli@microsoft.com>
Subject: [Patch v5 17/21] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration
Date: Wed, 18 Oct 2017 16:09:16 -0700 [thread overview]
Message-ID: <20171018230920.21042-18-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171018230920.21042-1-longli@exchange.microsoft.com>
From: Long Li <longli@microsoft.com>
When sending I/O, if size is larger than rdma_readwrite_threshold we prepare
to send SMB write packet for a RDMA read via memory registration. The actual
I/O is done by remote peer through local RDMA hardware. Modify the relevant
fields in the packet accordingly, and append a smbd_buffer_descriptor_v1 to
the end of the SMB write packet.
On write I/O finish, deregister the memory region if this was for a RDMA read.
If remote invalidation is not used, the call to smbd_deregister_mr will do
local invalidation and possibly wait. Memory region is normally deregistered
in MID callback as soon as it's used. There are situations where the MID may
not be created on I/O failure, under which memory region is deregistered when
write data context is released.
Signed-off-by: Long Li <longli@microsoft.com>
---
fs/cifs/cifsglob.h | 3 +++
fs/cifs/cifssmb.c | 9 ++++++++
fs/cifs/smb2pdu.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 09f9a71..2ae7d02 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1170,6 +1170,9 @@ struct cifs_writedata {
pid_t pid;
unsigned int bytes;
int result;
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ struct smbd_mr *mr;
+#endif
unsigned int pagesz;
unsigned int tailsz;
unsigned int credits;
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5857009..08ff56a 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -43,6 +43,9 @@
#include "cifs_unicode.h"
#include "cifs_debug.h"
#include "fscache.h"
+#ifdef CONFIG_CIFS_SMB_DIRECT
+#include "smbdirect.h"
+#endif
#ifdef CONFIG_CIFS_POSIX
static struct {
@@ -1911,6 +1914,12 @@ cifs_writedata_release(struct kref *refcount)
{
struct cifs_writedata *wdata = container_of(refcount,
struct cifs_writedata, refcount);
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ if (wdata->mr) {
+ smbd_deregister_mr(wdata->mr);
+ wdata->mr = NULL;
+ }
+#endif
if (wdata->cfile)
cifsFileInfo_put(wdata->cfile);
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index bab3da6..0841aba 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -48,6 +48,9 @@
#include "smb2glob.h"
#include "cifspdu.h"
#include "cifs_spnego.h"
+#ifdef CONFIG_CIFS_SMB_DIRECT
+#include "smbdirect.h"
+#endif
/*
* The following table defines the expected "StructureSize" of SMB2 requests
@@ -2652,7 +2655,19 @@ smb2_writev_callback(struct mid_q_entry *mid)
wdata->result = -EIO;
break;
}
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ /*
+ * If this wdata has a memory registered, the MR can be freed
+ * The number of MRs available is limited, it's important to recover
+ * used MR as soon as I/O is finished. Hold MR longer in the later
+ * I/O process can possibly result in I/O deadlock due to lack of MR
+ * to send request on I/O retry
+ */
+ if (wdata->mr) {
+ smbd_deregister_mr(wdata->mr);
+ wdata->mr = NULL;
+ }
+#endif
if (wdata->result)
cifs_stats_fail_inc(tcon, SMB2_WRITE_HE);
@@ -2703,7 +2718,42 @@ smb2_async_writev(struct cifs_writedata *wdata,
req->DataOffset = cpu_to_le16(
offsetof(struct smb2_write_req, Buffer) - 4);
req->RemainingBytes = 0;
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ /*
+ * If we want to do a server RDMA read, fill in and append
+ * smbd_buffer_descriptor_v1 to the end of write request
+ */
+ if (server->rdma && wdata->bytes >=
+ server->smbd_conn->rdma_readwrite_threshold) {
+
+ struct smbd_buffer_descriptor_v1 *v1;
+ bool need_invalidate = server->dialect == SMB30_PROT_ID;
+
+ wdata->mr = smbd_register_mr(
+ server->smbd_conn, wdata->pages,
+ wdata->nr_pages, wdata->tailsz,
+ false, need_invalidate);
+ if (!wdata->mr) {
+ rc = -ENOBUFS;
+ goto async_writev_out;
+ }
+ req->Length = 0;
+ req->DataOffset = 0;
+ req->RemainingBytes =
+ (wdata->nr_pages-1)*PAGE_SIZE + wdata->tailsz;
+ req->Channel = SMB2_CHANNEL_RDMA_V1_INVALIDATE;
+ if (need_invalidate)
+ req->Channel = SMB2_CHANNEL_RDMA_V1;
+ req->WriteChannelInfoOffset =
+ offsetof(struct smb2_write_req, Buffer) - 4;
+ req->WriteChannelInfoLength =
+ sizeof(struct smbd_buffer_descriptor_v1);
+ v1 = (struct smbd_buffer_descriptor_v1 *) &req->Buffer[0];
+ v1->offset = wdata->mr->mr->iova;
+ v1->token = wdata->mr->mr->rkey;
+ v1->length = wdata->mr->mr->length;
+ }
+#endif
/* 4 for rfc1002 length field and 1 for Buffer */
iov[0].iov_len = 4;
iov[0].iov_base = req;
@@ -2716,12 +2766,22 @@ smb2_async_writev(struct cifs_writedata *wdata,
rqst.rq_npages = wdata->nr_pages;
rqst.rq_pagesz = wdata->pagesz;
rqst.rq_tailsz = wdata->tailsz;
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ if (wdata->mr) {
+ iov[1].iov_len += sizeof(struct smbd_buffer_descriptor_v1);
+ rqst.rq_npages = 0;
+ }
+#endif
cifs_dbg(FYI, "async write at %llu %u bytes\n",
wdata->offset, wdata->bytes);
+#ifdef CONFIG_CIFS_SMB_DIRECT
+ /* For RDMA read, I/O size is in RemainingBytes not in Length */
+ if (!wdata->mr)
+ req->Length = cpu_to_le32(wdata->bytes);
+#else
req->Length = cpu_to_le32(wdata->bytes);
-
+#endif
inc_rfc1001_len(&req->hdr, wdata->bytes - 1 /* Buffer */);
if (wdata->credits) {
--
2.7.4
next prev parent reply other threads:[~2017-10-18 23:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 23:08 [Patch v5 00/21] CIFS: Implement SMB Direct protocol Long Li
2017-10-18 23:09 ` [Patch v5 01/21] CIFS: SMBD: Add SMB Direct protocol initial values and constants Long Li
[not found] ` <20171018230920.21042-2-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-01 17:21 ` Steve French
[not found] ` <CAH2r5msbXygf-GaSLyy4q_k6pNR8zSKw2KwF3--oeofimdghag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-11-01 18:49 ` Long Li
2017-10-18 23:09 ` [Patch v5 03/21] CIFS: SMBD: export protocol initial values Long Li
2017-10-18 23:09 ` [Patch v5 04/21] CIFS: SMBD: Add rdma mount option Long Li
2017-10-18 23:09 ` [Patch v5 05/21] CIFS: SMBD: Implement function to create a SMB Direct connection Long Li
2017-10-18 23:09 ` [Patch v5 06/21] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li
2017-10-18 23:09 ` [Patch v5 08/21] CIFS: SMBD: Upper layer reconnects to SMB Direct session Long Li
[not found] ` <20171018230920.21042-9-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-01 18:04 ` Pavel Shilovsky
2017-11-01 19:44 ` Matthew Wilcox
[not found] ` <BN6PR21MB083455CADF03A6BD40863968CB5F0-M7qishpO4ShSLOx3ThEYWs1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-11-05 18:37 ` Long Li
[not found] ` <MWHPR21MB01904A80D5C08396A7209471CE530-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-11-05 19:19 ` Long Li
[not found] ` <MWHPR21MB019066558DAE185D630EC2E7CE530-saRRjQKJ25M/hL2NnenhuM1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-11-06 18:10 ` Matthew Wilcox
[not found] ` <DM5PR21MB08439FAD284B66941BD4E1A3CB500-wL6gkCBjFTaTOEAW4KKL081VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-11-06 18:59 ` Long Li
[not found] ` <MWHPR21MB0846AFBFCA9D6CDC97060C5DCE500-saRRjQKJ25OdAu0pOMKhMc1VXTxX1y3OvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-11-06 20:25 ` Tom Talpey
2017-11-06 20:46 ` Long Li
2017-10-18 23:09 ` [Patch v5 09/21] CIFS: SMBD: Implement function to destroy a SMB Direct connection Long Li
2017-10-18 23:09 ` [Patch v5 10/21] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount Long Li
[not found] ` <20171018230920.21042-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-18 23:09 ` [Patch v5 02/21] CIFS: SMBD: Establish SMB Direct connection Long Li
[not found] ` <20171018230920.21042-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-01 17:19 ` Pavel Shilovsky
2017-11-01 18:48 ` Long Li
2017-10-18 23:09 ` [Patch v5 07/21] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport Long Li
2017-10-18 23:09 ` [Patch v5 11/21] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O Long Li
2017-10-18 23:09 ` [Patch v5 15/21] CIFS: SMBD: Upper layer sends data via RDMA send Long Li
2017-10-18 23:09 ` [Patch v5 18/21] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-10-18 23:09 ` [Patch v5 12/21] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li
2017-10-18 23:09 ` [Patch v5 13/21] CIFS: SMBD: Upper layer receives " Long Li
2017-10-18 23:09 ` [Patch v5 14/21] CIFS: SMBD: Implement function to send data via RDMA send Long Li
2017-10-18 23:09 ` [Patch v5 16/21] CIFS: SMBD: Implement RDMA memory registration Long Li
2017-10-18 23:09 ` Long Li [this message]
2017-10-18 23:09 ` [Patch v5 19/21] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
[not found] ` <20171018230920.21042-20-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-01 16:50 ` Pavel Shilovsky
[not found] ` <CAKywueSUUgxdxcdJbpo0YJTcxauVebzO45UPLD46zzrKVurc5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-11-01 18:48 ` Long Li
2017-10-18 23:09 ` [Patch v5 20/21] CIFS: SMBD: Upper layer performs SMB read via RDMA write through memory registration Long Li
2017-10-18 23:09 ` [Patch v5 21/21] 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=20171018230920.21042-18-longli@exchange.microsoft.com \
--to=longli@exchange.microsoft.com \
--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