From nobody Wed Aug 27 22:37:31 2025 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 4cBztg33V3z65n4h; Wed, 27 Aug 2025 22:37:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBztg24gqz3KSq; Wed, 27 Aug 2025 22:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756334251; 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=QDUZ2CE9jQqu9jhCme+ZGjBvUmt1BvpTAmUu26ylNyQ=; b=TbKn2PJAov2jtm15tiAXUzwmR2lOmm8r0z54JgMIcV7pvV7vhotcOF/yAuvovWIGP1QBAw 8OQ2dx9BrrT9qnqUupLZ2RsqXOrJ56/jotRoQPRRLwvL7gbE3VFryPVoFEA39U/c5HRhM2 VuOu+hrNAu3JveKRqnH1Wxk5EuKkcphxxxkTJeU7vhuZh4QhAw64j5XPL9W06ikMON70OO /wojnNERNjK/gmPnuoomleAXv55TB6QevREktvXlT5x2hnss951skjWFq3ThurfE3TIqfv GNu4TH3TH4vNppUdyZV1pmY8zsq2PNs0sr8lpDHqhfhPDPafwK/XceauQgGn2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756334251; 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=QDUZ2CE9jQqu9jhCme+ZGjBvUmt1BvpTAmUu26ylNyQ=; b=bePqi94aMc6c0C/PqM/VxoXYiObXkg//v5wAcd/uqEb7j59TCAjsVW1EHKMmoJuUqGjdJB BYFehVsjVCfJWxImZ+VnBVJdcs9iJJRQXHGPyf7W1DZAOtGoxMqViZypbK9r/A0reLJNYw /PM+Qs3stiYs8G2HMFt2ZhkvPdtpZURCdmDsr+gpf7QzlJuOxIfphHOHk1d4eHkr4BqBnF YePZjIDqJIjpgUGNNKw/zjSci+B49F95fEsAdGXIAygc0GbFcpFNSsnzit24yPPx8FTwa9 v6unwLCa46/9jtN3nuuP6lohKh04/Ti0Lyw/kjswrIo69BA68OeS75GdBx54iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756334251; a=rsa-sha256; cv=none; b=RzizF60UNRU7k8gQlJJbYV4Blweb3sP2qr5xETG1vvqKp+WRlWsXlIuFdACjkSEGmD2uhw In+QsOiNQeo/vgdOcuvPpF62BU5xGmRL5NX0lCpXA6DQK4YDmQrMW7junjw397MqSyRXjs rJdk/SnBpbqINZo6vvM8wFBc4Pbp+rWeFnjqGZ94MV0zFLt8UqZr3zjkf7k5f+FQw33dLl 0qZu25qA+zyX8GyOkUNtf7hDFhzFLw015wHJyihab7cLobr01pm0n29rA3NjInKIFCc9Pz cVZTynRiCZ1yunmgAws/3Oz5wORUPNNuMdFJSgWHWj69s/MUX4DwLtp9nmA24Q== 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 4cBztg1Q18zj1l; Wed, 27 Aug 2025 22:37:31 +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 57RMbVBe002109; Wed, 27 Aug 2025 22:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RMbVWT002106; Wed, 27 Aug 2025 22:37:31 GMT (envelope-from git) Date: Wed, 27 Aug 2025 22:37:31 GMT Message-Id: <202508272237.57RMbVWT002106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fe53e046cd9c - main - nfs client: switch nfs_advlock() to use exclusive vnode lock 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe53e046cd9ce9c95a118ac0374e94336f16a37f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fe53e046cd9ce9c95a118ac0374e94336f16a37f commit fe53e046cd9ce9c95a118ac0374e94336f16a37f Author: Konstantin Belousov AuthorDate: 2025-08-27 16:57:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-27 22:36:50 +0000 nfs client: switch nfs_advlock() to use exclusive vnode lock It eliminates the need to upgrade the lock in the function. More importantly, the calls to nfs_advlock_p()/nlm_advlock() sometimes flush buffers, which requires exclusive locking. Reported and tested by: bz Reviewed by: rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52195 --- sys/fs/nfsclient/nfs_clvnops.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index a8b06fdb261b..eee571a04821 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3474,7 +3474,7 @@ nfs_advlock(struct vop_advlock_args *ap) u_quad_t size; struct nfsmount *nmp; - error = NFSVOPLOCK(vp, LK_SHARED); + error = NFSVOPLOCK(vp, LK_EXCLUSIVE); if (error != 0) return (EBADF); nmp = VFSTONFS(vp->v_mount); @@ -3511,11 +3511,6 @@ nfs_advlock(struct vop_advlock_args *ap) cred = p->p_ucred; else cred = td->td_ucred; - NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); - if (VN_IS_DOOMED(vp)) { - error = EBADF; - goto out; - } /* * If this is unlocking a write locked region, flush and