From: Tom Talpey <tom@talpey.com>
To: longli@microsoft.com, 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
Subject: Re: [Patch v2 08/15] CIFS: SMBD: Support page offset in RDMA send
Date: Sat, 23 Jun 2018 22:11:39 -0400 [thread overview]
Message-ID: <ad9b2249-7e26-be0d-997c-c1cc128f70d6@talpey.com> (raw)
In-Reply-To: <20180530194807.31657-9-longli@linuxonhyperv.com>
On 5/30/2018 3:48 PM, Long Li wrote:
> From: Long Li <longli@microsoft.com>
>
> The RDMA send function needs to look at offset in the request pages, and
> send data starting from there.
>
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
> fs/cifs/smbdirect.c | 27 +++++++++++++++++++--------
> 1 file changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
> index c62f7c9..6141e3c 100644
> --- a/fs/cifs/smbdirect.c
> +++ b/fs/cifs/smbdirect.c
> @@ -17,6 +17,7 @@
> #include <linux/highmem.h>
> #include "smbdirect.h"
> #include "cifs_debug.h"
> +#include "cifsproto.h"
>
> static struct smbd_response *get_empty_queue_buffer(
> struct smbd_connection *info);
> @@ -2082,7 +2083,7 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
> struct kvec vec;
> int nvecs;
> int size;
> - int buflen = 0, remaining_data_length;
> + unsigned int buflen = 0, remaining_data_length;
> int start, i, j;
> int max_iov_size =
> info->max_send_size - sizeof(struct smbd_data_transfer);
> @@ -2113,10 +2114,17 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
> buflen += iov[i].iov_len;
> }
>
> - /* add in the page array if there is one */
> + /*
> + * Add in the page array if there is one. The caller needs to set
> + * rq_tailsz to PAGE_SIZE when the buffer has multiple pages and
> + * ends at page boundary
> + */
> if (rqst->rq_npages) {
> - buflen += rqst->rq_pagesz * (rqst->rq_npages - 1);
> - buflen += rqst->rq_tailsz;
> + if (rqst->rq_npages == 1)
> + buflen += rqst->rq_tailsz;
> + else
> + buflen += rqst->rq_pagesz * (rqst->rq_npages - 1) -
> + rqst->rq_offset + rqst->rq_tailsz;
> }
This code is really confusing and redundant. It tests npages > 0,
then tests npages == 1, then does an else. Why not call the helper
like the following smbd_send()?
Tom.
>
> if (buflen + sizeof(struct smbd_data_transfer) >
> @@ -2213,8 +2221,9 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
>
> /* now sending pages if there are any */
> for (i = 0; i < rqst->rq_npages; i++) {
> - buflen = (i == rqst->rq_npages-1) ?
> - rqst->rq_tailsz : rqst->rq_pagesz;
> + unsigned int offset;
> +
> + rqst_page_get_length(rqst, i, &buflen, &offset);
> nvecs = (buflen + max_iov_size - 1) / max_iov_size;
> log_write(INFO, "sending pages buflen=%d nvecs=%d\n",
> buflen, nvecs);
> @@ -2225,9 +2234,11 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
> remaining_data_length -= size;
> log_write(INFO, "sending pages i=%d offset=%d size=%d"
> " remaining_data_length=%d\n",
> - i, j*max_iov_size, size, remaining_data_length);
> + i, j*max_iov_size+offset, size,
> + remaining_data_length);
> rc = smbd_post_send_page(
> - info, rqst->rq_pages[i], j*max_iov_size,
> + info, rqst->rq_pages[i],
> + j*max_iov_size + offset,
> size, remaining_data_length);
> if (rc)
> goto done;
>
next prev parent reply other threads:[~2018-06-24 2:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 19:47 [Patch v2 00/15] CIFS: Add direct I/O support Long Li
2018-05-30 19:47 ` [Patch v2 01/15] CIFS: Introduce offset for the 1st page in data transfer structures Long Li
2018-05-30 19:47 ` [Patch v2 02/15] CIFS: Add support for direct pages in rdata Long Li
2018-05-30 20:27 ` Ruhl, Michael J
2018-05-30 20:57 ` Long Li
2018-06-24 1:50 ` Tom Talpey
2018-06-25 20:25 ` Long Li
2018-06-25 21:01 ` Jason Gunthorpe
2018-06-26 15:13 ` Tom Talpey
2018-06-27 3:21 ` Long Li
2018-05-30 19:47 ` [Patch v2 03/15] CIFS: Use offset when reading pages Long Li
2018-06-24 1:58 ` Tom Talpey
2018-06-25 20:27 ` Long Li
2018-05-30 19:47 ` [Patch v2 04/15] CIFS: Add support for direct pages in wdata Long Li
2018-06-24 2:01 ` Tom Talpey
2018-06-25 20:34 ` Long Li
2018-05-30 19:47 ` [Patch v2 05/15] CIFS: Calculate the correct request length based on page offset and tail size Long Li
2018-06-24 2:07 ` Tom Talpey
2018-06-25 21:07 ` Long Li
2018-05-30 19:47 ` [Patch v2 06/15] CIFS: Introduce helper function to get page offset and length in smb_rqst Long Li
2018-06-24 2:09 ` Tom Talpey
2018-06-25 21:14 ` Long Li
2018-06-26 13:16 ` Tom Talpey
2018-06-27 3:24 ` Long Li
2018-05-30 19:47 ` [Patch v2 07/15] CIFS: When sending data on socket, pass the correct page offset Long Li
2018-05-30 19:48 ` [Patch v2 08/15] CIFS: SMBD: Support page offset in RDMA send Long Li
2018-06-24 2:11 ` Tom Talpey [this message]
2018-06-25 21:23 ` Long Li
2018-05-30 19:48 ` [Patch v2 09/15] CIFS: SMBD: Support page offset in RDMA recv Long Li
2018-06-24 2:16 ` Tom Talpey
2018-06-25 21:29 ` Long Li
2018-05-30 19:48 ` [Patch v2 10/15] CIFS: SMBD: Support page offset in memory registration Long Li
2018-06-24 2:24 ` Tom Talpey
2018-05-30 19:48 ` [Patch v2 11/15] CIFS: Pass page offset for calculating signature Long Li
2018-06-24 2:27 ` Tom Talpey
2018-06-26 4:15 ` Long Li
2018-05-30 19:48 ` [Patch v2 12/15] CIFS: Pass page offset for encrypting Long Li
2018-06-24 2:28 ` Tom Talpey
2018-05-30 19:48 ` [Patch v2 13/15] CIFS: Add support for direct I/O read Long Li
2018-06-02 5:51 ` kbuild test robot
2018-06-02 7:15 ` kbuild test robot
2018-06-24 2:39 ` Tom Talpey
2018-06-26 4:34 ` Long Li
2018-05-30 19:48 ` [Patch v2 14/15] CIFS: Add support for direct I/O write Long Li
2018-06-24 2:48 ` Tom Talpey
2018-06-26 4:39 ` Long Li
2018-06-26 13:29 ` Tom Talpey
2018-06-27 3:44 ` Long Li
2018-05-30 19:48 ` [Patch v2 15/15] CIFS: Add direct I/O functions to file_operations Long Li
2018-06-07 11:17 ` Pavel Shilovsky
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=ad9b2249-7e26-be0d-997c-c1cc128f70d6@talpey.com \
--to=tom@talpey.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
/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).