diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2019-01-10 16:10:51 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-14 18:11:04 +0000 |
| commit | 9b1111857264b14ca67a0a50e52377f62a5bd989 (patch) | |
| tree | ce41981dff7d89466081eb89f012714382841723 | |
| parent | 8a007427f605a128de504530591de0bcbe623509 (diff) | |
Revert "ANDROID: dm: verity: add minimum prefetch size"
This reverts commit b7a823da74712b8d34480609de9d3eb3b3bbb467.
Bug: 71728490
Change-Id: I3c17713b52ae4b614b9ee814ed2f6e67cee991cf
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
| -rw-r--r-- | drivers/md/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/md/dm-verity-target.c | 9 |
2 files changed, 1 insertions, 24 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index ec359e16525b..e458bd8519e8 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -460,21 +460,6 @@ config DM_VERITY If unsure, say N. -config DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 - bool "Prefetch size 128" - -config DM_VERITY_HASH_PREFETCH_MIN_SIZE - int "Verity hash prefetch minimum size" - depends on DM_VERITY - range 1 4096 - default 128 if DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 - default 1 - ---help--- - This sets minimum number of hash blocks to prefetch for dm-verity. - For devices like eMMC, having larger prefetch size like 128 can improve - performance with increased memory consumption for keeping more hashes - in RAM. - config DM_VERITY_FEC bool "Verity forward error correction support" depends on DM_VERITY @@ -574,7 +559,6 @@ config DM_ANDROID_VERITY depends on KEYS depends on ASYMMETRIC_KEY_TYPE depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE - select DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 ---help--- This device-mapper target is virtually a VERITY target. This target is setup by reading the metadata contents piggybacked diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index c1f76a171b80..5cf77ab1b630 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -625,7 +625,6 @@ static void verity_prefetch_io(struct work_struct *work) container_of(work, struct dm_verity_prefetch_work, work); struct dm_verity *v = pw->v; int i; - sector_t prefetch_size; for (i = v->levels - 2; i >= 0; i--) { sector_t hash_block_start; @@ -648,14 +647,8 @@ static void verity_prefetch_io(struct work_struct *work) hash_block_end = v->hash_blocks - 1; } no_prefetch_cluster: - // for emmc, it is more efficient to send bigger read - prefetch_size = max((sector_t)CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE, - hash_block_end - hash_block_start + 1); - if ((hash_block_start + prefetch_size) >= (v->hash_start + v->hash_blocks)) { - prefetch_size = hash_block_end - hash_block_start + 1; - } dm_bufio_prefetch(v->bufio, hash_block_start, - prefetch_size); + hash_block_end - hash_block_start + 1); } kfree(pw); |