From nobody Tue Feb 18 22:35:54 2025 X-Original-To: dev-commits-src-main@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 4YyDrV6R7Jz5pHQT; Tue, 18 Feb 2025 22:35:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyDrV49ZTz3mN4; Tue, 18 Feb 2025 22:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739918154; 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=GXFHCZEazhQw34KxpPqBCJgoki+zjeH1Z9XSbgb7GQQ=; b=qRnLJDLvlCrkRoe6aBSWhSSz66xLBo/uv4Xn6jmaqYwvhFp/xID7OXIWSJaNKAO5Xkp5cv fi6a6L7EF046b7Tp5W2u4eXss0e/klkqnApUBEWzxciKfcD/UIY2UZ0CacsWApcgbPo8tP ATh4DkCJeQvfm6hyoVzpvfjdcytb8TEBtnssx9Y3wuZ4G+Vez7b6VjJuIyOf0NcsIg/gJo 7BMYTRG6TorwnCP802si2u6JICbmMYbJMl0LmIlssvnaBORKE2frLzl7MMZOakLm87vceM X/MmzOTdREhBDWsMTzp4baVAqjW39lm1B7uGUQyUywbHWwzsmcoyFAbq5HWBLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739918154; a=rsa-sha256; cv=none; b=TDnj8CzxxJXksIn1Zk2Sprzp8w/Zq/CxUphG5aI9O5H0olpmDo3yWZOzlUZ7js5sZbA1S6 aI0ZcGm9+CvJHtQqOrDTE/bOVIbMkPJvpBV5tooVxqooMIVMz71ReYd7yVFMikk01/1/Ya 6MnDw4qgJNgEfgcYSEFolaSeWKBM4k8WRT9rJtr/r9gx56iC9sBIux2y3gn4ZxrlkghDkY Q6ieePjLxqyauDkGf91fFYu17W7sEVUOjQBuqnm/ndivzJw7B6p4MP4hxwM2N7Dq8p1kmW scckIgTCiDg2dFDJMitSpZoDR45u82OPNxl/+3EdE47l6J2A+KGi0jNFgQ8/+A== 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=1739918154; 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=GXFHCZEazhQw34KxpPqBCJgoki+zjeH1Z9XSbgb7GQQ=; b=fAFr3naopmGoypaf2WGaa2XoA7xh9CjvK62I+bNu19mrbfnMaMLJG9iL/WRDSG/V3vWCfJ djLzXQAds1Fn9qbOvCfyq3U4lgoCayRIqGaHEwuY3qK2ELRsMphy8EhZYFW8npv3iBDh3X CJ1U8jqlNlPpHvekpmOUmEP40H8PRE9Rsj/LPAMGQNhRsEHdmoggBeFydqbnr85eTgWXTW K/5ivkhB2WQ1kaFg2+NEfNnuoLEuaMr+iZuF2c24GbJT36wEYsY+zpPc8Ysg8ubAsoKoAC EyPc6Qs8XNYvACAD1dpmx6I5vvqO9JXEmKgjXiqeGLAS92DuuUtJSuPrOPcxuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YyDrV3h1bzfs9; Tue, 18 Feb 2025 22:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IMZsa3065467; Tue, 18 Feb 2025 22:35:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IMZsgm065464; Tue, 18 Feb 2025 22:35:54 GMT (envelope-from git) Date: Tue, 18 Feb 2025 22:35:54 GMT Message-Id: <202502182235.51IMZsgm065464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8dc0889f56dd - main - nfscl: Add support for CB_RECALL_ANY to the NFSv4.1/4.2 client List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 8dc0889f56dd6ac5c33ce79337a971af4b9ff127 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc0889f56dd6ac5c33ce79337a971af4b9ff127 commit 8dc0889f56dd6ac5c33ce79337a971af4b9ff127 Author: Rick Macklem AuthorDate: 2025-02-18 22:34:12 +0000 Commit: Rick Macklem CommitDate: 2025-02-18 22:34:12 +0000 nfscl: Add support for CB_RECALL_ANY to the NFSv4.1/4.2 client Commit f5aff1871d32 and 7e26f1c21049 moved the delegation and layout high water variables into the clientID structure. This patch uses those variables to implement the CB_RECALL_ANY NFSv4.1/4.2 callback. This patch only affects NFSv4.1/4.2 mounts to non-FreeBSD NFS servers that use CB_RECALL_ANY. The Linux knfsd is one example of such a server. MFC after: 2 weeks --- sys/fs/nfs/nfsproto.h | 11 +++++++++++ sys/fs/nfsclient/nfs_clstate.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 323746ebbb6c..995754f42b15 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -744,6 +744,17 @@ #define NFSSECINFONONAME_CURFH 0 #define NFSSECINFONONAME_PARENT 1 +/* Bits for CB_RECALL_ANY. */ +#define NFSRCA4_RDATA_DLG 0x00000001 +#define NFSRCA4_WDATA_DLG 0x00000002 +#define NFSRCA4_DIR_DLG 0x00000004 +#define NFSRCA4_FILE_LAYOUT 0x00000008 +#define NFSRCA4_BLK_LAYOUT 0x00000010 +#define NFSRCA4_OBJ_LAYOUT_MIN 0x00000100 +#define NFSRCA4_OBJ_LAYOUT_MAX 0x00000200 +#define NFSRCA4_FF_LAYOUT_READ 0x00010000 +#define NFSRCA4_FF_LAYOUT_RW 0x00020000 + #if defined(_KERNEL) || defined(KERNEL) /* Conversion macros */ #define vtonfsv2_mode(t,m) \ diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 7e5baa453ad0..16d201d65b34 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3955,6 +3955,40 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) } NFSUNLOCKCLSTATE(); break; + case NFSV4OP_CBRECALLANY: + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + i = fxdr_unsigned(int, *tl++); + j = fxdr_unsigned(int, *tl); + if (i < 0 || j != 1) + error = NFSERR_BADXDR; + if (error == 0) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + j = fxdr_unsigned(int, *tl); + if (i < 100) + i = 100; + else if (i > 100000) + i = 100000; + NFSLOCKCLSTATE(); + clp = nfscl_getclntsess(sessionid); + if (clp == NULL) + error = NFSERR_SERVERFAULT; + if (((j & NFSRCA4_RDATA_DLG) != 0 || + (j & NFSRCA4_WDATA_DLG) != 0) && + error == 0 && i < + clp->nfsc_deleghighwater) + clp->nfsc_deleghighwater = i; + if (error == 0 && + ((!NFSHASFLEXFILE(clp->nfsc_nmp) && + (j & NFSRCA4_FILE_LAYOUT) != 0 && + i < clp->nfsc_layouthighwater) || + (NFSHASFLEXFILE(clp->nfsc_nmp) && + (j & (NFSRCA4_FF_LAYOUT_READ | + NFSRCA4_FF_LAYOUT_RW)) != 0 && + i < clp->nfsc_layouthighwater))) + clp->nfsc_layouthighwater = i; + NFSUNLOCKCLSTATE(); + } + break; default: if (i == 0 && minorvers != NFSV4_MINORVERSION) error = NFSERR_OPNOTINSESS;