git: db8444c1b7e4 - main - nfscl: Fix the RDMA write reduction code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Nov 2026 20:52:48 UTC
The branch main has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=db8444c1b7e4cfe3df105268fa963a93c3780b02
commit db8444c1b7e4cfe3df105268fa963a93c3780b02
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-11-04 20:50:48 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-11-04 20:50:48 +0000
nfscl: Fix the RDMA write reduction code
The write reduction code was broken in a few ways:
- It didn't handle non-zero b_dirtyoff.
- It didn't advance the uiop fields such that they could be
backed up for a retry.
- It didn't handle the rare retry case with a partially
written buffer.
This patch fixes the above and now write reduction seems
to be working ok.
MFC after: 1 month
Fixes: 884ee8d6c9b4 ("nfscl: Add some glue for client side NFS over RDMA")
---
sys/fs/nfsclient/nfs_clbio.c | 9 +++++++--
sys/fs/nfsclient/nfs_clrpcops.c | 29 ++++++++++++++++++++++-------
sys/rpc/rpc_generic.c | 15 +++++++--------
3 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c
index f26da2598c45..d46691e83a35 100644
--- a/sys/fs/nfsclient/nfs_clbio.c
+++ b/sys/fs/nfsclient/nfs_clbio.c
@@ -1693,8 +1693,13 @@ ncl_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td,
else
iomode = NFSWRITE_FILESYNC;
- error = ncl_writerpc(vp, uiop, bp->b_pages, cr, &iomode,
- &must_commit, called_from_strategy, 0);
+ if ((bp->b_dirtyoff % PAGE_SIZE) == 0)
+ error = ncl_writerpc(vp, uiop,
+ &bp->b_pages[bp->b_dirtyoff / PAGE_SIZE], cr,
+ &iomode, &must_commit, called_from_strategy, 0);
+ else
+ error = ncl_writerpc(vp, uiop, NULL, cr, &iomode,
+ &must_commit, called_from_strategy, 0);
/*
* When setting B_NEEDCOMMIT also set B_CLUSTEROK to try
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 1f6227e0831a..395bf2ef74c3 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -1779,6 +1779,8 @@ nfsrpc_read(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
(void)nfscl_getstateid(vp, nfhp->nfh_fh, nfhp->nfh_len,
NFSV4OPEN_ACCESSREAD, 0, newcred, p, &stateid,
&lckp);
+ if (retrycnt > 0)
+ pgp = NULL;
error = nfsrpc_readrpc(vp, uiop, pgp, newcred, &stateid, p, nap,
attrflagp);
if (error == NFSERR_OPENMODE) {
@@ -1832,8 +1834,8 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
struct nfsrv_descript *nd = &nfsd;
int rsize;
- off_t tmp_off;
- bool did_rdma, reduced, first_loop;
+ off_t tmp_off, start_off;
+ bool did_rdma, reduced;
*attrflagp = 0;
tsiz = uiop->uio_resid;
@@ -1846,7 +1848,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
rsize = nmp->nm_rsize;
NFSUNLOCKMNT(nmp);
nd->nd_mrep = NULL;
- first_loop = true;
+ start_off = uiop->uio_offset;
while (tsiz > 0) {
mr = NULL;
*attrflagp = 0;
@@ -1859,8 +1861,9 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
* within the pages, this can only be done for the first
* iteration.
*/
- if (first_loop && pgp != NULL &&
- (uiop->uio_offset & PAGE_MASK) == 0 &&
+ tmp_off = start_off - uiop->uio_offset;
+ if (pgp != NULL && (tmp_off & PAGE_MASK) == 0 &&
+ (start_off & PAGE_MASK) == 0 &&
uiop->uio_segflg == UIO_SYSSPACE &&
!NFSHASNOREADREDUCE(nmp))
did_rdma = true;
@@ -1871,7 +1874,6 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
else
mbflag = M_PROTO9;
}
- first_loop = false;
NFSCL_REQSTART(nd, NFSPROC_READ, vp, cred);
nd->nd_mreq->m_flags |= mbflag;
if (nd->nd_flag & ND_NFSV4)
@@ -1887,7 +1889,8 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
}
/* For RDMA, make the data a separate chunk. */
if (did_rdma)
- mr = nfsm_build_rdma_reduction(pgp, nd, len, 0, true);
+ mr = nfsm_build_rdma_reduction(&pgp[tmp_off/PAGE_SIZE],
+ nd, len, 0, true);
/*
* Since I can't do a Getattr for NFSv4 for Write, there
* doesn't seem any point in doing one here, either.
@@ -1920,6 +1923,11 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
}
NFSM_STRSIZ(retlen, len);
if (retlen > 0) {
+ /*
+ * Since nfsm_build_rdma_reduction() didn't allocate
+ * pages, the call to rpc_copy_uio_pages() only
+ * updates the uiop fields. It does not copy data.
+ */
if (!did_rdma || !reduced)
error = nfsm_mbufuio(nd, uiop, retlen);
else
@@ -1995,6 +2003,8 @@ nfsrpc_write(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
}
}
+ if (retrycnt > 0)
+ pgp = NULL;
/*
* If there is no stateid for NFSv4, it means this is an
* extraneous write after close. Basically a poorly
@@ -2137,6 +2147,11 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
rlen = m_length(nd->nd_mreq, NULL);
mr = nfsm_build_rdma_reduction(pgp, nd, len, rlen,
false);
+ /*
+ * Since nfsm_build_rdma_reduction() didn't allocate
+ * pages, the call to rpc_copy_uio_pages() only
+ * updates the uiop fields. It does not copy data.
+ */
error = rpc_copy_uio_pages(mr, uiop, len, false);
} else {
error = nfsm_uiombuf(nd, uiop, len);
diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
index 15aa357b1775..8b923fb52067 100644
--- a/sys/rpc/rpc_generic.c
+++ b/sys/rpc/rpc_generic.c
@@ -1008,6 +1008,10 @@ rpc_copy_uio_pages(struct mbuf *mr, struct uio *uiop, int siz, bool from_pages)
while (siz > 0) {
if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
return (EBADRPC);
+ if (uiop->uio_iov->iov_len == 0) {
+ uiop->uio_iovcnt--;
+ uiop->uio_iov++;
+ }
left = uiop->uio_iov->iov_len;
uiocp = uiop->uio_iov->iov_base;
if (left > siz)
@@ -1055,14 +1059,9 @@ rpc_copy_uio_pages(struct mbuf *mr, struct uio *uiop, int siz, bool from_pages)
uiop->uio_offset += xfer;
uiop->uio_resid -= xfer;
}
- if (uiop->uio_iov->iov_len <= siz) {
- uiop->uio_iovcnt--;
- uiop->uio_iov++;
- } else {
- uiop->uio_iov->iov_base = (void *)
- ((char *)uiop->uio_iov->iov_base + uiosiz);
- uiop->uio_iov->iov_len -= uiosiz;
- }
+ uiop->uio_iov->iov_base = (void *)
+ ((char *)uiop->uio_iov->iov_base + uiosiz);
+ uiop->uio_iov->iov_len -= uiosiz;
siz -= uiosiz;
}
return (0);