public inbox for linux-ext4@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrey Albershteyn <aalbersh@kernel.org>
To: linux-xfs@vger.kernel.org, fsverity@lists.linux.dev,
	linux-fsdevel@vger.kernel.org, ebiggers@kernel.org
Cc: Andrey Albershteyn <aalbersh@kernel.org>,
	hch@lst.de, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-btrfs@vger.kernel.org, djwong@kernel.org
Subject: [PATCH v6 12/22] xfs: disable direct read path for fs-verity files
Date: Tue, 31 Mar 2026 23:28:13 +0200	[thread overview]
Message-ID: <20260331212827.2631020-13-aalbersh@kernel.org> (raw)
In-Reply-To: <20260331212827.2631020-1-aalbersh@kernel.org>

The direct path is not supported on verity files. Attempts to use direct
I/O path on such files should fall back to buffered I/O path.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
---
 fs/xfs/xfs_file.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index a980ac5196a8..6fa9835f9531 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -282,7 +282,8 @@ xfs_file_dax_read(
 	struct kiocb		*iocb,
 	struct iov_iter		*to)
 {
-	struct xfs_inode	*ip = XFS_I(iocb->ki_filp->f_mapping->host);
+	struct inode		*inode = iocb->ki_filp->f_mapping->host;
+	struct xfs_inode	*ip = XFS_I(inode);
 	ssize_t			ret = 0;
 
 	trace_xfs_file_dax_read(iocb, to);
@@ -333,6 +334,14 @@ xfs_file_read_iter(
 	if (xfs_is_shutdown(mp))
 		return -EIO;
 
+	/*
+	 * In case fs-verity is enabled, we also fallback to the buffered read
+	 * from the direct read path. Therefore, IOCB_DIRECT is set and need to
+	 * be cleared (see generic_file_read_iter())
+	 */
+	if (fsverity_active(inode))
+		iocb->ki_flags &= ~IOCB_DIRECT;
+
 	if (IS_DAX(inode))
 		ret = xfs_file_dax_read(iocb, to);
 	else if (iocb->ki_flags & IOCB_DIRECT)
-- 
2.51.2


  parent reply	other threads:[~2026-03-31 21:29 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-31 21:28 [PATCH v6 00/22] fs-verity support for XFS with post EOF merkle tree Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 01/22] fsverity: report validation errors through fserror to fsnotify Andrey Albershteyn
2026-04-01 21:19   ` Eric Biggers
2026-03-31 21:28 ` [PATCH v6 02/22] fsverity: expose ensure_fsverity_info() Andrey Albershteyn
2026-04-01  6:27   ` Christoph Hellwig
2026-04-01 22:02   ` Eric Biggers
2026-04-02 14:02     ` Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 03/22] fsverity: generate and store zero-block hash Andrey Albershteyn
2026-04-01 22:27   ` Eric Biggers
2026-04-02 14:47     ` Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 04/22] fsverity: pass digest size and hash of the empty block to ->write Andrey Albershteyn
2026-04-01 23:36   ` Eric Biggers
2026-03-31 21:28 ` [PATCH v6 05/22] fsverity: hoist pagecache_read from f2fs/ext4 to fsverity Andrey Albershteyn
2026-04-01 23:44   ` Eric Biggers
2026-03-31 21:28 ` [PATCH v6 06/22] iomap: introduce IOMAP_F_FSVERITY and teach writeback to handle fsverity Andrey Albershteyn
2026-04-01  6:28   ` Christoph Hellwig
2026-03-31 21:28 ` [PATCH v6 07/22] iomap: teach iomap to read files with fsverity Andrey Albershteyn
2026-03-31 23:30   ` Darrick J. Wong
2026-04-01  6:30   ` Christoph Hellwig
2026-03-31 21:28 ` [PATCH v6 08/22] iomap: introduce iomap_fsverity_write() for writing fsverity metadata Andrey Albershteyn
2026-03-31 23:32   ` Darrick J. Wong
2026-03-31 21:28 ` [PATCH v6 09/22] xfs: introduce fsverity on-disk changes Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 10/22] xfs: initialize fs-verity on file open Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 11/22] xfs: don't allow to enable DAX on fs-verity sealed inode Andrey Albershteyn
2026-03-31 21:28 ` Andrey Albershteyn [this message]
2026-03-31 21:28 ` [PATCH v6 13/22] xfs: handle fsverity I/O in write/read path Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 14/22] xfs: use read ioend for fsverity data verification Andrey Albershteyn
2026-03-31 23:34   ` Darrick J. Wong
2026-03-31 21:28 ` [PATCH v6 15/22] xfs: add fs-verity support Andrey Albershteyn
2026-03-31 23:35   ` Darrick J. Wong
2026-04-01 23:57   ` Eric Biggers
2026-03-31 21:28 ` [PATCH v6 16/22] xfs: remove unwritten extents after preallocations in fsverity metadata Andrey Albershteyn
2026-03-31 23:36   ` Darrick J. Wong
2026-03-31 21:28 ` [PATCH v6 17/22] xfs: add fs-verity ioctls Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 18/22] xfs: advertise fs-verity being available on filesystem Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 19/22] xfs: check and repair the verity inode flag state Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 20/22] xfs: introduce health state for corrupted fsverity metadata Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 21/22] xfs: add fsverity traces Andrey Albershteyn
2026-04-01  6:31   ` Christoph Hellwig
2026-04-01 13:19     ` Andrey Albershteyn
2026-03-31 21:28 ` [PATCH v6 22/22] xfs: enable ro-compat fs-verity flag Andrey Albershteyn
2026-04-01  6:32   ` Christoph Hellwig
2026-04-01  6:32 ` [PATCH v6 00/22] fs-verity support for XFS with post EOF merkle tree Christoph Hellwig

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=20260331212827.2631020-13-aalbersh@kernel.org \
    --to=aalbersh@kernel.org \
    --cc=djwong@kernel.org \
    --cc=ebiggers@kernel.org \
    --cc=fsverity@lists.linux.dev \
    --cc=hch@lst.de \
    --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 \
    /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