From nobody Tue Aug 4 16:23:42 2026 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 4hDzPb4nDMz6n185 for ; Tue, 04 Aug 2026 16:23:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDzPb49TCz3lLQ for ; Tue, 04 Aug 2026 16:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785860627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNsO9igEJjKOJwFK6f9IZyxLe31KKJQ1eUAEDEd33hU=; b=J6Or6Xp4UwEiEDN8Lpuc/zyL/7WlCK36EhjPDgGpepbMH2meb4lb89VwWCze2dgG8AejZ0 GsSAGrk9WjBWSQIExtZdapXHMNQQj0Mups1tlxXglAOkAAuiIm+0lIUgS41t4BWWbMlCD5 7bi40aaV7eQslgg0vkUeF9oil0MHGYh+SF75SiAfj3sWtPmurAAEIj/b70JfDZQ8foHXur QQX4AyyntdUbkGo0sLbxt3mh5m3eN3TKWCHpe9WjN2lIy3dE5QXsTEryMcDR1MUe+MUnYw HvZ1nzkRpf9VtNevoxgdu1kFQNZoqAQBKuiSOHcz3qmRbjw05ECS5nsm5VboTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785860627; a=rsa-sha256; cv=none; b=kRgNOfBI+DKPzB8yzlNie16901dkEyDYbffctS/lvAvpD5IOIE2U+0QMD46OAazKy9Zb4q CAPNm2Y2iE0kRiNP/3mDPBy6qRONzN4DQrRbHUuIPZ0e/bc186CafbZqBD+kGMWUcmpxHb w4T/gmrCVC/mK4lKHrA8ZQGXVmHwVhzxeYYIX5De9Jw4KgELxHU1//ezT8kjA0SEsfaKLk wkmXN6fLmSS9XW7Wfnn0HxQ+XZYZR+YY/2GMaiAB5ZvRnmlSrnqQfKKgM3EhOcmvMpDxY3 1X24Ajg2JBFYjaU4IB9b1N7f4bQ9ez7iPywpU3Ycv/D/okRdL6PYEZTfInY1ew== 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=1785860627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNsO9igEJjKOJwFK6f9IZyxLe31KKJQ1eUAEDEd33hU=; b=bEnC0tGbtP/PuDLkZogvFdnzs9YHZQ3umvQtUx6JL6adkZ/IMIme8T+Ubqa+Ql5iVrjheC iPKIcYmE8cRnvPx5owlPh/So09HQPxHRCCX6emmnzhLvWARbkN1qmaSg8/Awa/hLKU3Sj0 pE49n0L0Il7DFlUiYF99YNdKZrIcu+ndBhauQOGeCktmh5sV4OKNycBvXPLNLZwX/PmuGt tW0crHs+zfF6G5TqddSRdEUXD0wx9BbV/bd/w5VSTEz4YPDd3ABpDEYmDXpB+j+9SaR8FM cJyPZL0SoNIBGEItbLW/t6P1+zwVExfUPe8ShK59pZlYvZWqdj5I0KKDNcsMhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDzPb38N5ztv9 for ; Tue, 04 Aug 2026 16:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d981 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 16:23:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nimish Jain From: Konstantin Belousov Subject: git: 2d21dbaaaf75 - main - fix p9fs_vget_common() panics 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 2d21dbaaaf75558b42a000561eb6224b6c1c0615 Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 16:23:42 +0000 Message-Id: <6a72120e.1d981.9725633@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d21dbaaaf75558b42a000561eb6224b6c1c0615 commit 2d21dbaaaf75558b42a000561eb6224b6c1c0615 Author: Nimish Jain AuthorDate: 2026-08-03 23:08:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-04 16:00:48 +0000 fix p9fs_vget_common() panics This addresses a race when two vnodes attempt to call vfs_hash_insert(), but only one succeeds. Also, in case of an error from p9fs_reload_stats_dotl(), it marks the vnode for deletion. Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58632 --- sys/fs/p9fs/p9fs_vfsops.c | 56 +++++++++++++---------------------------------- sys/fs/p9fs/p9fs_vnops.c | 3 --- 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index fe8c1b5ded31..7a0859806b35 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -263,7 +263,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, struct p9fs_node *node; struct thread *td; uint32_t hash; - int error, error_reload = 0; + int error; struct p9fs_inode *inode; td = curthread; @@ -352,57 +352,31 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, if (vp->v_type != VFIFO) VN_LOCK_ASHARE(vp); error = insmntque(vp, mp); - if (error != 0) { - /* - * vput(vp) is already called from insmntque_stddtr(). - * Just goto 'out' to dispose the node. - */ - goto out; - } + if (error != 0) + return (error); /* Init the vnode with the disk info*/ error = p9fs_reload_stats_dotl(vp, curthread->td_ucred); if (error != 0) { - error_reload = 1; - goto out; + P9FS_NODE_SETF(np, P9FS_NODE_DELETED); + vgone(vp); + vput(vp); + return (error); } error = vfs_hash_insert(vp, hash, flags, td, vpp, p9fs_node_cmp, &fid->qid); - if (error != 0) { - goto out; - } + if (error != 0 || *vpp != NULL) + return (error); - if (*vpp == NULL) { - P9FS_LOCK(vses); - STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); - P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); - P9FS_UNLOCK(vses); - vn_set_state(vp, VSTATE_CONSTRUCTED); - *vpp = vp; - } else { - /* - * Returning matching vp found in hashlist. - * So cleanup the np allocated above in this context. - */ - if (!IS_ROOT(np)) { - p9fs_destroy_node(&np); - } - } + P9FS_LOCK(vses); + STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); + P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); + P9FS_UNLOCK(vses); + vn_set_state(vp, VSTATE_CONSTRUCTED); + *vpp = vp; return (0); -out: - /* Something went wrong, dispose the node */ - if (!IS_ROOT(np)) { - p9fs_destroy_node(&np); - } - - if (error_reload) { - vput(vp); - } - - *vpp = NULL; - return (error); } /* Main mount function for 9pfs */ diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 2519e5cd050a..de2ffa3eb011 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -115,9 +115,6 @@ p9fs_cleanup(struct p9fs_node *np) if ((np->flags & P9FS_NODE_IN_SESSION) != 0) { P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION); STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next); - } else { - P9FS_UNLOCK(vses); - return; } P9FS_UNLOCK(vses);