[PATCH v4 07/12] arch/powerpc: don't initialize kasan if it's disabled

[Baoquan He]

This includes 32bit, book3s/64 and book3e/64.

Signed-off-by: Baoquan He <b...@redhat.com>
Cc: linuxppc-...@lists.ozlabs.org
---
 arch/powerpc/mm/kasan/init_32.c        | 5 ++++-
 arch/powerpc/mm/kasan/init_book3e_64.c | 3 +++
 arch/powerpc/mm/kasan/init_book3s_64.c | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/mm/kasan/init_32.c b/arch/powerpc/mm/kasan/init_32.c
index 1d083597464f..b0651ff9d44d 100644
--- a/arch/powerpc/mm/kasan/init_32.c
+++ b/arch/powerpc/mm/kasan/init_32.c
@@ -141,6 +141,9 @@ void __init kasan_init(void)
        u64 i;
        int ret;
 
+       if (kasan_arg_disabled)
+               return;
+
        for_each_mem_range(i, &base, &end) {
                phys_addr_t top = min(end, total_lowmem);
 
@@ -170,7 +173,7 @@ void __init kasan_init(void)
 
 void __init kasan_late_init(void)
 {
-       if (IS_ENABLED(CONFIG_KASAN_VMALLOC))
+       if (IS_ENABLED(CONFIG_KASAN_VMALLOC) && kasan_enabled())
                kasan_unmap_early_shadow_vmalloc();
 }
 
diff --git a/arch/powerpc/mm/kasan/init_book3e_64.c 
b/arch/powerpc/mm/kasan/init_book3e_64.c
index 0d3a73d6d4b0..f75c1e38a011 100644
--- a/arch/powerpc/mm/kasan/init_book3e_64.c
+++ b/arch/powerpc/mm/kasan/init_book3e_64.c
@@ -111,6 +111,9 @@ void __init kasan_init(void)
        u64 i;
        pte_t zero_pte = pfn_pte(virt_to_pfn(kasan_early_shadow_page), 
PAGE_KERNEL_RO);
 
+       if (kasan_arg_disabled)
+               return;
+
        for_each_mem_range(i, &start, &end)
                kasan_init_phys_region(phys_to_virt(start), phys_to_virt(end));
 
diff --git a/arch/powerpc/mm/kasan/init_book3s_64.c 
b/arch/powerpc/mm/kasan/init_book3s_64.c
index dcafa641804c..8c6940e835d4 100644
--- a/arch/powerpc/mm/kasan/init_book3s_64.c
+++ b/arch/powerpc/mm/kasan/init_book3s_64.c
@@ -54,6 +54,9 @@ void __init kasan_init(void)
        u64 i;
        pte_t zero_pte = pfn_pte(virt_to_pfn(kasan_early_shadow_page), 
PAGE_KERNEL);
 
+       if (kasan_arg_disabled)
+               return;
+
        if (!early_radix_enabled()) {
                pr_warn("KASAN not enabled as it requires radix!");
                return;
-- 
2.41.0