Linux CIFS filesystem development
 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 v4 19/22] CIFS: SMBD: Add parameter rdata to smb2_new_read_req
Date: Sun,  1 Oct 2017 19:30:27 -0700	[thread overview]
Message-ID: <20171002023030.3582-20-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171002023030.3582-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 we assemble the SMB read packet header, we need to know the I/O layout
if this request is to use a RDMA write. rdata has all the information we need
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 6089957..7053db9 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2351,18 +2351,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;
@@ -2490,7 +2493,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 */
@@ -2558,7 +2562,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

  parent reply	other threads:[~2017-10-02  2:30 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-02  2:30 [Patch v4 00/22] CIFS: Implement SMBDirect Long Li
2017-10-02  2:30 ` [Patch v4 01/22] CIFS: SMBD: Add SMBDirect protocol initial values and constants Long Li
2017-10-02  2:30 ` [Patch v4 02/22] CIFS: SMBD: Establish SMBDirect connection Long Li
     [not found]   ` <20171002023030.3582-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04 11:01     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 03/22] CIFS: SMBD: export protocol initial values Long Li
2017-10-02  2:30 ` [Patch v4 04/22] CIFS: SMBD: Add rdma mount option Long Li
     [not found] ` <20171002023030.3582-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-02  2:30   ` [Patch v4 05/22] CIFS: SMBD: Implement function to create a SMBDirect connection Long Li
2017-10-02  2:30   ` [Patch v4 06/22] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li
2017-10-02  2:30   ` [Patch v4 07/22] CIFS: SMBD: Implement function to reconnect to a SMBDirect transport Long Li
2017-10-02  2:30   ` [Patch v4 10/22] CIFS: SMBD: Upper layer destroys SMBDirect session on shutdown or umount Long Li
2017-10-02  2:30   ` [Patch v4 13/22] CIFS: SMBD: Upper layer receives data via RDMA receive Long Li
2017-10-02  2:30   ` [Patch v4 18/22] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration Long Li
2017-10-02  2:30   ` [Patch v4 21/22] CIFS: SMBD: Upper layer performs SMB read via RDMA write " Long Li
2017-10-02  2:30 ` [Patch v4 08/22] CIFS: SMBD: Upper layer reconnects to SMBDirect session Long Li
2017-10-02  2:30 ` [Patch v4 09/22] CIFS: SMBD: Implement function to destroy a SMBDirect connection Long Li
2017-10-02  2:30 ` [Patch v4 11/22] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O Long Li
2017-10-02  2:30 ` [Patch v4 12/22] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li
     [not found]   ` <20171002023030.3582-13-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04  9:43     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 14/22] CIFS: SMBD: Implement function to send data via RDMA send Long Li
     [not found]   ` <20171002023030.3582-15-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04  9:43     ` kbuild test robot
2017-10-04 10:05     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 15/22] CIFS: SMBD: Upper layer sends " Long Li
2017-10-02  2:30 ` [Patch v4 16/22] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
     [not found]   ` <20171002023030.3582-17-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04 22:07     ` Steve French
2017-10-02  2:30 ` [Patch v4 17/22] CIFS: SMBD: Implement RDMA memory registration Long Li
2017-10-04 14:08   ` kbuild test robot
2017-10-02  2:30 ` Long Li [this message]
2017-10-02  2:30 ` [Patch v4 20/22] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-10-02  2:30 ` [Patch v4 22/22] 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=20171002023030.3582-20-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