diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2019-01-10 16:09:03 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-14 10:17:47 -0800 |
| commit | a8a3becaead503f240c2b100d532e0a4a7918f62 (patch) | |
| tree | a881a0d31be86b8f274223f1b0c2ba92cd250095 | |
| parent | 146034729f804483da407dcabac42eb26d94abd3 (diff) | |
Revert "ANDROID: dm verity: add minimum prefetch size"
This reverts commit eb4228c7a5edcbfe1dc50c49323af6e6861ffaf7.
Bug: 71728490
Change-Id: I3efe020128134231aa826f6fc6519fd1b27edf02
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 ebdb7910666b..57f740d76b4f 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -459,21 +459,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 @@ -537,7 +522,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 b937daa875af..1a1fac47e4c7 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -529,7 +529,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; @@ -552,14 +551,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); |