lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 630/849] powerpc/booke: Disable STRICT_KERNEL_RWX, DEBUG_PAGEALLOC and KFENCE
    Date
    From: Christophe Leroy <christophe.leroy@csgroup.eu>

    [ Upstream commit 68b44f94d6370e2c6c790fedd28e637fa9964a93 ]

    fsl_booke and 44x are not able to map kernel linear memory with
    pages, so they can't support DEBUG_PAGEALLOC and KFENCE, and
    STRICT_KERNEL_RWX is also a problem for now.

    Enable those only on book3s (both 32 and 64 except KFENCE), 8xx and 40x.

    Fixes: 88df6e90fa97 ("[POWERPC] DEBUG_PAGEALLOC for 32-bit")
    Fixes: 95902e6c8864 ("powerpc/mm: Implement STRICT_KERNEL_RWX on PPC32")
    Fixes: 90cbac0e995d ("powerpc: Enable KFENCE for PPC32")
    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/d1ad9fdd9b27da3fdfa16510bb542ed51fa6e134.1634292136.git.christophe.leroy@csgroup.eu
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/Kconfig | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
    index 663766fbf5055..d4d274bb07ffa 100644
    --- a/arch/powerpc/Kconfig
    +++ b/arch/powerpc/Kconfig
    @@ -141,7 +141,7 @@ config PPC
    select ARCH_HAS_PTE_SPECIAL
    select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64
    select ARCH_HAS_SET_MEMORY
    - select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION)
    + select ARCH_HAS_STRICT_KERNEL_RWX if (PPC_BOOK3S || PPC_8xx || 40x) && !HIBERNATION
    select ARCH_HAS_STRICT_MODULE_RWX if ARCH_HAS_STRICT_KERNEL_RWX && !PPC_BOOK3S_32
    select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
    select ARCH_HAS_UACCESS_FLUSHCACHE
    @@ -153,7 +153,7 @@ config PPC
    select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
    select ARCH_STACKWALK
    select ARCH_SUPPORTS_ATOMIC_RMW
    - select ARCH_SUPPORTS_DEBUG_PAGEALLOC if PPC32 || PPC_BOOK3S_64
    + select ARCH_SUPPORTS_DEBUG_PAGEALLOC if PPC_BOOK3S || PPC_8xx || 40x
    select ARCH_USE_BUILTIN_BSWAP
    select ARCH_USE_CMPXCHG_LOCKREF if PPC64
    select ARCH_USE_MEMTEST
    @@ -194,7 +194,7 @@ config PPC
    select HAVE_ARCH_JUMP_LABEL_RELATIVE
    select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14
    select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14
    - select HAVE_ARCH_KFENCE if PPC32
    + select HAVE_ARCH_KFENCE if PPC_BOOK3S_32 || PPC_8xx || 40x
    select HAVE_ARCH_KGDB
    select HAVE_ARCH_MMAP_RND_BITS
    select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:13    [W:4.152 / U:1.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site