]> git.itanic.dy.fi Git - linux-stable/commitdiff
mmc: mmc_test: Remove local_irq_{save,restore}() around sg_copy_{from,to}_buffer()
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 5 Oct 2022 10:19:44 +0000 (13:19 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 7 Dec 2022 12:22:32 +0000 (13:22 +0100)
sg_copy_{from,to}_buffer() call sg_copy_buffer() which uses an
sg_mapping_iter with flag SG_MITER_ATOMIC, so then sg_miter_next() uses
kmap_atomic() to map pages.

A long time ago the kmap_atomic API required a slot to be provided which
risked the possibility that other code might use the same slot at the
same time. Disabling interrupts prevented the possibility of an interrupt
handler doing that. However, that went away with
commit 3e4d3af501cc ("mm: stack based kmap_atomic()").

Remove local_irq_{save,restore}() around sg_copy_{from,to}_buffer().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20221005101951.3165-8-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/mmc_test.c

index 155ce2bdfe6220adb94fbe03da702610a160e2e2..156d34b2ed4d433b8a014b86cc6bb3c59c667e16 100644 (file)
@@ -932,7 +932,6 @@ static int mmc_test_transfer(struct mmc_test_card *test,
        unsigned blocks, unsigned blksz, int write)
 {
        int ret, i;
-       unsigned long flags;
 
        if (write) {
                for (i = 0; i < blocks * blksz; i++)
@@ -940,9 +939,7 @@ static int mmc_test_transfer(struct mmc_test_card *test,
        } else {
                memset(test->scratch, 0, BUFFER_SIZE);
        }
-       local_irq_save(flags);
        sg_copy_from_buffer(sg, sg_len, test->scratch, BUFFER_SIZE);
-       local_irq_restore(flags);
 
        ret = mmc_test_set_blksize(test, blksz);
        if (ret)
@@ -987,9 +984,7 @@ static int mmc_test_transfer(struct mmc_test_card *test,
                                return RESULT_FAIL;
                }
        } else {
-               local_irq_save(flags);
                sg_copy_to_buffer(sg, sg_len, test->scratch, BUFFER_SIZE);
-               local_irq_restore(flags);
                for (i = 0; i < blocks * blksz; i++) {
                        if (test->scratch[i] != (u8)i)
                                return RESULT_FAIL;