Linux filesystem development
 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 v11 05/20] fsverity: improve flushing performance of fsverity_fill_zerohash
Date: Fri, 10 Jul 2026 10:52:33 +0200	[thread overview]
Message-ID: <20260710085256.3464201-6-aalbersh@kernel.org> (raw)
In-Reply-To: <20260710085256.3464201-1-aalbersh@kernel.org>

The current version calls flush_dcache_folio(), in memcpy_to_folio(), to
flush whole folio on every digest (which is 128 for 4k). Open code folio
mapping and flushing to copy all digests at once.

Reported-by: Eric Biggers <ebiggers@kernel.org>
Link: https://lore.kernel.org/linux-fsdevel/20260401222717.GH2466@quark/
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
---
 fs/verity/pagecache.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/fs/verity/pagecache.c b/fs/verity/pagecache.c
index 9d82e6b74ba1..270abd652e48 100644
--- a/fs/verity/pagecache.c
+++ b/fs/verity/pagecache.c
@@ -68,14 +68,32 @@ EXPORT_SYMBOL_GPL(generic_readahead_merkle_tree);
 void fsverity_fill_zerohash(struct folio *folio, size_t offset, size_t len,
 			      struct fsverity_info *vi)
 {
-	size_t off = offset;
+	void *vaddr;
+	void *to;
+	size_t chunk;
 
 	WARN_ON_ONCE(!IS_ALIGNED(offset, vi->tree_params.digest_size));
 	WARN_ON_ONCE(!IS_ALIGNED(len, vi->tree_params.digest_size));
+	WARN_ON_ONCE(offset + len > folio_size(folio));
 
-	for (; off < (offset + len); off += vi->tree_params.digest_size)
-		memcpy_to_folio(folio, off, vi->tree_params.zero_digest,
+	do {
+		vaddr = kmap_local_folio(folio, offset);
+		chunk = len;
+		to = vaddr;
+
+		if (folio_test_partial_kmap(folio) &&
+		    chunk > PAGE_SIZE - offset_in_page(offset))
+			chunk = PAGE_SIZE - offset_in_page(offset);
+		for (; to < (vaddr + chunk); to += vi->tree_params.digest_size)
+			memcpy(to, vi->tree_params.zero_digest,
 				vi->tree_params.digest_size);
+		kunmap_local(vaddr);
+
+		offset += chunk;
+		len -= chunk;
+	} while (len > 0);
+
+	flush_dcache_folio(folio);
 }
 EXPORT_SYMBOL_GPL(fsverity_fill_zerohash);
 
-- 
2.54.0


  parent reply	other threads:[~2026-07-10  8:53 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-10  8:52 [PATCH v11 00/20] fs-verity support for XFS with post EOF merkle tree Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 01/20] fsverity: report validation errors through fserror to fsnotify Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 02/20] fsverity: expose ensure_fsverity_info() Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 03/20] fsverity: pass digest size and hash of the all-zeroes block to ->write Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 04/20] fsverity: hoist pagecache_read from f2fs/ext4 to fsverity Andrey Albershteyn
2026-07-10  8:52 ` Andrey Albershteyn [this message]
2026-07-10  8:52 ` [PATCH v11 06/20] fsverity: don't allow setting DAX file attribute on fsverity files Andrey Albershteyn
2026-07-10 23:46   ` Eric Biggers
2026-07-10  8:52 ` [PATCH v11 07/20] xfs: introduce fsverity on-disk changes Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 08/20] xfs: initialize fs-verity on file open Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 09/20] xfs: don't allow to enable DAX on fs-verity sealed inode Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 10/20] xfs: don't report dio_mem_align and dio_offset_align for fsverity files Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 11/20] xfs: disable direct read path for fs-verity files Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 12/20] xfs: handle fsverity I/O in write/read path Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 13/20] xfs: use read ioend for fsverity data verification Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 14/20] xfs: add fs-verity support Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 15/20] xfs: remove unwritten extents after preallocations in fsverity metadata Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 16/20] xfs: add fs-verity ioctls Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 17/20] xfs: advertise fs-verity being available on filesystem Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 18/20] xfs: check and repair the verity inode flag state Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 19/20] xfs: introduce health state for corrupted fsverity metadata Andrey Albershteyn
2026-07-10  8:52 ` [PATCH v11 20/20] xfs: enable ro-compat fs-verity flag Andrey Albershteyn
2026-07-10 10:38 ` [PATCH v11 00/20] fs-verity support for XFS with post EOF merkle tree Andrey Albershteyn

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=20260710085256.3464201-6-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