On Thu, Dec 29, 2022 at 03:32:12PM -0800, Eric Biggers wrote: > 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/20221223203638.41293-1-ebiggers@xxxxxxxxxx/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. Thanks for fixing this failure, this version looks good to me. I'd like to merge this patchset with my RVB. > > 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 > -- > 2.39.0 >
