freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

nfs_clrpcops.c: Get rid of bogus rpc_free_rdma_reduction() calls

Browse Source 
The calls to rpc_free_rdma_reduction() were cruft left over from
a previous variant of the NFS over RDMA client code.  They resulted
in double free's of the reduction mbuf.

This patch gets rid of them and makes sure that reduction is only
done when an array of pages is provided, so that no anonymous pages
will be allocated.

The reduction mbuf is free'd with the rest of the argument mbuf list
in the client side krpc.

Suggested by:	[email protected]
MFC after:	1 month
Fixes:	884ee8d6c9 ("nfscl: Add some glue for client side NFS over RDMA")
This commit is contained in:
Rick Macklem committed 2026-10-31 13:42:24 -07:00
1 parent 0e58fb271c
commit fec497b89b
1 file changed
+5 -26
Download Patch File Download Diff File Expand all files Collapse all files
sys/fs/nfsclient/nfs_clrpcops.c
+5 -26
View File
@@ -1838,7 +1838,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
mbflag = 0;
if (NFSHASRDMA(nmp) && tsiz > 0) {
/* Assume the rest of the RPC without data is <= 1024 bytes. */
if ((uiop->uio_offset & PAGE_MASK) == 0 &&
if (pgp != NULL && (uiop->uio_offset & PAGE_MASK) == 0 &&
uiop->uio_segflg == UIO_SYSSPACE &&
!NFSHASNOREADREDUCE(nmp))
did_rdma = true;
@@ -1884,11 +1884,8 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
* (See the comment in nfsrpc_writerpc() for more info.)
*/
error = nfscl_request(nd, vp, p, cred);
if (error) {
if (mr != NULL)
rpc_free_rdma_reduction(mr);
if (error)
return (error);
}
reduced = false;
if ((nd->nd_mrep->m_flags & M_PROTO6) != 0)
reduced = true;
@@ -1919,10 +1916,6 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
error = rpc_copy_uio_pages(mr, uiop, retlen,
true);
}
if (mr != NULL) {
rpc_free_rdma_reduction(mr);
mr = NULL;
}
if (error)
goto nfsmout;
m_freem(nd->nd_mrep);
@@ -1936,8 +1929,6 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, struct ucred *cred,
}
return (0);
nfsmout:
if (mr != NULL)
rpc_free_rdma_reduction(mr);
if (nd->nd_mrep != NULL)
m_freem(nd->nd_mrep);
return (error);
@@ -2057,7 +2048,8 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
*attrflagp = 0;
tsiz = uiop->uio_resid;
did_rdma = false;
if (NFSHASRDMA(nmp) && (uiop->uio_offset & PAGE_MASK) == 0 &&
if (NFSHASRDMA(nmp) && !NFSHASNOWRITEREDUCE(nmp) && pgp != NULL &&
(uiop->uio_offset & PAGE_MASK) == 0 &&
uiop->uio_segflg == UIO_SYSSPACE)
did_rdma = true;
tmp_off = uiop->uio_offset + tsiz;
@@ -2074,7 +2066,6 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK);
nd->nd_mrep = NULL; /* NFSv2 sometimes does a write with */
nd->nd_repstat = 0; /* uio_resid == 0, so the while is not done */
mr = NULL;
while (tsiz > 0) {
*attrflagp = 0;
len = (tsiz > wsize) ? wsize : tsiz;
@@ -2125,15 +2116,11 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
*tl = x; /* size of this write */
}
/* For RDMA, make the data a separate chunk. */
if (did_rdma && !NFSHASNOWRITEREDUCE(nmp)) {
if (did_rdma) {
rlen = m_length(nd->nd_mreq, NULL);
mr = nfsm_build_rdma_reduction(pgp, nd, len, rlen,
false);
error = rpc_copy_uio_pages(mr, uiop, len, false);
if (error != 0) {
rpc_free_rdma_reduction(mr);
mr = NULL;
}
} else {
error = nfsm_uiombuf(nd, uiop, len);
}
@@ -2171,17 +2158,9 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, vm_page_t *pgp, int *iomode,
}
error = nfscl_request(nd, vp, p, cred);
if (error) {
if (mr != NULL)
rpc_free_rdma_reduction(mr);
free(nd, M_TEMP);
return (error);
}
if (did_rdma && !NFSHASNOWRITEREDUCE(nmp)) {
KASSERT(mr != NULL, ("nfsrpc_writerpc: Null mr"));
rpc_free_rdma_reduction(mr);
mr = NULL;
}
if (nd->nd_repstat) {
/*
* In case the rpc gets retried, roll