From nobody Thu Sep 03 02:22:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hb3K132YWz6qMnG for ; Thu, 03 Sep 2026 02:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hb3K12M4Lz3Vty for ; Thu, 03 Sep 2026 02:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788402149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCjvKs8onoEQtJiyzAhgs7gH522n0G2aUMEvkQjmCE4=; b=v1rXIm9Zm//RH/mkjhd0vhBbS3v45xV91VIx2rRzSOfVeWBR5rMVusXWx/s1eZQCtjfStF s9Dxn61AYfoo+pwg4AsTYfuRVwtQVfAqvKFlptosYBl9sZP06BvFrEVAUgW5ICsRMntpDJ RvVXeZWYFLO3FzMjKSgHLb8LxzXBGKKIyn6tDRErsgTZDMPIpADk7heQP5dJmN8iU8EDpc rOYuqyxErukoxC6Kr+zkrVVvTxPYESajiLMbsA7/7zND8EQe39LisMe74OqwxUoktC9udF cF+HZe24N89y2/Ay6m5RMBLfB8EQv2qUGxgqOnpnUQRHspIe/wPSwaOhX+r7cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788402149; a=rsa-sha256; cv=none; b=feSkb0ye1MJHAPZ34tzTxpo0x9jK+LC12Acs7tffQ+Vm65hO+bwGM67HKY1awe6VPBklcC xpsrGqZ0cUiHIL4g84myzokFH38yfu3YQHDwV/YmqFAhpeY6Qg1/3DJ2M3TAvfzTgSAWe/ WOBB71ofoNLKnTxXDZjFtq/p9tu4KENkgRz03ob2UG/TMKmTnjhlb5QsP6u9ZxX38WVww7 9qKLrup3t+oKlBCGFfRk2OSWw34MK5wGMKuiWZYCqfOyDtokYIJ4Jnzkxr+g+PbPgJfJBg bhM4ocFBFtsNb8iD16uT5CObx444l8wL/5ftgCOIFVmp0fwhlRhj8PwgeZbfTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788402149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aCjvKs8onoEQtJiyzAhgs7gH522n0G2aUMEvkQjmCE4=; b=Q2Rza/IHEZM3VKtygiz4qXd5iSb9Coa50iXEZlv+idGL8HuC8sbf1wt+APkrd1MqFPePC5 RnkHpRjpCj5HOowEDj3hZ5/PaSwXWG0o7Dl985iXq04fcrwfri4DjDaQmTzFCwu+XF+H8n lx24e6fpT622SVm0xBgE21Qwb5aQMoBtncPFZr8kdAmHaxkjWU7Rrbeo43urEoBqrtCLXU caMZe9u3XLVo7nY8O+vkosPUVodr3f3u9FpXTCqUpadXeANGErEY2B2WMq4c307UEN0Eri SFFX4kLyP8OUKPsWj7kvt8pW4534JRnc2JfUEmuCWzaI2TyZJLUxAHv54u+svw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hb3K1150xz18kR for ; Thu, 03 Sep 2026 02:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 03 Sep 2026 02:22:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 799061fc769c - main - nfscl: A few more fixes for the NFS over RDMA client glue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 799061fc769c96772a06881c1830a99d4db2fa67 Auto-Submitted: auto-generated Date: Thu, 03 Sep 2026 02:22:29 +0000 Message-Id: <6a98d9e5.259dc.707359bb@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=799061fc769c96772a06881c1830a99d4db2fa67 commit 799061fc769c96772a06881c1830a99d4db2fa67 Author: Rick Macklem AuthorDate: 2026-09-03 02:20:26 +0000 Commit: Rick Macklem CommitDate: 2026-09-03 02:20:26 +0000 nfscl: A few more fixes for the NFS over RDMA client glue A couple of additional fixes for the NFS client side RDMA glue: - For Readdirplus, the reply needs to be a large chunk, so set M_PROTO9 instead of M_PROTO8. - The nfsclrdma.ko module now uses xprt_rdma_unmap_chunk() instead of xprt_rdma_rekey_chunk(). Hopefully, this is it for the NFS over RDMA client glue changes. MFC after: 3 months Fixes: 884ee8d6c9b4 ("nfscl: Add some glue for client side NFS over RDMA") --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/rpc/clntrdma.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index d8e1f17b66ae..0c03ca07d63d 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -4197,7 +4197,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, NFSCL_REQSTART(nd, NFSPROC_READDIRPLUS, vp, cred); /* For RDMA, mark that a small rdma_reply is needed. */ if (NFSHASRDMA(nmp)) - nd->nd_mreq->m_flags |= M_PROTO8; + nd->nd_mreq->m_flags |= M_PROTO9; NFSM_BUILD(tl, u_int32_t *, 6 * NFSX_UNSIGNED); *tl++ = cookie.lval[0]; *tl++ = cookie.lval[1]; diff --git a/sys/rpc/clntrdma.h b/sys/rpc/clntrdma.h index 09445faa25a1..21c61374692b 100644 --- a/sys/rpc/clntrdma.h +++ b/sys/rpc/clntrdma.h @@ -27,8 +27,6 @@ struct rpcrdma_xprt { uint32_t maxbck; uint32_t maxio; uint32_t maxsge; - struct mbuf *reply_small[RPCRDMA_IO_NUMBUFS]; - struct mbuf *reply_large[RPCRDMA_IO_NUMBUFS]; void *ep; }; @@ -89,7 +87,7 @@ int xprt_rdma_disconnected(struct rpcrdma_xprt *xp); int xprt_rdma_acquire_buf(struct rpcrdma_xprt *xp, int start, int end); -int xprt_rdma_rekey_chunk(struct rpcrdma_xprt *xp, struct rpcrdma_chunk *chp); +void xprt_rdma_unmap_chunk(struct rpcrdma_xprt *xp, struct rpcrdma_chunk *chp); struct mbuf *rpc_reduce_pg(int len, int pos, bool to_mem);