Skip to content

xfstests: update verity tests for non-4K block and page size

Eric Biggers fstests linux-fscrypt 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest10 patches 1 replyIn review
  2. v210 patches 5 repliesSuperseded
  3. v110 patches 3 repliesSuperseded

Changes in v3 from the cover letter

- Fixed generic/574 failure with some bash versions.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10common/verity: add and use _fsv_can_enable()common/verity tests/generic/575 tests/generic/577+8 -130 replies
2/10common/verity: set FSV_BLOCK_SIZE to an appropriate valuecommon/verity+27 -50 replies
3/10common/verity: use FSV_BLOCK_SIZE by defaultcommon/verity+14 -20 replies
4/10common/verity: add _filter_fsverity_digest()common/verity+8 -00 replies
5/10generic/572: support non-4K Merkle tree block sizetests/generic/572 tests/generic/572.out+9 -220 replies
6/10generic/573: support non-4K Merkle tree block sizetests/generic/573+4 -40 replies
7/10generic/577: support non-4K Merkle tree block sizetests/generic/577 tests/generic/577.out+17 -150 replies
8/10generic/574: test multiple Merkle tree block sizestests/generic/574 tests/generic/574.out+136 -1660 replies
9/10generic/624: test multiple Merkle tree block sizescommon/verity tests/generic/624 tests/generic/624.out+101 -440 replies
10/10generic/575: test 1K Merkle tree block sizetests/generic/575 tests/generic/575.out+47 -180 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 00/10] xfstests: update verity tests for non-4K block and page size

This series updates the verity xfstests to eliminate implicit assumptions that 'merkle_tree_block_size == fs_block_size == page_size == 4096', and to provide some test coverage for cases where merkle_tree_block_size differs from fs_block_size and/or page_size. It doesn't add any new test scripts, but it does update some of the existing test scripts to test multiple block sizes.

This goes along with my kernel patch series
"fsverity: support for non-4K pages"
(https://lore.kernel.org/linux-fsdevel/[email protected]/T/#u).
However, it's not necessary to wait for that kernel patch series to be applied before applying this xfstests patch series.

Changed in v3:
- Fixed generic/574 failure with some bash versions.

Changed in v2:
- Adjusted the output of generic/574, generic/575, and generic/624 slightly to avoid confusion.

Eric Biggers (10):
common/verity: add and use _fsv_can_enable() common/verity: set FSV_BLOCK_SIZE to an appropriate value common/verity: use FSV_BLOCK_SIZE by default common/verity: add _filter_fsverity_digest() generic/572: support non-4K Merkle tree block size generic/573: support non-4K Merkle tree block size generic/577: support non-4K Merkle tree block size generic/574: test multiple Merkle tree block sizes generic/624: test multiple Merkle tree block sizes generic/575: test 1K Merkle tree block size

 common/verity         |  84 ++++++++++++----
 tests/generic/572     |  21 ++--
 tests/generic/572.out |  10 +-
 tests/generic/573     |   8 +-
 tests/generic/574     | 219 +++++++++++++++++++++++++-----------------
 tests/generic/574.out |  83 +---------------
 tests/generic/575     |  57 ++++++++---
 tests/generic/575.out |   8 +-
 tests/generic/577     |  24 ++---
 tests/generic/577.out |  10 +-
 tests/generic/624     | 119 ++++++++++++++++-------
 tests/generic/624.out |  15 +--
 12 files changed, 370 insertions(+), 288 deletions(-)

base-commit: 3dc46f477b39d732e1841e6f5a180759cee3e8ce

Signature · 1 line
2.39.0