From nobody Fri Feb 14 20:58:18 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 4Yvksk6DcJz5nfQb; Fri, 14 Feb 2025 20:58:18 +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 4Yvksk5JDDz49sP; Fri, 14 Feb 2025 20:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739566698; 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=1c32Mwtt6gsb9g0xzq7tfZOYqF22YbbgaDBgJl8Hd/4=; b=JTteF5VR46wNM5MpF10PBFVfAeF9GyH4lRBwEgV/Ig6hNNt+7oynwU1M/w2GZEve1vFxDT db7gFN2zY+fGF1YCQS3scKhWfiFG/VTJiSweps9p5ygdRx9rB8DQCIMeaosozffFSVCSvf k9LCvkJfVnK+58k1lH8ZDRZJlZpE5UVegNEbnd8igpdaOdQ1B+OeDUdYq94rLZ6IZjl57S D7KlyQM8aAQrnSQAvLFgxlDZ1t5x+S0JcKO74WEPmhF4RHjoZosXHT5kvOLhkR94AJi+cA 5Ixpqy7DUGtNydOYoW2cWULTer8neBsXRwbcxGu2bgRZQIZgkmMqeMUnOfnQPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739566698; 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=1c32Mwtt6gsb9g0xzq7tfZOYqF22YbbgaDBgJl8Hd/4=; b=VIUP99ySXlQ4zxJgiep05kuO7fEqUO6FQLuMm7zAuLtw33WZLM7Kp7sxFdvoUqZqEpUllN 4EltkK9UpBLdpyOtPzxHyM/DGgtBFpQQ1kf65ambrkyry2zMILUIVmimGSg664FeXvXTCa JCsAN56YoiDmZOxAQO+7tNyJHdwRsfYJ/PqiYQ2Av+8K/kCpr6FjTsD5rsbUcEIm4kJQKx 8wvmygZ5DtqjQmD0iHQx+rYPtHOjIVem96L3NvK5VzAzi/eObBiA4Qq1ZPCG2HTL33PpEm CwFCmQhj+W6Q5SJ29TbFQu0FUs7J+1GwbmtvESGk5/eN9MM7ZZHqgsBK/Pf98A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739566698; a=rsa-sha256; cv=none; b=P59cHcV3f15ej7dBsXmUuJu5XgIXsH6P0MUbMsstgNvftD8LODN5EJUVJIyAJyS99ifuY/ zSegUd6WFm6TyzlpJwFqbhfj1wxHTfQnPF8yOen/pArDBY8iLLSHW2PSWlbq0F7Fsja8Kp HmQGNXUGqUiSD3+XJpicb4xV668onlnHTd6tZnponQ3UKk+4FoZBMKV8sLHfTbkEdjkZ4B ChfjWtYVNqyfsluIkRG8uMvD3YOg2MmvDufRjZIH56bcdfNBAqmoqPuOEzfACVMX7J/7ES eLw7xxKEG3i1AXOq4Lf2yU+Z0sRtwIIvvkG6nHeekw0CROsSaj13Lqage0mM0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yvksk4MBRzmrF; Fri, 14 Feb 2025 20:58:18 +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 51EKwI60008375; Fri, 14 Feb 2025 20:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EKwI3S008372; Fri, 14 Feb 2025 20:58:18 GMT (envelope-from git) Date: Fri, 14 Feb 2025 20:58:18 GMT Message-Id: <202502142058.51EKwI3S008372@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: 4517fbfd4251 - main - nfscl: Add support for CB_RECALL_SLOT 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: 4517fbfd4251180147082f94253c4347fa44f570 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4517fbfd4251180147082f94253c4347fa44f570 commit 4517fbfd4251180147082f94253c4347fa44f570 Author: Rick Macklem AuthorDate: 2025-02-14 20:56:52 +0000 Commit: Rick Macklem CommitDate: 2025-02-14 20:56:52 +0000 nfscl: Add support for CB_RECALL_SLOT The callback CB_RECALL_SLOT is required for NFSv4.1/4.2. Fortunately, there does not appear to be any extant NFSv4.1/4.2 servers that use it. Since commit b97a478896e9 fixed handling of session slot shrinking, this patch adds support for CB_RECALL_SLOT, which shrinks the number of session slots as well. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 4 ++-- sys/fs/nfs/nfs_var.h | 1 + sys/fs/nfsclient/nfs_clstate.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index e35172ee2b34..0ae3b94bef89 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -123,7 +123,6 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, skip_wcc_data_onerr, CTLFLAG_RW, &nfs_skip_wcc_da SYSCTL_INT(_vfs_nfs, OID_AUTO, dsretries, CTLFLAG_RW, &nfs_dsretries, 0, "Number of retries for a DS RPC before failure"); -static void nfs_resetslots(struct nfsclsession *); static void nfs_down(struct nfsmount *, struct thread *, const char *, int, int); static void nfs_up(struct nfsmount *, struct thread *, const char *, @@ -1474,12 +1473,13 @@ nfsmout: /* * Reset slots above nfsess_foreslots that are not busy. */ -static void +void nfs_resetslots(struct nfsclsession *sep) { int i; uint64_t bitval; + mtx_assert(&sep->nfsess_mtx, MA_OWNED); bitval = (1 << sep->nfsess_foreslots); for (i = sep->nfsess_foreslots; i < NFSV4_SLOTS; i++) { if ((sep->nfsess_slots & bitval) == 0 && diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 00d5b914f4af..b48d853b285e 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -780,6 +780,7 @@ int newnfs_request(struct nfsrv_descript *, struct nfsmount *, struct nfsclient *, struct nfssockreq *, vnode_t, NFSPROC_T *, struct ucred *, u_int32_t, u_int32_t, u_char *, int, u_int64_t *, struct nfsclsession *); +void nfs_resetslots(struct nfsclsession *); int newnfs_connect(struct nfsmount *, struct nfssockreq *, struct ucred *, NFSPROC_T *, int, bool, struct __rpc_client **); void newnfs_disconnect(struct nfsmount *, struct nfssockreq *); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 8a82fe77690e..f5621fd0a758 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3934,6 +3934,24 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) *tl = txdr_unsigned(NFSV4_CBSLOTS - 1); } break; + case NFSV4OP_CBRECALLSLOT: + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + highslot = fxdr_unsigned(uint32_t, *tl); + NFSLOCKCLSTATE(); + clp = nfscl_getclntsess(sessionid); + if (clp == NULL) + error = NFSERR_SERVERFAULT; + if (error == 0) { + tsep = nfsmnt_mdssession(clp->nfsc_nmp); + mtx_lock(&tsep->nfsess_mtx); + if ((highslot + 1) < tsep->nfsess_foreslots) { + tsep->nfsess_foreslots = (highslot + 1); + nfs_resetslots(tsep); + } + mtx_unlock(&tsep->nfsess_mtx); + } + NFSUNLOCKCLSTATE(); + break; default: if (i == 0 && minorvers != NFSV4_MINORVERSION) error = NFSERR_OPNOTINSESS;