From nobody Sat Aug 30 14:57:33 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 4cDdXZ0XTHz65b5V; Sat, 30 Aug 2025 14:57:34 +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 4cDdXY6wtCz3WZY; Sat, 30 Aug 2025 14:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756565854; 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=kTyuwB3X032bmgHE2moGWZXoPfWtn1vHmBl3BTOK2Vs=; b=VXK6bBj7+gkmueXyrY8Irrgq7zjSt8xuLSuU2ureaCXWNJkeim1Qw+RcTbQprZ4jkEc2Q+ 6qu528qsYTOaPr4muub/N3LbwpzwuNOfguU0n7WPjAsmE1FeOx3Z9MDE++COBANO78LW8k NOYx7JrChZo1FV9dVmf05EjzX4QEa+M61svDfmM8YzIPmG2YGxhJzkYuODoTXOYuR9by1A iaU5pew5G68Kex3lvmllvDL9RF2mjpx21G/qLvVEJiqKBXbTOTBZAwecoX4B2Ajc4l54Qg bmMK+FvIzsERubOhH6XjnIzzRXUVVRCZbCdZ+TCstEPq2eipRFbOyBng253aGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756565854; 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=kTyuwB3X032bmgHE2moGWZXoPfWtn1vHmBl3BTOK2Vs=; b=nlsrHmKcoK6Qbuh9FXnPz7jawYRiOqIhDkTeIanKHcBWYkMiIDLAlIjhX85nSolFVDi8SY beT9pGFbqq7GXR0/RXKx79RheUq0NpGJtN/UvVpYgkxIbyym2ZAS6oyTuLqhMQQH7VfVM1 fmPmdNhwtCtWSK/si8wfYZ1MSbyFq+cPf5Y10V6T6cXRXuTkA99FylR78XlqhVYazjwCPB tdO5QvfpPfClmob1AlSOs8VDIPtI4FaSU/yg2M8wxEavuV57UXMz7OvQM/EsphhAPIO2+a wbdQAmvUPab6GLYXumZNXxqog6x9lXKiuYxxlZzKZB5pbYgA2+ANKo4jxE+tDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756565854; a=rsa-sha256; cv=none; b=U85njXr4sQyWwlI6mjkoLog/puQUTS5LxEfXpvfVnoSAmbbow8tQQBxfgSldV5TMykN5B4 JGUj01oOhsmnCy6Zkfa4xK/nhHNXRf1+KsBUY674kAuSPaNYbHXx8qEhpOAqUyWXUIXxyo o8qTL5s07B4kkbt8B3lL9csOXapW2BFIKUFjulk9lSgVEAGW/fc85AU+7SX5oTMXisOqrq rvYZ+KcDmi3fROWUsZoKwoKu7CIPb//lfzvTBzG5raA1oALAZ0qwVCg+y+/nniMIhTpprH shWX4DriWRDoQgoOv8MzPPn5XAFkv21liH2jl1L1ZWloGS/ewcWY3DjJRwuDYg== 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 4cDdXY6Wn2zWqw; Sat, 30 Aug 2025 14:57:33 +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 57UEvXTL076356; Sat, 30 Aug 2025 14:57:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UEvX6d076353; Sat, 30 Aug 2025 14:57:33 GMT (envelope-from git) Date: Sat, 30 Aug 2025 14:57:33 GMT Message-Id: <202508301457.57UEvX6d076353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a7aac8c20497 - main - vnode: Assert that VOP_LOCK succeeds in freevnode() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7aac8c20497d1666a15f160ef99acddd55a1365 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7aac8c20497d1666a15f160ef99acddd55a1365 commit a7aac8c20497d1666a15f160ef99acddd55a1365 Author: Mark Johnston AuthorDate: 2025-08-30 14:56:58 +0000 Commit: Mark Johnston CommitDate: 2025-08-30 14:56:58 +0000 vnode: Assert that VOP_LOCK succeeds in freevnode() Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52245 --- 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 a6e38be89291..57732ddab7d9 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2186,6 +2186,8 @@ freevnode(struct vnode *vp) { struct bufobj *bo; + ASSERT_VOP_UNLOCKED(vp, __func__); + /* * The vnode has been marked for destruction, so free it. * @@ -2222,12 +2224,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;