From: ira.weiny@intel.com
To: linux-ext4@vger.kernel.org,
Andreas Dilger <adilger.kernel@dilger.ca>,
"Theodore Y. Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>
Cc: Ira Weiny <ira.weiny@intel.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>, Jeff Moyer <jmoyer@redhat.com>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH V1 2/9] fs/ext4: Disallow verity if inode is DAX
Date: Wed, 13 May 2020 23:53:08 -0700 [thread overview]
Message-ID: <20200514065316.2500078-3-ira.weiny@intel.com> (raw)
In-Reply-To: <20200514065316.2500078-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Verity and DAX are incompatible. Changing the DAX mode due to a verity
flag change is wrong without a corresponding address_space_operations
update.
Make the 2 options mutually exclusive by returning an error if DAX was
set first.
(Setting DAX is already disabled if Verity is set first.)
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes:
remove WARN_ON_ONCE
Add documentation for DAX/Verity exclusivity
---
Documentation/filesystems/ext4/verity.rst | 7 +++++++
fs/ext4/verity.c | 3 +++
2 files changed, 10 insertions(+)
diff --git a/Documentation/filesystems/ext4/verity.rst b/Documentation/filesystems/ext4/verity.rst
index 3e4c0ee0e068..51ab1aa17e59 100644
--- a/Documentation/filesystems/ext4/verity.rst
+++ b/Documentation/filesystems/ext4/verity.rst
@@ -39,3 +39,10 @@ is encrypted as well as the data itself.
Verity files cannot have blocks allocated past the end of the verity
metadata.
+
+Verity and DAX
+--------------
+
+Verity and DAX are not compatible and attempts to set both of these flags on a
+file will fail.
+
diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c
index dc5ec724d889..f05a09fb2ae4 100644
--- a/fs/ext4/verity.c
+++ b/fs/ext4/verity.c
@@ -113,6 +113,9 @@ static int ext4_begin_enable_verity(struct file *filp)
handle_t *handle;
int err;
+ if (IS_DAX(inode))
+ return -EINVAL;
+
if (ext4_verity_in_progress(inode))
return -EBUSY;
--
2.25.1
next prev parent reply other threads:[~2020-05-14 6:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 6:53 [PATCH V1 0/9] Enable ext4 support for per-file/directory DAX operations ira.weiny
2020-05-14 6:53 ` [PATCH V1 1/9] fs/ext4: Narrow scope of DAX check in setflags ira.weiny
2020-05-14 6:53 ` ira.weiny [this message]
2020-05-14 10:21 ` [PATCH V1 2/9] fs/ext4: Disallow verity if inode is DAX Jan Kara
2020-05-14 6:53 ` [PATCH V1 3/9] fs/ext4: Disallow encryption " ira.weiny
2020-05-14 10:23 ` Jan Kara
2020-05-14 6:53 ` [PATCH V1 4/9] fs/ext4: Change EXT4_MOUNT_DAX to EXT4_MOUNT_DAX_ALWAYS ira.weiny
2020-05-14 6:53 ` [PATCH V1 5/9] fs/ext4: Update ext4_should_use_dax() ira.weiny
2020-05-14 6:53 ` [PATCH V1 6/9] fs/ext4: Only change S_DAX on inode load ira.weiny
2020-05-14 6:53 ` [PATCH V1 7/9] fs/ext4: Make DAX mount option a tri-state ira.weiny
2020-05-14 11:25 ` Jan Kara
2020-05-14 14:27 ` Ira Weiny
2020-05-14 15:08 ` Darrick J. Wong
2020-05-15 3:38 ` Ira Weiny
2020-05-14 6:53 ` [PATCH V1 8/9] fs/ext4: Introduce DAX inode flag ira.weiny
2020-05-14 11:06 ` Jan Kara
2020-05-14 6:53 ` [PATCH V1 9/9] Documentation/dax: Update DAX enablement for ext4 ira.weiny
2020-05-14 11:15 ` Jan Kara
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=20200514065316.2500078-3-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=adilger.kernel@dilger.ca \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).