From e427b717a0b4cb28f6e6b1cb8e1b80cd5988273a Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 29 Mar 2023 20:37:48 +0200 Subject: [PATCH] kasan: suppress recursive reports for HW_TAGS disable preemption instead of migration, fix comment typo Link: https://lkml.kernel.org/r/d14417c8bc5eea7589e99381203432f15c0f9138.1680114854.git.andreyknvl@google.com Fixes: 2e903b914797 ("kasan, arm64: implement HW_TAGS runtime") Signed-off-by: Andrey Konovalov Reported-by: Weizhao Ouyang Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Catalin Marinas Cc: Dmitry Vyukov Cc: Evgenii Stepanov Cc: Marco Elver Cc: Peter Collingbourne Cc: Vincenzo Frascino Cc: Will Deacon Signed-off-by: Andrew Morton --- mm/kasan/report.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 77a88d85c0a7..892a9dc9d4d3 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -81,7 +81,7 @@ __setup("kasan_multi_shot", kasan_set_multi_shot); * * Hardware Tag-Based KASAN instead relies on: * For #1: Resetting tags via kasan_reset_tag(). - * For #2: Supression of tag checks via CPU, see report_suppress_start/end(). + * For #2: Suppression of tag checks via CPU, see report_suppress_start/end(). */ static bool report_suppressed_sw(void) { @@ -96,10 +96,10 @@ static void report_suppress_start(void) { #ifdef CONFIG_KASAN_HW_TAGS /* - * Disable migration for the duration of printing a KASAN report, as + * Disable preemption for the duration of printing a KASAN report, as * hw_suppress_tag_checks_start() disables checks on the current CPU. */ - migrate_disable(); + preempt_disable(); hw_suppress_tag_checks_start(); #else kasan_disable_current(); @@ -110,7 +110,7 @@ static void report_suppress_stop(void) { #ifdef CONFIG_KASAN_HW_TAGS hw_suppress_tag_checks_stop(); - migrate_enable(); + preempt_enable(); #else kasan_enable_current(); #endif -- 2.50.1