From nobody Tue Jul 23 00:30:57 2024 X-Original-To: dev-commits-src-branches@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 4WSdNd64jkz5QVtL; Tue, 23 Jul 2024 00:30:57 +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 4WSdNd5XlNz3yBc; Tue, 23 Jul 2024 00:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721694657; 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=IgnblNA3ahz+0pmD9Aw6hvf92xfAW2eYDRZciB9PRYw=; b=MSHNr1+vPYPe89a6OMjVMX/VSsQRqZZSEbI//MhmG3BfKI+UgBjPvrm0LpJt1vlFE5sLXJ QDZzuTE2gvm+Atapa7GP0TMcOorbWMYsixQaB9jNuFLlXFVSMmKDNBcxyGGFOaXEL2KqP7 sP99S+ZtqltTbU9u9RaI1PzctqIRJaYm/B55heOZH49xpgde6zjKJkzkIgOAq4bbxuUq4j QlOmSbIvwjhvMuC/HupRsbQCakQKoO2keK0NgBlKOSp34Og4OZ28N34aaf7jzszd8P9Kw/ ILH982qFO0EpgEpjFd49EjwTpMQqbH9ISIy/DXtw9OjaKBFq2wWLJqkNQbh42g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721694657; a=rsa-sha256; cv=none; b=QSB7T+s7yw9ucAX2xEHwFwZ7QzvsPatUjFYc27r0qGyXnid+jVj/0U1coQgr2xXUWJmTTC C5m8AIFPS4f/5MH5+APtZcwAlKZt+dTrN0wmUCJ2ITNPuHMmGSfm79fN2Rg9C1FdkYW0nQ V5VNy9h/N0r6AvfShS39oTZSFdDOIhsR0uYUIbRvZz62Vn3qWc2PQlM5+Us0MrBBg6kJck kdMxXu0S0fmFb8CQUsOv2d+NbmTm01xPW+X0/Jamd0k1g+9V5hmSxfPt4g92bqMRIAECJ8 7RYMYdKdwvDJvT1fJgYyyziA29yrf3QABF90S+E6ct48xwd0vbKQQ1DQ3vYcmQ== 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=1721694657; 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=IgnblNA3ahz+0pmD9Aw6hvf92xfAW2eYDRZciB9PRYw=; b=BiSDYwdqfwxTKSh4EN/iMuNxVj/cBtBrQdQzlBfPiTnH5aJm3UDRd6kKaqtUtvvXtRZXyi 4woNguKKySe2nM2oaJjTDx1aCL/77BgQdfQGONFgbfmkfRFua97dRFB9e7PvLTjZ5WZfg5 ko1eC5G2tGG1kpLWPd7xRRFEVaJKPifO1bGfqLsyEfz8Jix3wz6M1jsZYgdT5O/jQT6rVj tds+eRu1DzJ1nZ6choQJLoKVT+xkOukrhl2xrCjNloBWx1qFd26a8UTDBKWY4m8hzvvhqr a0E80nULY8mwUV6yxxgN/DuZSCmiDzTgdGDgYQf01nbPSDhX3tn1fUmsXK5egw== 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 4WSdNd57qnz169S; Tue, 23 Jul 2024 00:30:57 +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 46N0UvhZ008842; Tue, 23 Jul 2024 00:30:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46N0Uvm0008839; Tue, 23 Jul 2024 00:30:57 GMT (envelope-from git) Date: Tue, 23 Jul 2024 00:30:57 GMT Message-Id: <202407230030.46N0Uvm0008839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d5ae681d2e74 - stable/14 - nfsd: Make modifying vfs.nfsd.enable_locallocks safe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d5ae681d2e747e28076f670ca2b3deb27b00acf6 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ae681d2e747e28076f670ca2b3deb27b00acf6 commit d5ae681d2e747e28076f670ca2b3deb27b00acf6 Author: Rick Macklem AuthorDate: 2024-06-23 22:47:22 +0000 Commit: Rick Macklem CommitDate: 2024-07-23 00:29:54 +0000 nfsd: Make modifying vfs.nfsd.enable_locallocks safe Commit dfaeeacc2cc2 modified clientID handling so that it could be done with only a mutex lock held when vfs.nfsd.enable_locallocks is 0. This makes it unsafe to change the setting of vfs.nfsd.enable_locallocks when nfsd threads are active. This patch forces all nfsd threads to be blocked when the value of vfs.nfsd.enable_locallocks is changed, so that it is done safely. (cherry picked from commit 67284d32e5e0d5f015d73eeac4342974277263f5) --- sys/fs/nfsserver/nfs_nfsdport.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index f4679309657b..3769fdc4ff73 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -70,6 +70,7 @@ extern int nfsrv_maxpnfsmirror; extern uint32_t nfs_srvmaxio; extern int nfs_bufpackets; extern u_long sb_max_adj; +extern struct nfsv4lock nfsv4rootfs_lock; NFSD_VNET_DECLARE(int, nfsrv_numnfsd); NFSD_VNET_DECLARE(struct nfsrv_stablefirst, nfsrv_stablefirst); @@ -179,8 +180,6 @@ SYSCTL_INT(_vfs_nfsd, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, ""); SYSCTL_INT(_vfs_nfsd, OID_AUTO, issue_delegations, CTLFLAG_RW, &nfsrv_issuedelegs, 0, "Enable nfsd to issue delegations"); -SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_locallocks, CTLFLAG_RW, - &nfsrv_dolocallocks, 0, "Enable nfsd to acquire local locks on files"); SYSCTL_INT(_vfs_nfsd, OID_AUTO, debuglevel, CTLFLAG_RW, &nfsd_debuglevel, 0, "Debug level for NFS server"); NFSD_VNET_DECLARE(int, nfsd_enable_stringtouid); @@ -295,6 +294,38 @@ SYSCTL_PROC(_vfs_nfsd, OID_AUTO, srvmaxio, CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, sysctl_srvmaxio, "IU", "Maximum I/O size in bytes"); +static int +sysctl_dolocallocks(SYSCTL_HANDLER_ARGS) +{ + int error, igotlock, newdolocallocks; + + newdolocallocks = nfsrv_dolocallocks; + error = sysctl_handle_int(oidp, &newdolocallocks, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (newdolocallocks == nfsrv_dolocallocks) + return (0); + if (jailed(curthread->td_ucred)) + return (EINVAL); + + NFSLOCKV4ROOTMUTEX(); + do { + igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL, + NFSV4ROOTLOCKMUTEXPTR, NULL); + } while (!igotlock); + NFSUNLOCKV4ROOTMUTEX(); + + nfsrv_dolocallocks = newdolocallocks; + + NFSLOCKV4ROOTMUTEX(); + nfsv4_unlock(&nfsv4rootfs_lock, 0); + NFSUNLOCKV4ROOTMUTEX(); + return (0); +} +SYSCTL_PROC(_vfs_nfsd, OID_AUTO, enable_locallocks, + CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, NULL, 0, + sysctl_dolocallocks, "IU", "Enable nfsd to acquire local locks on files"); + #define MAX_REORDERED_RPC 16 #define NUM_HEURISTIC 1031 #define NHUSE_INIT 64