From abe91c040823a7492af79c059f4b2fda9b5d68be Mon Sep 17 00:00:00 2001 From: Yousaf Kaukab Date: Apr 27 2023 15:01:31 +0000 Subject: arm64: enable jump-label jump-label was disabled on arm64 by a backport error. Refresh patches.rt/jump-label-disable-if-stop_machine-is-used.patch to fix the error. Update arm64 config to reflect the change. Signed-off-by: Yousaf Kaukab --- diff --git a/config-test/arm64/rt b/config-test/arm64/rt index 20fa342..8deeb4f 100644 --- a/config-test/arm64/rt +++ b/config-test/arm64/rt @@ -477,7 +477,8 @@ CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y CONFIG_AS_HAS_LDAPR=y CONFIG_AS_HAS_LSE_ATOMICS=y -# CONFIG_ARM64_LSE_ATOMICS is not set +CONFIG_ARM64_LSE_ATOMICS=y +CONFIG_ARM64_USE_LSE_ATOMICS=y # end of ARMv8.1 architectural features # @@ -835,6 +836,8 @@ CONFIG_KEXEC_CORE=y CONFIG_HAVE_IMA_KEXEC=y CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set # CONFIG_STATIC_CALL_SELFTEST is not set CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set @@ -861,6 +864,7 @@ CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y CONFIG_MMU_GATHER_TABLE_FREE=y CONFIG_MMU_GATHER_RCU_TABLE_FREE=y @@ -11976,6 +11980,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y +CONFIG_KFENCE_STATIC_KEYS=y CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_STRESS_TEST_FAULTS=0 diff --git a/patches.rt/jump-label-disable-if-stop_machine-is-used.patch b/patches.rt/jump-label-disable-if-stop_machine-is-used.patch index 951b5a8..83848f7 100644 --- a/patches.rt/jump-label-disable-if-stop_machine-is-used.patch +++ b/patches.rt/jump-label-disable-if-stop_machine-is-used.patch @@ -1,11 +1,10 @@ -From aca8026dd8bf090519a71fbe14bceeb21d6749e6 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 8 Jul 2015 17:14:48 +0200 -Subject: [PATCH] jump-label: disable if stop_machine() is used +Subject: jump-label: disable if stop_machine() is used References: SLE Realtime Extension Patch-mainline: Queued in subsystem maintainer repository -Git-commit: 258b5e7d72c1fe3f55099507ea86a60165973690 +Git-commit: a4b028ce18879ed2b96a2597e3315586a4cca93f Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git Some architectures are using stop_machine() while switching the opcode which @@ -25,21 +24,24 @@ Signed-off-by: Thomas Gleixner [bigeasy: only ARM for now] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner -Signed-off-by: Mel Gorman +Signed-off-by: Yousaf Kaukab --- - arch/arm64/Kconfig | 2 +- + arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 264863e93811..2e4751f1b391 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -146,7 +146,7 @@ config ARM64 - select HAVE_ARCH_BITREVERSE - select HAVE_ARCH_COMPILER_H - select HAVE_ARCH_HUGE_VMAP -- select HAVE_ARCH_JUMP_LABEL -+ select HAVE_ARCH_JUMP_LABEL if !PREEMPT_RT - select HAVE_ARCH_JUMP_LABEL_RELATIVE - select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48) - select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 2fb7012c3246..8c4b5fc9a03c 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -69,7 +69,7 @@ config ARM + select HARDIRQS_SW_RESEND + select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT + select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 +- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU ++ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT + select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU + select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL + select HAVE_ARCH_MMAP_RND_BITS if MMU +-- +2.35.3 +