diff options
| author | Long Li | 2018-05-30 21:48:02 +0200 |
|---|---|---|
| committer | Steve French | 2018-06-06 00:43:59 +0200 |
| commit | 7cf20bce77581bb72af72835e73c9a47d4346b70 (patch) | |
| tree | f74855aad9bed242d7ace9e8af7a5121f8dce23e /fs/cifs/smb2pdu.c | |
| parent | CIFS: SMBD: Support page offset in RDMA recv (diff) | |
| download | kernel-qcow2-linux-7cf20bce77581bb72af72835e73c9a47d4346b70.tar.gz kernel-qcow2-linux-7cf20bce77581bb72af72835e73c9a47d4346b70.tar.xz kernel-qcow2-linux-7cf20bce77581bb72af72835e73c9a47d4346b70.zip | |
CIFS: SMBD: Support page offset in memory registration
Change code to pass the correct page offset during memory registration for
RDMA read/write.
Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index e7a40703028f..92e54b1638be 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2720,8 +2720,8 @@ smb2_new_read_req(void **buf, unsigned int *total_len, rdata->mr = smbd_register_mr( server->smbd_conn, rdata->pages, - rdata->nr_pages, rdata->tailsz, - true, need_invalidate); + rdata->nr_pages, rdata->page_offset, + rdata->tailsz, true, need_invalidate); if (!rdata->mr) return -ENOBUFS; @@ -3107,16 +3107,22 @@ smb2_async_writev(struct cifs_writedata *wdata, wdata->mr = smbd_register_mr( server->smbd_conn, wdata->pages, - wdata->nr_pages, wdata->tailsz, - false, need_invalidate); + wdata->nr_pages, wdata->page_offset, + wdata->tailsz, false, need_invalidate); if (!wdata->mr) { rc = -ENOBUFS; goto async_writev_out; } req->Length = 0; req->DataOffset = 0; - req->RemainingBytes = - cpu_to_le32((wdata->nr_pages-1)*PAGE_SIZE + wdata->tailsz); + if (wdata->nr_pages > 1) + req->RemainingBytes = + cpu_to_le32( + (wdata->nr_pages - 1) * wdata->pagesz - + wdata->page_offset + wdata->tailsz + ); + else + req->RemainingBytes = cpu_to_le32(wdata->tailsz); req->Channel = SMB2_CHANNEL_RDMA_V1_INVALIDATE; if (need_invalidate) req->Channel = SMB2_CHANNEL_RDMA_V1; |