From: Andrey Albershteyn <aalbersh@kernel.org>
To: "fsdevel" <linux-fsdevel@vger.kernel.org>,
"fsverity" <fsverity@lists.linux.dev>,
"linux-ext4" <linux-ext4@vger.kernel.org>,
"linux-btrfs" <linux-btrfs@vger.kernel.org>,
"linux-f2fs" <linux-f2fs-devel@lists.sourceforge.net>,
"linux-xfs" <linux-xfs@vger.kernel.org>,
dsterba@suse.com, "Eric Biggers" <ebiggers@kernel.org>,
"Christian Brauner" <brauner@kernel.org>
Cc: Andrey Albershteyn <aalbersh@kernel.org>,
tytso@mit.edu, chao@kernel.org, jaegeuk@kernel.org,
viro@zeniv.linux.org.uk, Christoph Hellwig <hch@lst.de>
Subject: [PATCH v3 3/7] fs,fsverity: add I_VERITY_BUILDING inode state flag
Date: Fri, 20 Nov 2026 16:50:25 +0100 [thread overview]
Message-ID: <20261120155032.187246-4-aalbersh@kernel.org> (raw)
In-Reply-To: <20261120155032.187246-1-aalbersh@kernel.org>
Every filesystem that supports fs-verity keeps a private runtime inode
flag meaning Merkle tree is currently being built *_VERITY_IN_PROGRESS.
They all serve the same two purposes: reject a concurrent enable with
-EBUSY and let the write paths recognize the special writes done while
the tree is under construction.
Hoist this flag into the VFS as a new inode state flag,
I_VERITY_BUILDING, and manage its lifetime in the generic fs-verity
enable path. The flag is set after ->begin_enable_verity() succeeds and
cleared after ->end_enable_verity() returns (both on the success and the
rollback paths). Add the concurrent-enable guard.
A new helper, fsverity_is_building(), is provided for filesystems to
query the flag. No filesystem uses it yet; the per-fs flags are
converted in following patches.
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/verity/enable.c | 22 +++++++++++++++++++---
include/linux/fs.h | 6 ++++++
include/linux/fsverity.h | 26 ++++++++++++++++++++++++--
include/trace/events/writeback.h | 3 ++-
4 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/fs/verity/enable.c b/fs/verity/enable.c
index fe8493280b77..d820c8d348ca 100644
--- a/fs/verity/enable.c
+++ b/fs/verity/enable.c
@@ -229,13 +229,23 @@ static int enable_verity(struct file *filp,
/*
* Start enabling verity on this file, serialized by the inode lock.
- * Fail if verity is already enabled or is already being enabled.
+ * Fail if verity is already enabled or is already being enabled. Set
+ * I_VERITY_BUILDING inode runtime flag which will be cleared when
+ * enablement succeeded or rolled back.
*/
inode_lock(inode);
- if (IS_VERITY(inode))
+ if (IS_VERITY(inode)) {
err = -EEXIST;
- else
+ } else if (fsverity_is_building(inode)) {
+ err = -EBUSY;
+ } else {
err = vops->begin_enable_verity(filp);
+ if (!err) {
+ spin_lock(&inode->i_lock);
+ inode_state_set(inode, I_VERITY_BUILDING);
+ spin_unlock(&inode->i_lock);
+ }
+ }
inode_unlock(inode);
if (err)
goto out;
@@ -291,6 +301,9 @@ static int enable_verity(struct file *filp,
*/
inode_lock(inode);
err = vops->end_enable_verity(filp, desc, desc_size, params.tree_size);
+ spin_lock(&inode->i_lock);
+ inode_state_clear(inode, I_VERITY_BUILDING);
+ spin_unlock(&inode->i_lock);
inode_unlock(inode);
if (err) {
fsverity_err(inode, "%ps() failed with err %d",
@@ -317,6 +330,9 @@ static int enable_verity(struct file *filp,
rollback:
inode_lock(inode);
(void)vops->end_enable_verity(filp, NULL, 0, params.tree_size);
+ spin_lock(&inode->i_lock);
+ inode_state_clear(inode, I_VERITY_BUILDING);
+ spin_unlock(&inode->i_lock);
inode_unlock(inode);
goto out;
}
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5c62a968fbde..3bf953351e11 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -708,6 +708,11 @@ is_uncached_acl(struct posix_acl *acl)
* I_LRU_ISOLATING Inode is pinned being isolated from LRU without holding
* i_count.
*
+ * I_VERITY_BUILDING fs-verity is being enabled on the inode: the Merkle
+ * tree is under construction. The file is effectively
+ * read-only to userspace; the only writes happening are
+ * for the fs-verity metadata.
+ *
* Q: What is the difference between I_WILL_FREE and I_FREEING?
*
* __I_{SYNC,NEW,LRU_ISOLATING} are used to derive unique addresses to wait
@@ -742,6 +747,7 @@ enum inode_state_flags_enum {
I_SYNC_QUEUED = (1U << 17),
I_PINNING_NETFS_WB = (1U << 18),
I_METADATA_WRITEBACK = (1U << 19),
+ I_VERITY_BUILDING = (1U << 20),
};
#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)
diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h
index 61fe96ccdff6..e02f79682e33 100644
--- a/include/linux/fsverity.h
+++ b/include/linux/fsverity.h
@@ -36,11 +36,12 @@ struct fsverity_operations {
* @filp: a readonly file descriptor for the file
*
* The filesystem must do any needed filesystem-specific preparations
- * for enabling verity, e.g. evicting inline data. It also must return
- * -EBUSY if verity is already being enabled on the given file.
+ * for enabling verity, e.g. evicting inline data.
*
* i_rwsem is held for write.
*
+ * I_VERITY_BUILDING is set on the inode for the duration of enabling.
+ *
* Return: 0 on success, -errno on failure
*/
int (*begin_enable_verity)(struct file *filp);
@@ -164,6 +165,22 @@ static inline bool fsverity_active(const struct inode *inode)
return false;
}
+/**
+ * fsverity_is_building() - is fs-verity being enabled on the inode
+ * @inode: inode to check
+ *
+ * This checks whether the inode's Merkle tree is currently being built.
+ * While this is the case the file is read-only to userspace and the only writes
+ * allowed are for the fs-verity metadata. This becomes false when fsverity
+ * metadata is fully created and written to disk or building failed.
+ *
+ * Return: true if fs-verity is being enabled on the inode
+ */
+static inline bool fsverity_is_building(const struct inode *inode)
+{
+ return inode_state_read_once(inode) & I_VERITY_BUILDING;
+}
+
struct fsverity_info *__fsverity_get_info(const struct inode *inode);
/**
* fsverity_get_info - get fsverity information for an inode
@@ -217,6 +234,11 @@ static inline bool fsverity_active(const struct inode *inode)
return false;
}
+static inline bool fsverity_is_building(const struct inode *inode)
+{
+ return false;
+}
+
static inline struct fsverity_info *fsverity_get_info(const struct inode *inode)
{
return NULL;
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 13ee076ccd16..6d0473d0f270 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -28,7 +28,8 @@
{I_DONTCACHE, "I_DONTCACHE"}, \
{I_SYNC_QUEUED, "I_SYNC_QUEUED"}, \
{I_PINNING_NETFS_WB, "I_PINNING_NETFS_WB"}, \
- {I_LRU_ISOLATING, "I_LRU_ISOLATING"} \
+ {I_LRU_ISOLATING, "I_LRU_ISOLATING"}, \
+ {I_VERITY_BUILDING, "I_VERITY_BUILDING"} \
)
/* enums need to be exported to user space */
--
2.54.0
next prev parent reply other threads:[~2026-11-20 15:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 15:50 [PATCH v3 0/7] fsverity: lift ioctl() input masking and runtime inode flag to VFS Andrey Albershteyn
2026-11-20 15:50 ` [PATCH v3 1/7] fs: constify inode argument of inode_state_read_once() Andrey Albershteyn
2026-11-20 15:58 ` sashiko-bot
2026-11-20 15:58 ` sashiko-bot
2026-11-20 15:50 ` [PATCH v3 2/7] fs: strip FS_VERITY_FL from FS_IOC_SETFLAGS Andrey Albershteyn
2026-11-20 16:00 ` sashiko-bot
2026-11-20 16:02 ` sashiko-bot
2026-11-20 15:50 ` Andrey Albershteyn [this message]
2026-11-20 16:01 ` [PATCH v3 3/7] fs,fsverity: add I_VERITY_BUILDING inode state flag sashiko-bot
2026-11-20 16:01 ` sashiko-bot
2026-11-20 15:50 ` [PATCH v3 4/7] iomap: use fsverity_is_building() to check for fsverity IO Andrey Albershteyn
2026-11-20 16:13 ` sashiko-bot
2026-11-20 16:21 ` sashiko-bot
2026-11-20 16:42 ` Andrey Albershteyn
2026-11-20 15:50 ` [PATCH v3 5/7] btrfs: use I_VERITY_BUILDING instead of private flags Andrey Albershteyn
2026-11-20 15:58 ` sashiko-bot
2026-11-20 15:59 ` sashiko-bot
2026-11-20 15:50 ` [PATCH v3 6/7] ext4: " Andrey Albershteyn
2026-11-20 16:00 ` sashiko-bot
2026-11-20 16:01 ` sashiko-bot
2026-11-20 15:50 ` [PATCH v3 7/7] f2fs: " Andrey Albershteyn
2026-11-20 15:58 ` sashiko-bot
2026-11-20 16:01 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120155032.187246-4-aalbersh@kernel.org \
--to=aalbersh@kernel.org \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=dsterba@suse.com \
--cc=ebiggers@kernel.org \
--cc=fsverity@lists.linux.dev \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox