From nobody Tue Mar 10 12:46:15 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 4fVYXR6yVtz6Vbrj for ; Tue, 10 Mar 2026 12:46:15 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVYXR4kPGz4Q1P for ; Tue, 10 Mar 2026 12:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146775; 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=EuO3PlBGWxGDMKIgfUZhjf/4Qeb01Uf5DHKF4tvQPdM=; b=OGT9GLQOTBjC6P/iWbIid8T8F/+5DVGbXfIkVRVdkVv+qKqfG7x1+TWYygfuYRZhhMsTZ/ O5bKZNPLr0YZ+eHa8ZFaXddijlGYTakj7ACAbT9T7EDsNn0/8N4MGFJwmQn1dx/ehsR1fq opEfwIz9UXpCrLej0i/A8hXVK8ppvnPHw0FQBI7DjREchCwQvYmPttovcf1HSTbBBxz2k9 DpdqIEkgmJbS5iS5+fzLz0n7WpeOUb6pabdZmc8u+e1GT0fBT+AlW2/6koYdI1+IjZt8KQ Lyi6okYjLYTNxSa4BYWyjWd0sOMd07vut13gvvTCFgihiBuCsDfrWqjz5usRrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773146775; a=rsa-sha256; cv=none; b=sjmV3CcNVKKmHOg7jc7ye+sNHUsaeAwfQQpzi9AK2qLo+Da51dHgwWh5SIw6FEbBSmVseK 5xKYIghaLkg+yp5hzkCXXRN8w/1ETNdaet63tYgP41tuDZ495mnNIcLQZqMMm+jrtAauCw qyvA2I0KO6AJQsGf7jhRRe+cjSqViXBdcKrUr2QwiIx8HgnixXWq22RJU573woNtEHhpvD ekTGcw+8mmcQBEr82zn4ePVGW9+KDBUTPlLEMup0sJhVn9yFQu0BT5M+E9z2fD4MvJHOXv +h+0QuP505n72khMTJzkUpq20PUzR+tS/RnixB//+DucD5Wxlsw+sbTHtJV2HQ== 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=1773146775; 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=EuO3PlBGWxGDMKIgfUZhjf/4Qeb01Uf5DHKF4tvQPdM=; b=UAnz8EnIAq5IrmNSlkOP8pieNLgpyAshg8tFkH4ztQUHmUcf308totXY7CPV30s7+CVjFj aTxdncmcxO+8Y+TnYB84sodA1MdaPmT6GdXVjiOaFvszL2sfaDN5tFxpPujXMnG8mTdQrd oV6LX9ZKqGEYriWr1wypLyUqyU1JudEoSJjr1+bO4MHWkXEaTKMLDXPfyym4soNk5LcWAk EMjOVZg7YepLNROzaFVBMEyyP8R2N1/1dJe/ZxQ97zd3JWtKYUTZV+UIMlrPx38DzJixlu s1ry1/Gpu80gfVVK4G+9P7qSgwVqFiqmQeImgYRHSnlcvhP7MQArvHZDYZA+nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXR1tl3z1BYk for ; Tue, 10 Mar 2026 12:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 227b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 12:46:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c2012c7faf74 - main - p9fs: use atomics for updating node->flags 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: c2012c7faf74c9e7b4e3de2472e10b58ed096996 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 12:46:15 +0000 Message-Id: <69b01297.227b7.53cc52dd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2012c7faf74c9e7b4e3de2472e10b58ed096996 commit c2012c7faf74c9e7b4e3de2472e10b58ed096996 Author: Konstantin Belousov AuthorDate: 2026-03-08 04:44:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 12:44:34 +0000 p9fs: use atomics for updating node->flags This should prevent seeing inconsistent flags values when updating it under the shared vnode lock. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55665 --- sys/fs/p9fs/p9fs.h | 9 ++++++--- sys/fs/p9fs/p9fs_vfsops.c | 6 +++--- sys/fs/p9fs/p9fs_vnops.c | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/fs/p9fs/p9fs.h b/sys/fs/p9fs/p9fs.h index a270d8b5ce5f..2470734fef4d 100644 --- a/sys/fs/p9fs/p9fs.h +++ b/sys/fs/p9fs/p9fs.h @@ -103,7 +103,7 @@ struct p9fs_node { struct p9fs_inode inode; /* in memory representation of ondisk information*/ struct p9fs_session *p9fs_ses; /* Session_ptr for this node */ STAILQ_ENTRY(p9fs_node) p9fs_node_next; - uint64_t flags; + u_int flags; }; #define P9FS_VTON(vp) ((struct p9fs_node *)(vp)->v_data) @@ -111,10 +111,13 @@ struct p9fs_node { #define VFSTOP9(mp) ((struct p9fs_mount *)(mp)->mnt_data) #define QEMU_DIRENTRY_SZ 25 #define P9FS_NODE_MODIFIED 0x1 /* indicating file change */ -#define P9FS_ROOT 0x2 /* indicating root p9fs node */ +#define P9FS_NODE_ROOT 0x2 /* indicating root p9fs node */ #define P9FS_NODE_DELETED 0x4 /* indicating file or directory delete */ #define P9FS_NODE_IN_SESSION 0x8 /* p9fs_node is in the session - virt_node_list */ -#define IS_ROOT(node) (node->flags & P9FS_ROOT) +#define IS_ROOT(node) (((node)->flags & P9FS_NODE_ROOT) != 0) + +#define P9FS_NODE_SETF(n, f) atomic_set_int(&(n)->flags, (f)) +#define P9FS_NODE_CLRF(n, f) atomic_clear_int(&(n)->flags, (f)) #define P9FS_SET_LINKS(inode) do { \ (inode)->i_links_count = 1; \ diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index 953e6eda547a..0e09c58e57b6 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -284,7 +284,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, node = vp->v_data; /* Remove stale vnode from hash list */ vfs_hash_remove(vp); - node->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(node, P9FS_NODE_DELETED); vput(vp); *vpp = NULL; @@ -372,7 +372,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, if (*vpp == NULL) { P9FS_LOCK(vses); STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); - np->flags |= P9FS_NODE_IN_SESSION; + P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); P9FS_UNLOCK(vses); vn_set_state(vp, VSTATE_CONSTRUCTED); *vpp = vp; @@ -448,7 +448,7 @@ p9_mount(struct mount *mp) P9FS_VOFID_LOCK_INIT(p9fs_root); STAILQ_INIT(&p9fs_root->vofid_list); p9fs_root->parent = p9fs_root; - p9fs_root->flags |= P9FS_ROOT; + P9FS_NODE_SETF(p9fs_root, P9FS_NODE_ROOT); p9fs_root->p9fs_ses = vses; vfs_getnewfsid(mp); strlcpy(mp->mnt_stat.f_mntfromname, from, diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index c6d35548e9ed..081903d73e5e 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -111,7 +111,7 @@ p9fs_cleanup(struct p9fs_node *np) P9FS_LOCK(vses); if ((np->flags & P9FS_NODE_IN_SESSION) != 0) { - np->flags &= ~P9FS_NODE_IN_SESSION; + P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION); STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next); } else { P9FS_UNLOCK(vses); @@ -675,7 +675,7 @@ p9fs_open(struct vop_open_args *ap) error = vinvalbuf(vp, 0, 0, 0); if (error != 0) return (error); - np->flags &= ~P9FS_NODE_MODIFIED; + P9FS_NODE_CLRF(np, P9FS_NODE_MODIFIED); } vfid = p9fs_get_fid(vses->clnt, np, ap->a_cred, VFID, -1, &error); @@ -1003,7 +1003,7 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) /* Setting a flag if file changes based on qid version */ if (np->vqid.qid_version != stat->qid.version) - np->flags |= P9FS_NODE_MODIFIED; + P9FS_NODE_SETF(np, P9FS_NODE_MODIFIED); memcpy(&np->vqid, &stat->qid, sizeof(stat->qid)); if (!excl_locked) VI_UNLOCK(vp); @@ -1549,7 +1549,7 @@ remove_common(struct p9fs_node *dnp, struct p9fs_node *np, const char *name, cache_purge(vp); vfs_hash_remove(vp); - np->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(np, P9FS_NODE_DELETED); return (error); }