diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-12-23 12:36:29 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-09 19:05:54 -0800 |
| commit | 9098f36b739db9a77d24b7c302dcb9d3fe987308 (patch) | |
| tree | 6eab452a3fd714bfb23088ef2f642468f73b7130 /fs/verity/fsverity_private.h | |
| parent | 284d5db5f99efa9e3549eb3cba39379d48879db1 (diff) | |
| download | linux-9098f36b739db9a77d24b7c302dcb9d3fe987308.tar.gz linux-9098f36b739db9a77d24b7c302dcb9d3fe987308.tar.bz2 linux-9098f36b739db9a77d24b7c302dcb9d3fe987308.zip | |
fsverity: simplify Merkle tree readahead size calculation
First, calculate max_ra_pages more efficiently by using the bio size.
Second, calculate the number of readahead pages from the hash page
index, instead of calculating it ahead of time using the data page
index. This ends up being a bit simpler, especially since level 0 is
last in the tree, so we can just limit the readahead to the tree size.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://lore.kernel.org/r/20221223203638.41293-3-ebiggers@kernel.org
Diffstat (limited to 'fs/verity/fsverity_private.h')
| -rw-r--r-- | fs/verity/fsverity_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/verity/fsverity_private.h b/fs/verity/fsverity_private.h index e8b40c8000be..48b97f5d0556 100644 --- a/fs/verity/fsverity_private.h +++ b/fs/verity/fsverity_private.h @@ -46,7 +46,7 @@ struct merkle_tree_params { unsigned int log_arity; /* log2(hashes_per_block) */ unsigned int num_levels; /* number of levels in Merkle tree */ u64 tree_size; /* Merkle tree size in bytes */ - unsigned long level0_blocks; /* number of blocks in tree level 0 */ + unsigned long tree_pages; /* Merkle tree size in pages */ /* * Starting block index for each tree level, ordered from leaf level (0) |