On Wed, Mar 13, 2024 at 12:52:33AM +0100, Ilya Leoshkevich wrote: > On Mon, Mar 11, 2024 at 07:02:23PM +0800, Changbin Du wrote: > > On Mon, Mar 11, 2024 at 05:30:36PM +0800, Changbin Du wrote: > > > On Fri, Mar 08, 2024 at 10:39:15AM +0100, Marco Elver wrote: > > > > On Fri, 8 Mar 2024 at 05:36, 'Changbin Du' via kasan-dev > > > > <kasan-dev@xxxxxxxxxxxxxxxx> wrote: > > > > > > > > > > Hey, folks, > > > > > I found two instrumentation recursion issues on mainline kernel. > > > > > > > > > > 1. recur on preempt count. > > > > > __msan_metadata_ptr_for_load_4() -> kmsan_virt_addr_valid() -> preempt_disable() -> __msan_metadata_ptr_for_load_4() > > > > > > > > > > 2. recur in lockdep and rcu > > > > > __msan_metadata_ptr_for_load_4() -> kmsan_virt_addr_valid() -> pfn_valid() -> rcu_read_lock_sched() -> lock_acquire() -> rcu_is_watching() -> __msan_metadata_ptr_for_load_8() > > > > > > > > > > > > > > > Here is an unofficial fix, I don't know if it will generate false reports. > > > > > > > > > > $ git show > > > > > commit 7f0120b621c1cbb667822b0f7eb89f3c25868509 (HEAD -> master) > > > > > Author: Changbin Du <changbin.du@xxxxxxxxxx> > > > > > Date: Fri Mar 8 20:21:48 2024 +0800 > > > > > > > > > > kmsan: fix instrumentation recursions > > > > > > > > > > Signed-off-by: Changbin Du <changbin.du@xxxxxxxxxx> > > > > > > > > > > diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile > > > > > index 0db4093d17b8..ea925731fa40 100644 > > > > > --- a/kernel/locking/Makefile > > > > > +++ b/kernel/locking/Makefile > > > > > @@ -7,6 +7,7 @@ obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o > > > > > > > > > > # Avoid recursion lockdep -> sanitizer -> ... -> lockdep. > > > > > KCSAN_SANITIZE_lockdep.o := n > > > > > +KMSAN_SANITIZE_lockdep.o := n > > > > > > > > This does not result in false positives? > > > > > > This does result lots of false positives. > > > > > I saw a lot of reports but seems not related to this. > > > > > > [ 2.742743][ T0] BUG: KMSAN: uninit-value in unwind_next_frame+0x3729/0x48a0 > > > [ 2.744404][ T0] unwind_next_frame+0x3729/0x48a0 > > > [ 2.745623][ T0] arch_stack_walk+0x1d9/0x2a0 > > > [ 2.746838][ T0] stack_trace_save+0xb8/0x100 > > > [ 2.747928][ T0] set_track_prepare+0x88/0x120 > > > [ 2.749095][ T0] __alloc_object+0x602/0xbe0 > > > [ 2.750200][ T0] __create_object+0x3f/0x4e0 > > > [ 2.751332][ T0] pcpu_alloc+0x1e18/0x2b00 > > > [ 2.752401][ T0] mm_init+0x688/0xb20 > > > [ 2.753436][ T0] mm_alloc+0xf4/0x180 > > > [ 2.754510][ T0] poking_init+0x50/0x500 > > > [ 2.755594][ T0] start_kernel+0x3b0/0xbf0 > > > [ 2.756724][ T0] __pfx_reserve_bios_regions+0x0/0x10 > > > [ 2.758073][ T0] x86_64_start_kernel+0x92/0xa0 > > > [ 2.759320][ T0] secondary_startup_64_no_verify+0x176/0x17b > > > > > Above reports are triggered by KMEMLEAK and KFENCE. > > > > Now with below fix, I was able to run kmsan kernel with: > > CONFIG_DEBUG_KMEMLEAK=n > > CONFIG_KFENCE=n > > CONFIG_LOCKDEP=n > > > > KMEMLEAK and KFENCE generate too many false positives in unwinding code. > > LOCKDEP still introduces instrumenting recursions. > > FWIW I see the same issue on s390, and the best I could come up with so > far was also disabling lockdep. > > For KFENCE I have the following [1] though, maybe this will be helpful > to you as well? > > [1] https://patchwork.kernel.org/project/linux-mm/patch/20231213233605.661251-17-iii@xxxxxxxxxxxxx/ > > [...] So, I tried to brute force the issue and came up with the following. The goal was to minimize the usage of __no_sanitize_memory in order to avoid false positives. I don't propose to commit this, I'm posting this to highlight the intermediate problems that need to be solved. >From e3834f4e4ebe2596542a7464f8cc487e2c8e37c9 Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich <iii@xxxxxxxxxxxxx> Date: Wed, 13 Mar 2024 01:18:22 +0100 Subject: [PATCH] s390/kmsan: Fix lockdep recursion After commit 5ec8e8ea8b77 ("mm/sparsemem: fix race in accessing memory_section->usage"), an infinite mutual recursion between kmsan_get_metadata() and lock_acquire() arose. Teach lockdep recursion detection to handle it. The goal is to make lock_acquire() survive until lockdep_recursion_inc(). This requires solving a number of intermediate problems: 0. Disable KMSAN checks in lock_acquire(). 1. lock_acquire() calls instrumented trace_lock_acquire(). Force inlining. 2. trace_lock_acquire() calls instrumented cpu_online(). Force inlining. 3: trace_lock_acquire() calls instrumented rcu_is_watching(), which in turn calls instrumented __preempt_count_add(). Disable instrumentation in rcu_is_watching(). Disabling checks is not enough, because __preempt_count_add() would call __msan_instrument_asm_store(). Force inlinining of __preempt_count_add(). 4: lock_acquire() inlines lockdep_enabled(), which inlines __preempt_count_add(), which calls __msan_instrument_asm_store(). Don't inline lockdep_enabled() and disable KMSAN instrumentation in it. 5: lock_acquire() calls check_flags(), which calls the instrumented preempt_count(). Always inline preempt_count(). 6: lock_acquire() inlines lockdep_recursion_inc(), which needs to update KMSAN metadata. Do not inline lockdep_recursion_inc(), disable KMSAN instrumentation in it. 7: lock_acquire() calls instrumented lockdep_nmi(). Force inlining. With that, the KMSAN+lockdep kernel boots again, but unfortunately it is very slow. Signed-off-by: Ilya Leoshkevich <iii@xxxxxxxxxxxxx> --- arch/s390/include/asm/preempt.h | 12 ++++++------ include/linux/cpumask.h | 2 +- include/linux/tracepoint.h | 2 +- kernel/locking/lockdep.c | 10 +++++++--- kernel/rcu/tree.c | 1 + 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/s390/include/asm/preempt.h b/arch/s390/include/asm/preempt.h index bf15da0fedbc..225ce14bb0d6 100644 --- a/arch/s390/include/asm/preempt.h +++ b/arch/s390/include/asm/preempt.h @@ -12,7 +12,7 @@ #define PREEMPT_NEED_RESCHED 0x80000000 #define PREEMPT_ENABLED (0 + PREEMPT_NEED_RESCHED) -static inline int preempt_count(void) +static __always_inline int preempt_count(void) { return READ_ONCE(S390_lowcore.preempt_count) & ~PREEMPT_NEED_RESCHED; } @@ -44,7 +44,7 @@ static inline bool test_preempt_need_resched(void) return !(READ_ONCE(S390_lowcore.preempt_count) & PREEMPT_NEED_RESCHED); } -static inline void __preempt_count_add(int val) +static __always_inline void __preempt_count_add(int val) { /* * With some obscure config options and CONFIG_PROFILE_ALL_BRANCHES @@ -59,7 +59,7 @@ static inline void __preempt_count_add(int val) __atomic_add(val, &S390_lowcore.preempt_count); } -static inline void __preempt_count_sub(int val) +static __always_inline void __preempt_count_sub(int val) { __preempt_count_add(-val); } @@ -79,7 +79,7 @@ static inline bool should_resched(int preempt_offset) #define PREEMPT_ENABLED (0) -static inline int preempt_count(void) +static __always_inline int preempt_count(void) { return READ_ONCE(S390_lowcore.preempt_count); } @@ -102,12 +102,12 @@ static inline bool test_preempt_need_resched(void) return false; } -static inline void __preempt_count_add(int val) +static __always_inline void __preempt_count_add(int val) { S390_lowcore.preempt_count += val; } -static inline void __preempt_count_sub(int val) +static __always_inline void __preempt_count_sub(int val) { S390_lowcore.preempt_count -= val; } diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index cfb545841a2c..af6515e5def8 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -1099,7 +1099,7 @@ static __always_inline unsigned int num_online_cpus(void) #define num_present_cpus() cpumask_weight(cpu_present_mask) #define num_active_cpus() cpumask_weight(cpu_active_mask) -static inline bool cpu_online(unsigned int cpu) +static __always_inline bool cpu_online(unsigned int cpu) { return cpumask_test_cpu(cpu, cpu_online_mask); } diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 88c0ba623ee6..34bc35aa2f4b 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -252,7 +252,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) extern int __traceiter_##name(data_proto); \ DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name); \ extern struct tracepoint __tracepoint_##name; \ - static inline void trace_##name(proto) \ + static __always_inline void trace_##name(proto) \ { \ if (static_key_false(&__tracepoint_##name.key)) \ __DO_TRACE(name, \ diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 151bd3de5936..86244a7e8533 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -111,7 +111,8 @@ late_initcall(kernel_lockdep_sysctls_init); DEFINE_PER_CPU(unsigned int, lockdep_recursion); EXPORT_PER_CPU_SYMBOL_GPL(lockdep_recursion); -static __always_inline bool lockdep_enabled(void) +__no_sanitize_memory +static noinline bool lockdep_enabled(void) { if (!debug_locks) return false; @@ -457,7 +458,8 @@ void lockdep_init_task(struct task_struct *task) task->lockdep_recursion = 0; } -static __always_inline void lockdep_recursion_inc(void) +__no_sanitize_memory +static noinline void lockdep_recursion_inc(void) { __this_cpu_inc(lockdep_recursion); } @@ -5687,7 +5689,7 @@ static void verify_lock_unused(struct lockdep_map *lock, struct held_lock *hlock #endif } -static bool lockdep_nmi(void) +static __always_inline bool lockdep_nmi(void) { if (raw_cpu_read(lockdep_recursion)) return false; @@ -5716,6 +5718,7 @@ EXPORT_SYMBOL_GPL(read_lock_is_recursive); * We are not always called with irqs disabled - do that here, * and also avoid lockdep recursion: */ +__no_kmsan_checks void lock_acquire(struct lockdep_map *lock, unsigned int subclass, int trylock, int read, int check, struct lockdep_map *nest_lock, unsigned long ip) @@ -5758,6 +5761,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, } EXPORT_SYMBOL_GPL(lock_acquire); +__no_kmsan_checks void lock_release(struct lockdep_map *lock, unsigned long ip) { unsigned long flags; diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index d9642dd06c25..8c587627618e 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -692,6 +692,7 @@ static void rcu_disable_urgency_upon_qs(struct rcu_data *rdp) * Make notrace because it can be called by the internal functions of * ftrace, and making this notrace removes unnecessary recursion calls. */ +__no_sanitize_memory notrace bool rcu_is_watching(void) { bool ret; -- 2.44.0
