Message ID | 57834a703dfa5d6c27c9de0a01329059636e5ab7.1685080579.git.christophe.leroy@csgroup.eu (mailing list archive) |
---|---|
State | Accepted |
Commit | 396f2b0106ff343c61f7ae221dc6ae300f807760 |
Headers | show |
Series | powerpc/kcsan: Properly instrument arch_spin_unlock() | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
On Mon, 29 May 2023 at 17:50, Christophe Leroy <christophe.leroy@csgroup.eu> wrote: > > The following boottime error is encountered with SMP kernel: > > kcsan: improperly instrumented type=(0): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(0): spin_unlock(&test_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): spin_unlock(&test_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): spin_unlock(&test_spinlock) > kcsan: selftest: test_barrier failed > kcsan: selftest: 2/3 tests passed > Kernel panic - not syncing: selftests failed > > Properly instrument arch_spin_unlock() with kcsan_mb(). > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Marco Elver <elver@google.com> > --- > arch/powerpc/include/asm/simple_spinlock.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/include/asm/simple_spinlock.h b/arch/powerpc/include/asm/simple_spinlock.h > index 9dcc7e9993b9..4dd12dcb9ef8 100644 > --- a/arch/powerpc/include/asm/simple_spinlock.h > +++ b/arch/powerpc/include/asm/simple_spinlock.h > @@ -15,6 +15,7 @@ > * (the type definitions are in asm/simple_spinlock_types.h) > */ > #include <linux/irqflags.h> > +#include <linux/kcsan-checks.h> > #include <asm/paravirt.h> > #include <asm/paca.h> > #include <asm/synch.h> > @@ -126,6 +127,7 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) > > static inline void arch_spin_unlock(arch_spinlock_t *lock) > { > + kcsan_mb(); > __asm__ __volatile__("# arch_spin_unlock\n\t" > PPC_RELEASE_BARRIER: : :"memory"); > lock->slock = 0; > -- > 2.40.1 >
On Fri, 26 May 2023 07:57:33 +0200, Christophe Leroy wrote: > The following boottime error is encountered with SMP kernel: > > kcsan: improperly instrumented type=(0): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(0): spin_unlock(&test_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): spin_unlock(&test_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): arch_spin_unlock(&arch_spinlock) > kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): spin_unlock(&test_spinlock) > kcsan: selftest: test_barrier failed > kcsan: selftest: 2/3 tests passed > Kernel panic - not syncing: selftests failed > > [...] Applied to powerpc/next. [1/1] powerpc/kcsan: Properly instrument arch_spin_unlock() https://git.kernel.org/powerpc/c/396f2b0106ff343c61f7ae221dc6ae300f807760 cheers
diff --git a/arch/powerpc/include/asm/simple_spinlock.h b/arch/powerpc/include/asm/simple_spinlock.h index 9dcc7e9993b9..4dd12dcb9ef8 100644 --- a/arch/powerpc/include/asm/simple_spinlock.h +++ b/arch/powerpc/include/asm/simple_spinlock.h @@ -15,6 +15,7 @@ * (the type definitions are in asm/simple_spinlock_types.h) */ #include <linux/irqflags.h> +#include <linux/kcsan-checks.h> #include <asm/paravirt.h> #include <asm/paca.h> #include <asm/synch.h> @@ -126,6 +127,7 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) static inline void arch_spin_unlock(arch_spinlock_t *lock) { + kcsan_mb(); __asm__ __volatile__("# arch_spin_unlock\n\t" PPC_RELEASE_BARRIER: : :"memory"); lock->slock = 0;
The following boottime error is encountered with SMP kernel: kcsan: improperly instrumented type=(0): arch_spin_unlock(&arch_spinlock) kcsan: improperly instrumented type=(0): spin_unlock(&test_spinlock) kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): arch_spin_unlock(&arch_spinlock) kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE): spin_unlock(&test_spinlock) kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): arch_spin_unlock(&arch_spinlock) kcsan: improperly instrumented type=(KCSAN_ACCESS_WRITE | KCSAN_ACCESS_COMPOUND): spin_unlock(&test_spinlock) kcsan: selftest: test_barrier failed kcsan: selftest: 2/3 tests passed Kernel panic - not syncing: selftests failed Properly instrument arch_spin_unlock() with kcsan_mb(). Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/include/asm/simple_spinlock.h | 2 ++ 1 file changed, 2 insertions(+)