Revert "ANDROID: dm verity: add minimum prefetch size"

This reverts commit ace74ccf82cfb2b73ce1df2e698d20c2fbc559dd.

Bug: 71728490
Change-Id: Iebcb0cd9982f36c4bd2552811f9147325a291db0
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 5649d1ab008381fe9391499c46c957916c03d046..cef37a190c2cb5141a17da6a875f6e51b5fcd9b7 100644 (file)
--- 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 ASYMMETRIC_KEY_TYPE
        depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
        depends on MD_LINEAR=y
-       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 3294b8a8788795a2bc44b7235976a9c1ad631b05..ff24ed6bc3cc0cf3652d474fcc2cfdd33b45db02 100644 (file)
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -702,7 +702,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;
@@ -725,14 +724,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);