From nobody Sun Sep 21 14:52:57 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 4cV8P62ry2z68CSs; Sun, 21 Sep 2025 14:52:58 +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 4cV8P55nzlz3vTJ; Sun, 21 Sep 2025 14:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466377; 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=a6gT8ZmoRr6bV3lg280LLby8et77lkR8IuyC5Z/boDk=; b=OYCyUO/bJU31VhP+pw7W5K2KtRtO8ffGgIBAjTmVZauLdOhPB7uW09O3YxBlYiVPLSTPZu hUcSKE3mrOdDDP5ctdgLot8565l208LbuKq4lt2ZuNE9SlPJ60oJiyg+TCs592aHmrY4a+ rcG4lUUycoYUfQLFUe7UJ6kew1fNVQAiYYlyWG1h6yB+WxLUkdShJ8hQ3MBByUDkVRfy+0 bTdqYRSV40gokqMKPqczaPLXhBQRZz1ny0Z3PEchNkbCsYswp6bmhN/BQDSMN5DKw7Jyzh F0u1vf+67iUQR8xLPrq+xIqOl+cC2hZUADAqPybl/dYU845yxv4TNAJuI4OC8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466377; 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=a6gT8ZmoRr6bV3lg280LLby8et77lkR8IuyC5Z/boDk=; b=vwqG3/vGN1kc6Vk5PT8xEEyursLDmMQYU2JWSFxx/dRWIq+O5TmvAEVb7fvuhqOS/DwfgX IeyHL2uVYwwdmg7k+xSYF1H96J6c5zxvK+/zxRJ6XmlAiWAamY9XEBkOVSaxNut+aDDa55 qb4mjoKiu30E7KF60w7Bdj1Zk36qoNh52vnBVDlqZ/GgXUhQfkldgCshA4dRc3JsFrfrGl YlUpUgqjhh/cbsan1tW2a5/sr9NrWn8dstd6Mj1ooO18RBjeNcpNdX0UVJIm6md9ZlOXts CX3HYoz7DRnejw+MXqEsXATYkafBZ18lHhn91f1jwJzxTYw9OI0wei79eLTEtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758466377; a=rsa-sha256; cv=none; b=ba7ZyZHRWs+LpgtXRnn3dVwFlWkLZIOkAiBRolo/aRgfHRR3SgE7msw0eaWmm0dkvvlV10 uLMcIaQNTEWw2haeg2gRofdEclHipKi98Fzp0yPAPu9wU9GNJa6U/gPZvzVXxqoUpDwwEZ R5oU1gu0zBg1WG7VzKTHG4yiWF8zNYJ0mj6e+GBCZuIi0ji1yIA7oAMFmb4I58T2paMvTZ l1uaeKl+VlEjGChA5nc8swQAX03+GgnG2Mse5PaVi8MjPMOaSMg9NyzR1KfGO0x86g5rlC QZSrLDA04+MBu0iTdd99vxAw0l3fLq3MIjWoCmLNLRj6pq7jxscbXoIaKXFF4g== 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 4cV8P55Klcz3t4; Sun, 21 Sep 2025 14:52: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 58LEqv4g017452; Sun, 21 Sep 2025 14:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LEqv0F017449; Sun, 21 Sep 2025 14:52:57 GMT (envelope-from git) Date: Sun, 21 Sep 2025 14:52:57 GMT Message-Id: <202509211452.58LEqv0F017449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3f63d59e38cd - stable/14 - vnode: Assert that VOP_LOCK succeeds in freevnode() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f63d59e38cd643b8aedf37e706c50fe7fa494b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f63d59e38cd643b8aedf37e706c50fe7fa494b3 commit 3f63d59e38cd643b8aedf37e706c50fe7fa494b3 Author: Mark Johnston AuthorDate: 2025-08-30 14:56:58 +0000 Commit: Mark Johnston CommitDate: 2025-09-21 14:52:38 +0000 vnode: Assert that VOP_LOCK succeeds in freevnode() Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52245 (cherry picked from commit a7aac8c20497d1666a15f160ef99acddd55a1365) --- sys/kern/vfs_subr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c0322593dead..aa02b54c3260 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2159,6 +2159,8 @@ freevnode(struct vnode *vp) { struct bufobj *bo; + ASSERT_VOP_UNLOCKED(vp, __func__); + /* * The vnode has been marked for destruction, so free it. * @@ -2197,12 +2199,16 @@ freevnode(struct vnode *vp) mac_vnode_destroy(vp); #endif if (vp->v_pollinfo != NULL) { + int error __diagused; + /* * Use LK_NOWAIT to shut up witness about the lock. We may get * here while having another vnode locked when trying to * satisfy a lookup and needing to recycle. */ - VOP_LOCK(vp, LK_EXCLUSIVE | LK_NOWAIT); + error = VOP_LOCK(vp, LK_EXCLUSIVE | LK_NOWAIT); + VNASSERT(error == 0, vp, + ("freevnode: cannot lock vp %p for pollinfo destroy", vp)); destroy_vpollinfo(vp->v_pollinfo); VOP_UNLOCK(vp); vp->v_pollinfo = NULL;