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 01/22] CIFS: SMBD: Add parameter rdata to smb2_new_read_req
Date: Sat, 4 Nov 2017 22:43:43 -0700 [thread overview]
Message-ID: <20171105054404.23886-2-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171105054404.23886-1-longli@exchange.microsoft.com>
From: Long Li <longli@microsoft.com>
This patch is for preparing upper layer for doing SMB read via RDMA write.
When the SMB read packet header is assembled, SMB Direct code needs to know
the I/O layout if this request is to use a RDMA write. rdata has all the
information of I/O layout for memory registration.
Add rdata to smb2_new_read_req.
Signed-off-by: Long Li <longli@microsoft.com>
---
fs/cifs/smb2pdu.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index bab3da6..32ad590 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2350,18 +2350,21 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
*/
static int
smb2_new_read_req(void **buf, unsigned int *total_len,
- struct cifs_io_parms *io_parms, unsigned int remaining_bytes,
- int request_type)
+ struct cifs_io_parms *io_parms, struct cifs_readdata *rdata,
+ unsigned int remaining_bytes, int request_type)
{
int rc = -EACCES;
struct smb2_read_plain_req *req = NULL;
struct smb2_sync_hdr *shdr;
+ struct TCP_Server_Info *server;
rc = smb2_plain_req_init(SMB2_READ, io_parms->tcon, (void **) &req,
total_len);
if (rc)
return rc;
- if (io_parms->tcon->ses->server == NULL)
+
+ server = io_parms->tcon->ses->server;
+ if (server == NULL)
return -ECONNABORTED;
shdr = &req->sync_hdr;
@@ -2489,7 +2492,8 @@ smb2_async_readv(struct cifs_readdata *rdata)
server = io_parms.tcon->ses->server;
- rc = smb2_new_read_req((void **) &buf, &total_len, &io_parms, 0, 0);
+ rc = smb2_new_read_req(
+ (void **) &buf, &total_len, &io_parms, rdata, 0, 0);
if (rc) {
if (rc == -EAGAIN && rdata->credits) {
/* credits was reset by reconnect */
@@ -2557,7 +2561,7 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
struct cifs_ses *ses = io_parms->tcon->ses;
*nbytes = 0;
- rc = smb2_new_read_req((void **)&req, &total_len, io_parms, 0, 0);
+ rc = smb2_new_read_req((void **)&req, &total_len, io_parms, NULL, 0, 0);
if (rc)
return rc;
--
2.7.4
next prev parent reply other threads:[~2017-11-05 5:49 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 ` Long Li [this message]
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
2017-11-20 3:53 ` Steve French
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
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 09/22] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport 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 13/22] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O 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-2-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;
as well as URLs for NNTP newsgroup(s).