powerpc: kcsan: Add exclusions from instrumentation
PATCH 1/5 powerpc: kcsan: Add exclusions from instrumentation
Exclude various incompatible compilation units from KCSAN instrumentation.
--- arch/powerpc/kernel/Makefile | 10 ++++++++++ arch/powerpc/kernel/trace/Makefile | 1 + arch/powerpc/kernel/vdso/Makefile | 1 + arch/powerpc/lib/Makefile | 2 ++ arch/powerpc/purgatory/Makefile | 1 + arch/powerpc/xmon/Makefile | 1 + 6 files changed, 16 insertions(+)
arch/powerpc/kernel/Makefile +10 -0
@@ -54,6 +54,13 @@ CFLAGS_cputable.o += -DDISABLE_BRANCH_PROFILING CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING endif +KCSAN_SANITIZE_early_32.o := n +KCSAN_SANITIZE_early_64.o := n +KCSAN_SANITIZE_cputable.o := n +KCSAN_SANITIZE_btext.o := n +KCSAN_SANITIZE_paca.o := n +KCSAN_SANITIZE_setup_64.o := n + #ifdef CONFIG_RANDOMIZE_KSTACK_OFFSET # Remove stack protector to avoid triggering unneeded stack canary # checks due to randomize_kstack_offset.
@@ -177,12 +184,15 @@ obj-$(CONFIG_PPC_SECVAR_SYSFS) += secvar-sysfs.o # Disable GCOV, KCOV & sanitizers in odd or sensitive code GCOV_PROFILE_prom_init.o := n KCOV_INSTRUMENT_prom_init.o := n +KCSAN_SANITIZE_prom_init.o := n UBSAN_SANITIZE_prom_init.o := n GCOV_PROFILE_kprobes.o := n KCOV_INSTRUMENT_kprobes.o := n +KCSAN_SANITIZE_kprobes.o := n UBSAN_SANITIZE_kprobes.o := n GCOV_PROFILE_kprobes-ftrace.o := n KCOV_INSTRUMENT_kprobes-ftrace.o := n +KCSAN_SANITIZE_kprobes-ftrace.o := n UBSAN_SANITIZE_kprobes-ftrace.o := n GCOV_PROFILE_syscall_64.o := n KCOV_INSTRUMENT_syscall_64.o := n
arch/powerpc/kernel/trace/Makefile +1 -0
@@ -23,4 +23,5 @@ obj-$(CONFIG_PPC32) += $(obj32-y) # Disable GCOV, KCOV & sanitizers in odd or sensitive code GCOV_PROFILE_ftrace.o := n KCOV_INSTRUMENT_ftrace.o := n +KCSAN_SANITIZE_ftrace.o := n UBSAN_SANITIZE_ftrace.o := n
arch/powerpc/kernel/vdso/Makefile +1 -0
@@ -46,6 +46,7 @@ GCOV_PROFILE := n KCOV_INSTRUMENT := n UBSAN_SANITIZE := n KASAN_SANITIZE := n +KCSAN_SANITIZE := n ccflags-y := -shared -fno-common -fno-builtin -nostdlib -Wl,--hash-style=both ccflags-$(CONFIG_LD_IS_LLD) += $(call cc-option,--ld-path=$(LD),-fuse-ld=lld)
arch/powerpc/lib/Makefile +2 -0
@@ -16,6 +16,8 @@ KASAN_SANITIZE_feature-fixups.o := n # restart_table.o contains functions called in the NMI interrupt path # which can be in real mode. Disable KASAN. KASAN_SANITIZE_restart_table.o := n +KCSAN_SANITIZE_code-patching.o := n +KCSAN_SANITIZE_feature-fixups.o := n ifdef CONFIG_KASAN CFLAGS_code-patching.o += -DDISABLE_BRANCH_PROFILING
arch/powerpc/purgatory/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 KASAN_SANITIZE := n +KCSAN_SANITIZE := n targets += trampoline_$(BITS).o purgatory.ro
arch/powerpc/xmon/Makefile +1 -0
@@ -5,6 +5,7 @@ GCOV_PROFILE := n KCOV_INSTRUMENT := n UBSAN_SANITIZE := n KASAN_SANITIZE := n +KCSAN_SANITIZE := n # Disable ftrace for the entire directory ccflags-remove-$(CONFIG_FUNCTION_TRACER) += $(CC_FLAGS_FTRACE)
Signature · 1 line
2.37.2
PATCH 2/5 powerpc: kcsan: Exclude udelay to prevent recursive instrumentation
In order for KCSAN to increase its likelihood of observing a data race, it sets a watchpoint on memory accesses and stalls, allowing for detection of conflicting accesses by other kernel threads or interrupts.
Stalls are implemented by injecting a call to udelay in instrumented code. To prevent recursive instrumentation, exclude udelay from being instrumented.
--- arch/powerpc/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/time.c +2 -2
@@ -356,7 +356,7 @@ void vtime_flush(struct task_struct *tsk) }#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ -void __delay (unsigned long loops) +void __no_kcsan __delay(unsigned long loops) {unsigned long start;
@@ -377,7 +377,7 @@ void __delay(unsigned long loops) }EXPORT_SYMBOL (__delay); -void udelay (unsigned long usecs) +void __no_kcsan udelay(unsigned long usecs) {__delay (tb_ticks_per_usec * usecs); }
Signature · 1 line
2.37.2
PATCH 3/5 powerpc: kcsan: Memory barriers semantics
In reply to Rohan McLureAnnotate memory barriers *mb() with calls to kcsan_mb(), signaling to compilers supporting KCSAN that the respective memory barrier has been issued. Rename memory barrier *mb() to __*mb() to opt in for asm-generic/barrier.h to generate the respective *mb() macro.
--- arch/powerpc/include/asm/barrier.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/barrier.h +5 -5
@@ -35,9 +35,9 @@* However, on CPUs that don't support lwsync, lwsync actually maps to a * heavy-weight sync, so smp_wmb() can be a lighter-weight eieio. */ -#define mb () __asm__ __volatile__ ("sync" : : : "memory") -#define rmb () __asm__ __volatile__ ("sync" : : : "memory") -#define wmb () __asm__ __volatile__ ("sync" : : : "memory") +#define __mb () __asm__ __volatile__ ("sync" : : : "memory") +#define __rmb () __asm__ __volatile__ ("sync" : : : "memory") +#define __wmb () __asm__ __volatile__ ("sync" : : : "memory")/* The sub-arch has lwsync */ #if defined(CONFIG_PPC64 ) || defined(CONFIG_PPC_E500MC )
@@ -51,8 +51,8 @@/* clang defines this macro for a builtin, which will not work with runtime patching */ #undef __lwsync#define __lwsync () __asm__ __volatile__ (stringify_in_c(LWSYNC) : : :"memory") -#define dma_rmb () __lwsync() -#define dma_wmb () __asm__ __volatile__ (stringify_in_c(SMPWMB) : : :"memory") +#define __dma_rmb () __lwsync() +#define __dma_wmb () __asm__ __volatile__ (stringify_in_c(SMPWMB) : : :"memory")#define __smp_lwsync () __lwsync()
Signature · 1 line
2.37.2
PATCH 4/5 powerpc: kcsan: Prevent recursive instrumentation with IRQ save/restores
In reply to Rohan McLureInstrumented memory accesses provided by KCSAN will access core-local memories (which will save and restore IRQs) as well as restoring IRQs directly. Avoid recursive instrumentation by applying __no_kcsan annotation to IRQ restore routines.
--- arch/powerpc/kernel/irq_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/irq_64.c +3 -3
@@ -97,7 +97,7 @@ static inline bool irq_happened_test_and_clear(u8 irq)return false; } -void replay_soft_interrupts (void ) +__no_kcsan void replay_soft_interrupts(void) {struct pt_regs regs;
@@ -185,7 +185,7 @@ void replay_soft_interrupts(void) }#if defined(CONFIG_PPC_BOOK3S_64 ) && defined(CONFIG_PPC_KUAP ) -static inline void replay_soft_interrupts_irqrestore (void ) +__no_kcsan static inline void replay_soft_interrupts_irqrestore(void) {unsigned long kuap_state =get_kuap ();
@@ -209,7 +209,7 @@ static inline void replay_soft_interrupts_irqrestore(void)#define replay_soft_interrupts_irqrestore () replay_soft_interrupts()#endif -notrace void arch_local_irq_restore(unsigned long mask) +notrace __no_kcsan void arch_local_irq_restore(unsigned long mask) {unsigned char irq_happened;
Signature · 1 line
2.37.2
PATCH 5/5 powerpc: kcsan: Add KCSAN Support
In reply to Rohan McLureEnable HAVE_ARCH_KCSAN on all powerpc platforms, permitting use of the kernel concurrency sanitiser through the CONFIG_KCSAN_* kconfig options.
See documentation in Documentation/dev-tools/kcsan.rst for more information.
--- arch/powerpc/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/Kconfig +1 -0
@@ -198,6 +198,7 @@ config PPC select HAVE_ARCH_KASAN if PPC_RADIX_MMU select HAVE_ARCH_KASAN if PPC_BOOK3E_64 select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN + select HAVE_ARCH_KCSAN select HAVE_ARCH_KFENCE if ARCH_SUPPORTS_DEBUG_PAGEALLOC select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET select HAVE_ARCH_KGDB
Signature · 1 line
2.37.2