Fix KCSAN for new ONCE (require Clang 11)
Subsystems (7)
Marco Elver
maintainercover Fix KCSAN for new ONCE (require Clang 11)
This patch series is the conclusion to [1], where we determined that due to various interactions with no_sanitize attributes and the new {READ,WRITE}_ONCE(), KCSAN will require Clang 11 or later. Other sanitizers are largely untouched, and only KCSAN now has a hard dependency on Clang 11. To test, a recent Clang development version will suffice [2]. While a little inconvenient for now, it is hoped that in future we may be able to fix GCC and re-enable GCC support.
The patch "kcsan: Restrict supported compilers" contains a detailed list of requirements that led to this decision.
Most of the patches are related to KCSAN, however, the first patch also includes an UBSAN related fix and is a dependency for the remaining ones. The last 2 patches clean up the attributes by moving them to the right place, and fix KASAN's way of defining __no_kasan_or_inline, making it consistent with KCSAN.
The series has been tested by running kcsan-test several times and completed successfully.
[1] https://lkml.kernel.org/r/CANpmjNOGFqhtDa9wWpXs2kztQsSozbwsuMO5BqqW0c0g0zGfSA@mail.gmail.com
[2] https://github.com/llvm/llvm-project
Arnd Bergmann (1):
ubsan, kcsan: don't combine sanitizer with kcov on clang
Marco Elver (9):
kcsan: Avoid inserting __tsan_func_entry/exit if possible
kcsan: Support distinguishing volatile accesses
kcsan: Pass option tsan-instrument-read-before-write to Clang
kcsan: Remove 'noinline' from __no_kcsan_or_inline
kcsan: Restrict supported compilers
kcsan: Update Documentation to change supported compilers READ_ONCE, WRITE_ONCE: Remove data_race() wrapping compiler.h: Move function attributes to compiler_types.h compiler_types.h, kasan: Use __SANITIZE_ADDRESS__ instead of
CONFIG_KASAN to decide inlining
Documentation/dev-tools/kcsan.rst | 9 +------ include/linux/compiler.h | 35 ++----------------------- include/linux/compiler_types.h | 32 +++++++++++++++++++++++ kernel/kcsan/core.c | 43 +++++++++++++++++++++++++++++++ lib/Kconfig.kcsan | 20 +++++++++++++- lib/Kconfig.ubsan | 11 ++++++++ scripts/Makefile.kcsan | 15 ++++++++++- 7 files changed, 122 insertions(+), 43 deletions(-)
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 1/10 ubsan, kcsan: don't combine sanitizer with kcov on clang
From: Arnd Bergmann <[email protected]>
Clang does not allow -fsanitize-coverage=trace-{pc,cmp} together with -fsanitize=bounds or with ubsan:
clang: error: argument unused during compilation: '-fsanitize-coverage=trace-pc' [-Werror,-Wunused-command-line-argument]
clang: error: argument unused during compilation: '-fsanitize-coverage=trace-cmp' [-Werror,-Wunused-command-line-argument]
To avoid the warning, check whether clang can handle this correctly or disallow ubsan and kcsan when kcov is enabled.
---
This patch is already in -rcu tree, but since since the series is based on -tip, to avoid conflict it is required for the subsequent patches.
--- lib/Kconfig.kcsan | 11 +++++++++++ lib/Kconfig.ubsan | 11 +++++++++++ 2 files changed, 22 insertions(+)
lib/Kconfig.kcsan +11 -0
@@ -3,9 +3,20 @@ config HAVE_ARCH_KCSAN bool +config KCSAN_KCOV_BROKEN + def_bool KCOV && CC_HAS_SANCOV_TRACE_PC + depends on CC_IS_CLANG + depends on !$(cc-option,-Werror=unused-command-line-argument -fsanitize=thread -fsanitize-coverage=trace-pc) + help + Some versions of clang support either KCSAN and KCOV but not the + combination of the two. + See https://bugs.llvm.org/show_bug.cgi?id=45831 for the status + in newer releases. + menuconfig KCSAN bool "KCSAN: dynamic data race detector" depends on HAVE_ARCH_KCSAN && DEBUG_KERNEL && !KASAN + depends on !KCSAN_KCOV_BROKEN select STACKTRACE help The Kernel Concurrency Sanitizer (KCSAN) is a dynamic
lib/Kconfig.ubsan +11 -0
@@ -26,9 +26,20 @@ config UBSAN_TRAP the system. For some system builders this is an acceptable trade-off. +config UBSAN_KCOV_BROKEN + def_bool KCOV && CC_HAS_SANCOV_TRACE_PC + depends on CC_IS_CLANG + depends on !$(cc-option,-Werror=unused-command-line-argument -fsanitize=bounds -fsanitize-coverage=trace-pc) + help + Some versions of clang support either UBSAN or KCOV but not the + combination of the two. + See https://bugs.llvm.org/show_bug.cgi?id=45831 for the status + in newer releases. + config UBSAN_BOUNDS bool "Perform array index bounds checking" default UBSAN + depends on !UBSAN_KCOV_BROKEN help This option enables detection of directly indexed out of bounds array accesses, where the array size is known at compile time.
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 2/10 kcsan: Avoid inserting __tsan_func_entry/exit if possible
In reply to Marco ElverTo avoid inserting __tsan_func_{entry,exit}, add option if supported by compiler. Currently only Clang can be told to not emit calls to these functions. It is safe to not emit these, since KCSAN does not rely on them.
Note that, if we disable __tsan_func_{entry,exit}(), we need to disable tail-call optimization in sanitized compilation units, as otherwise we may skip frames in the stack trace; in particular when the tail called function is one of the KCSAN's runtime functions, and a report is generated, might we miss the function where the actual access occurred. Since __tsan_func_{entry,exit}() insertion effectively disabled tail-call optimization, there should be no observable change. [This was caught and confirmed with kcsan-test & UNWINDER_ORC.]
--- scripts/Makefile.kcsan | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
scripts/Makefile.kcsan +10 -1
@@ -1,6 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 ifdef CONFIG_KCSAN -CFLAGS_KCSAN := -fsanitize=thread +# GCC and Clang accept backend options differently. Do not wrap in cc-option, +# because Clang accepts "--param" even if it is unused. +ifdef CONFIG_CC_IS_CLANG +cc-param = -mllvm -$(1) +else +cc-param = --param -$(1) +endif + +CFLAGS_KCSAN := -fsanitize=thread \ + $(call cc-option,$(call cc-param,tsan-instrument-func-entry-exit=0) -fno-optimize-sibling-calls) endif # CONFIG_KCSAN
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 3/10 kcsan: Support distinguishing volatile accesses
In reply to Marco ElverIn the kernel, volatile is used in various concurrent context, whether in low-level synchronization primitives or for legacy reasons. If supported by the compiler, we will assume that aligned volatile accesses up to sizeof(long long) (matching compiletime_assert_rwonce_type()) are atomic.
Recent versions Clang [1] (GCC tentative [2]) can instrument volatile accesses differently. Add the option (required) to enable the instrumentation, and provide the necessary runtime functions. None of the updated compilers are widely available yet (Clang 11 will be the first release to support the feature).
[1] https://github.com/llvm/llvm-project/commit/5a2c31116f412c3b6888be361137efd705e05814
[2] https://gcc.gnu.org/pipermail/gcc-patches/2020-April/544452.html
This patch allows removing any explicit checks in primitives such as READ_ONCE() and WRITE_ONCE().
--- kernel/kcsan/core.c | 43 ++++++++++++++++++++++++++++++++++++++++++ scripts/Makefile.kcsan | 5 ++++- 2 files changed, 47 insertions(+), 1 deletion(-)
kernel/kcsan/core.c +43 -0
@@ -789,6 +789,49 @@ void __tsan_write_range(void *ptr, size_t size) }EXPORT_SYMBOL (__tsan_write_range); +/* +* Use of explicit volatile is generally disallowed [1], however, volatile is +* still used in various concurrent context, whether in low-level +* synchronization primitives or for legacy reasons. +* [1] https://lwn.net/Articles/233479/ +* +* We only consider volatile accesses atomic if they are aligned and would pass +* the size-check of compiletime_assert_rwonce_type(). +*/ +#define DEFINE_TSAN_VOLATILE_READ_WRITE (size) \ + void __tsan_volatile_read##size(void *ptr) \ + { \ + const bool is_atomic = size <= sizeof(long long) && \ + IS_ALIGNED((unsigned long)ptr, size); \ + if (IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS) && is_atomic) \ + return; \ + check_access(ptr, size, is_atomic ? KCSAN_ACCESS_ATOMIC : 0); \ + } \ + EXPORT_SYMBOL(__tsan_volatile_read##size); \ + void __tsan_unaligned_volatile_read##size(void *ptr) \ + __alias(__tsan_volatile_read##size); \ + EXPORT_SYMBOL(__tsan_unaligned_volatile_read##size); \ + void __tsan_volatile_write##size(void *ptr) \ + { \ + const bool is_atomic = size <= sizeof(long long) && \ + IS_ALIGNED((unsigned long)ptr, size); \ + if (IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS) && is_atomic) \ + return; \ + check_access(ptr, size, \ + KCSAN_ACCESS_WRITE | \ + (is_atomic ? KCSAN_ACCESS_ATOMIC : 0)); \ + } \ + EXPORT_SYMBOL(__tsan_volatile_write##size); \ + void __tsan_unaligned_volatile_write##size(void *ptr) \ + __alias(__tsan_volatile_write##size); \ + EXPORT_SYMBOL(__tsan_unaligned_volatile_write##size) + +DEFINE_TSAN_VOLATILE_READ_WRITE (1 ); +DEFINE_TSAN_VOLATILE_READ_WRITE (2 ); +DEFINE_TSAN_VOLATILE_READ_WRITE (4 ); +DEFINE_TSAN_VOLATILE_READ_WRITE (8 ); +DEFINE_TSAN_VOLATILE_READ_WRITE (16 ); +/* * The below are not required by KCSAN, but can still be emitted by the * compiler.
scripts/Makefile.kcsan +4 -1
@@ -9,7 +9,10 @@ else cc-param = --param -$(1) endif +# Most options here should be kept optional, to allow enabling more compilers +# if the absence of some options still allows us to use KCSAN in most cases. CFLAGS_KCSAN := -fsanitize=thread \ - $(call cc-option,$(call cc-param,tsan-instrument-func-entry-exit=0) -fno-optimize-sibling-calls) + $(call cc-option,$(call cc-param,tsan-instrument-func-entry-exit=0) -fno-optimize-sibling-calls) \ + $(call cc-param,tsan-distinguish-volatile=1) endif # CONFIG_KCSAN
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 4/10 kcsan: Pass option tsan-instrument-read-before-write to Clang
In reply to Marco ElverClang (unlike GCC) removes reads before writes with matching addresses in the same basic block. This is an optimization for TSAN, since writes will always cause conflict if the preceding read would have.
However, for KCSAN we cannot rely on this option, because we apply several special rules to writes, in particular when the KCSAN_ASSUME_PLAIN_WRITES_ATOMIC option is selected. To avoid missing potential data races, pass the -tsan-instrument-read-before-write option to Clang if it is available [1].
[1] https://github.com/llvm/llvm-project/commit/151ed6aa38a3ec6c01973b35f684586b6e1c0f7e
--- scripts/Makefile.kcsan | 1 + 1 file changed, 1 insertion(+)
scripts/Makefile.kcsan +1 -0
@@ -13,6 +13,7 @@ endif # if the absence of some options still allows us to use KCSAN in most cases. CFLAGS_KCSAN := -fsanitize=thread \ $(call cc-option,$(call cc-param,tsan-instrument-func-entry-exit=0) -fno-optimize-sibling-calls) \ + $(call cc-option,$(call cc-param,tsan-instrument-read-before-write=1)) \ $(call cc-param,tsan-distinguish-volatile=1) endif # CONFIG_KCSAN
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 5/10 kcsan: Remove 'noinline' from __no_kcsan_or_inline
In reply to Marco ElverSome compilers incorrectly inline small __no_kcsan functions, which then results in instrumenting the accesses. For this reason, the 'noinline' attribute was added to __no_kcsan_or_inline. All known versions of GCC are affected by this. Supported version of Clang are unaffected, and never inlines a no_sanitize function.
However, the attribute 'noinline' in __no_kcsan_or_inline causes unexpected code generation in functions that are __no_kcsan and call a __no_kcsan_or_inline function.
In certain situations it is expected that the __no_kcsan_or_inline function is actually inlined by the __no_kcsan function, and *no* calls are emitted. By removing the 'noinline' attribute we give the compiler the ability to inline and generate the expected code in __no_kcsan functions.
--- include/linux/compiler.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/linux/compiler.h +2 -4
@@ -276,11 +276,9 @@ do { \#ifdef __SANITIZE_THREAD__/* * Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in -* compilation units where instrumentation is disabled. The attribute 'noinline' -* is required for older compilers, where implicit inlining of very small -* functions renders __no_sanitize_thread ineffective. +* compilation units where instrumentation is disabled. */ -# define __no_kcsan_or_inline __no_kcsan noinline notrace __maybe_unused +# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused# define __no_sanitize_or_inline __no_kcsan_or_inline#else # define __no_kcsan_or_inline __always_inline
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 7/10 kcsan: Update Documentation to change supported compilers
In reply to Marco Elver--- Documentation/dev-tools/kcsan.rst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
Documentation/dev-tools/kcsan.rst +1 -8
@@ -8,8 +8,7 @@ approach to detect races. KCSAN's primary purpose is to detect `data races`_. Usage ----- -KCSAN is supported in both GCC and Clang. With GCC it requires version 7.3.0 or -later. With Clang it requires version 7.0.0 or later. +KCSAN requires Clang version 11 or later. To enable KCSAN configure the kernel with::
@@ -121,12 +120,6 @@ the below options are available: static __no_kcsan_or_inline void foo(void) { ... - Note: Older compiler versions (GCC < 9) also do not always honor the - ``__no_kcsan`` attribute on regular ``inline`` functions. If false positives - with these compilers cannot be tolerated, for small functions where - ``__always_inline`` would be appropriate, ``__no_kcsan_or_inline`` should be - preferred instead. - * To disable data race detection for a particular compilation unit, add to the ``Makefile``::
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 8/10 READ_ONCE, WRITE_ONCE: Remove data_race() wrapping
In reply to Marco ElverThe volatile access no longer needs to be wrapped in data_race(), because we require compilers that emit instrumentation distinguishing volatile accesses.
--- include/linux/compiler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/compiler.h +2 -2
@@ -229,7 +229,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,#define __READ_ONCE_SCALAR (x) \ ({ \ typeof(x) *__xp = &(x); \ - __unqual_scalar_typeof(x) __x = data_race(__READ_ONCE(*__xp)); \ + __unqual_scalar_typeof(x) __x = __READ_ONCE(*__xp); \ kcsan_check_atomic_read(__xp, sizeof(*__xp)); \ smp_read_barrier_depends(); \ (typeof(x))__x; \
@@ -250,7 +250,7 @@ do { \do { \typeof (x) *__xp = &(x); \kcsan_check_atomic_write (__xp,sizeof (*__xp)); \ -data_race (({__WRITE_ONCE (*__xp, val);0 ; })); \ +__WRITE_ONCE (*__xp, val); \ } while (0)#define WRITE_ONCE (x, val) \
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 9/10 compiler.h: Move function attributes to compiler_types.h
In reply to Marco ElverCleanup and move the KASAN and KCSAN related function attributes to compiler_types.h, where the rest of the same kind live.
No functional change intended.
--- include/linux/compiler.h | 29 ----------------------------- include/linux/compiler_types.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-)
include/linux/compiler.h +0 -29
@@ -259,35 +259,6 @@ do { \__WRITE_ONCE_SCALAR (x, val); \ }while (0 ) -#ifdef CONFIG_KASAN -/* -* We can't declare function 'inline' because __no_sanitize_address conflicts -* with inlining. Attempt to inline it may cause a build failure. -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 -* '__maybe_unused' allows us to avoid defined-but-not-used warnings. -*/ -# define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused -# define __no_sanitize_or_inline __no_kasan_or_inline -#else -# define __no_kasan_or_inline __always_inline -#endif - -#define __no_kcsan __no_sanitize_thread -#ifdef __SANITIZE_THREAD__ -/* -* Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in -* compilation units where instrumentation is disabled. -*/ -# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused -# define __no_sanitize_or_inline __no_kcsan_or_inline -#else -# define __no_kcsan_or_inline __always_inline -#endif - -#ifndef __no_sanitize_or_inline -#define __no_sanitize_or_inline __always_inline -#endif - static __no_sanitize_or_inlineunsigned long __read_once_word_nocheck (const void *addr) {
include/linux/compiler_types.h +29 -0
@@ -167,6 +167,35 @@ struct ftrace_likely_data {*/ #define noinline_for_stack noinline +#ifdef CONFIG_KASAN +/* +* We can't declare function 'inline' because __no_sanitize_address conflicts +* with inlining. Attempt to inline it may cause a build failure. +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 +* '__maybe_unused' allows us to avoid defined-but-not-used warnings. +*/ +# define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused +# define __no_sanitize_or_inline __no_kasan_or_inline +#else +# define __no_kasan_or_inline __always_inline +#endif + +#define __no_kcsan __no_sanitize_thread +#ifdef __SANITIZE_THREAD__ +/* +* Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in +* compilation units where instrumentation is disabled. +*/ +# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused +# define __no_sanitize_or_inline __no_kcsan_or_inline +#else +# define __no_kcsan_or_inline __always_inline +#endif + +#ifndef __no_sanitize_or_inline +#define __no_sanitize_or_inline __always_inline +#endif +#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 10/10 compiler_types.h, kasan: Use __SANITIZE_ADDRESS__ instead of CONFIG_KASAN to decide inlining
In reply to Marco ElverLike is done for KCSAN, for KASAN we should also use __always_inline in compilation units that have instrumentation disabled (KASAN_SANITIZE_foo.o := n). Adds common documentation for KASAN and KCSAN explaining the attribute.
--- include/linux/compiler_types.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
include/linux/compiler_types.h +8 -5
@@ -167,7 +167,14 @@ struct ftrace_likely_data {*/ #define noinline_for_stack noinline -#ifdef CONFIG_KASAN +/* +* Sanitizer helper attributes: Because using __always_inline and +* __no_sanitize_* conflict, provide helper attributes that will either expand +* to __no_sanitize_* in compilation units where instrumentation is enabled +* (__SANITIZE_*__), or __always_inline in compilation units without +* instrumentation (__SANITIZE_*__ undefined). +*/ +#ifdef __SANITIZE_ADDRESS__/* * We can't declare function 'inline' because __no_sanitize_address conflicts * with inlining. Attempt to inline it may cause a build failure.
@@ -182,10 +189,6 @@ struct ftrace_likely_data {#define __no_kcsan __no_sanitize_thread#ifdef __SANITIZE_THREAD__ -/* -* Rely on __SANITIZE_THREAD__ instead of CONFIG_KCSAN, to avoid not inlining in -* compilation units where instrumentation is disabled. -*/ # define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused# define __no_sanitize_or_inline __no_kcsan_or_inline#else
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerPATCH 6/10 kcsan: Restrict supported compilers
In reply to Marco ElverThe first version of Clang that supports -tsan-distinguish-volatile will be able to support KCSAN. The first Clang release to do so, will be Clang 11. This is due to satisfying all the following requirements:
1. Never emit calls to __tsan_func_{entry,exit}.
2. __no_kcsan functions should not call anything, not even kcsan_{enable,disable}_current(), when using __{READ,WRITE}_ONCE => Requires leaving them plain!
3. Support atomic_{read,set}*() with KCSAN, which rely on arch_atomic_{read,set}*() using __{READ,WRITE}_ONCE() => Because of #2, rely on Clang 11's -tsan-distinguish-volatile support. We will double-instrument atomic_{read,set}*(), but that's reasonable given it's still lower cost than the data_race() variant due to avoiding 2 extra calls (kcsan_{en,dis}able_current() calls).
4. __always_inline functions inlined into __no_kcsan functions are never instrumented.
5. __always_inline functions inlined into instrumented functions are instrumented.
6. __no_kcsan_or_inline functions may be inlined into __no_kcsan functions => Implies leaving 'noinline' off of __no_kcsan_or_inline.
7. Because of #6, __no_kcsan and __no_kcsan_or_inline functions should never be spuriously inlined into instrumented functions, causing the accesses of the __no_kcsan function to be instrumented.
Older versions of Clang do not satisfy #3. The latest GCC currently doesn't support at least #1, #3, and #7.
--- lib/Kconfig.kcsan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
lib/Kconfig.kcsan +8 -1
@@ -3,6 +3,12 @@ config HAVE_ARCH_KCSAN bool +config HAVE_KCSAN_COMPILER + def_bool CC_IS_CLANG && $(cc-option,-fsanitize=thread -mllvm -tsan-distinguish-volatile=1) + help + For the list of compilers that support KCSAN, please see + <file:Documentation/dev-tools/kcsan.rst>. + config KCSAN_KCOV_BROKEN def_bool KCOV && CC_HAS_SANCOV_TRACE_PC depends on CC_IS_CLANG
@@ -15,7 +21,8 @@ config KCSAN_KCOV_BROKEN menuconfig KCSAN bool "KCSAN: dynamic data race detector" - depends on HAVE_ARCH_KCSAN && DEBUG_KERNEL && !KASAN + depends on HAVE_ARCH_KCSAN && HAVE_KCSAN_COMPILER + depends on DEBUG_KERNEL && !KASAN depends on !KCSAN_KCOV_BROKEN select STACKTRACE help
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerRe: [PATCH -tip 08/10] READ_ONCE, WRITE_ONCE: Remove data_race() wrapping
In reply to Marco ElverQuoted 15 lines · Marco Elver
The volatile access no longer needs to be wrapped in
data_race(), because we require compilers that emit instrumentation distinguishing volatile accesses.Signed-off-by Marco Elver <[email protected]>--- include/linux/compiler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/compiler.h +0
-0
include/linux/compiler.h void ftrace_likely_update(struct ftrace_likely_data *f, int val, · line 233
Quoted 6 lines
include/linux/compiler.h +1
-1@@ -229,7 +229,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,#define __READ_ONCE_SCALAR (x) \ ({ \ typeof(x) *__xp = &(x); \ - __unqual_scalar_typeof(x) __x = data_race(__READ_ONCE(*__xp)); \ + __unqual_scalar_typeof(x) __x = __READ_ONCE(*__xp); \ kcsan_check_atomic_read(__xp, sizeof(*__xp)); \
Some self-review: We don't need kcsan_check_atomic anymore, and this should be removed.
I'll send v2 to address this (together with fix to data_race() removing nested statement expressions).
include/linux/compiler.h do { \ · line 252
Quoted 6 lines
include/linux/compiler.h +0
-0smp_read_barrier_depends (); \ (typeof (x ))__x; \@@ -250,7 +250,7 @@ do { \ do { \ typeof(x) *__xp = &(x); \ kcsan_check_atomic_write(__xp, sizeof(*__xp)); \
Same.
Quoted 8 lines
include/linux/compiler.h +1
-2-data_race (({__WRITE_ONCE (*__xp, val);0 ; })); \ +__WRITE_ONCE (*__xp, val); \ }while (0 ) #define WRITE_ONCE(x, val) \ --2.26.2.761.g0e0b3e54be-goog
Marco Elver
maintainerRe: [PATCH -tip 08/10] READ_ONCE, WRITE_ONCE: Remove data_race() wrapping
Quoted 27 lines · Marco Elver
Quoted 15 lines · Marco Elver
The volatile access no longer needs to be wrapped in
data_race(), because we require compilers that emit instrumentation distinguishing volatile accesses.Signed-off-by Marco Elver <[email protected]>--- include/linux/compiler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/compiler.h +0
-0include/linux/compiler.h void ftrace_likely_update(struct ftrace_likely_data *f, int val, · line 233
Quoted 6 lines
include/linux/compiler.h +1
-1@@ -229,7 +229,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,#define __READ_ONCE_SCALAR (x) \ ({ \ typeof(x) *__xp = &(x); \ - __unqual_scalar_typeof(x) __x = data_race(__READ_ONCE(*__xp)); \ + __unqual_scalar_typeof(x) __x = __READ_ONCE(*__xp); \ kcsan_check_atomic_read(__xp, sizeof(*__xp)); \Some self-review: We don't need
kcsan_check_atomicanymore, and this should be removed.
Quoted 2 lines
I'll send v2 to address this (together with fix to
data_race()removing nested statement expressions).
The other thing here is that we no longer require __xp, and can just pass x into __READ_ONCE.
Quoted 8 lines
include/linux/compiler.h do { \ · line 252
Quoted 6 lines
include/linux/compiler.h +0
-0smp_read_barrier_depends (); \ (typeof (x ))__x; \@@ -250,7 +250,7 @@ do { \ do { \ typeof(x) *__xp = &(x); \ kcsan_check_atomic_write(__xp, sizeof(*__xp)); \Same.
__xp can also be removed.
Note that this effectively aliases __WRITE_ONCE_SCALAR to __WRITE_ONCE. To keep the API consistent with READ_ONCE, I assume we want to keep __WRITE_ONCE_SCALAR, in case it is meant to change in future?
Quoted 8 lines
Quoted 8 lines
include/linux/compiler.h +1
-2-data_race (({__WRITE_ONCE (*__xp, val);0 ; })); \ +__WRITE_ONCE (*__xp, val); \ }while (0 ) #define WRITE_ONCE(x, val) \ --2.26.2.761.g0e0b3e54be-goog
Re: [PATCH -tip 08/10] READ_ONCE, WRITE_ONCE: Remove data_race() wrapping
Quoted 32 lines · Marco Elver
Quoted 16 lines · Marco Elver
include/linux/compiler.h void ftrace_likely_update(struct ftrace_likely_data *f, int val, · line 233
Quoted 11 lines · Marco Elver
include/linux/compiler.h +1
-1@@ -229,7 +229,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,#define __READ_ONCE_SCALAR (x) \ ({ \ typeof(x) *__xp = &(x); \ - __unqual_scalar_typeof(x) __x = data_race(__READ_ONCE(*__xp)); \ + __unqual_scalar_typeof(x) __x = __READ_ONCE(*__xp); \ kcsan_check_atomic_read(__xp, sizeof(*__xp)); \Some self-review: We don't need
kcsan_check_atomicanymore, and this should be removed.Quoted 2 lines
I'll send v2 to address this (together with fix to
data_race()removing nested statement expressions).The other thing here is that we no longer require
__xp, and can just pass x into__READ_ONCE.Quoted 8 lines
include/linux/compiler.h do { \ · line 252
Quoted 6 lines
include/linux/compiler.h +0
-0smp_read_barrier_depends (); \ (typeof (x ))__x; \@@ -250,7 +250,7 @@ do { \ do { \ typeof(x) *__xp = &(x); \ kcsan_check_atomic_write(__xp, sizeof(*__xp)); \Same.
Quoted 6 lines
__xpcan also be removed.Note that this effectively aliases
__WRITE_ONCE_SCALARto__WRITE_ONCE. To keep the API consistent withREAD_ONCE, I assume we want to keep__WRITE_ONCE_SCALAR, in case it is meant to change in future?
Ha! So I think this ends up being very similar to what I had *before* I rebased onto KCSAN:
in which case you can drop __WRITE_ONCE_SCALAR; the _SCALAR things shouldn't be used outside of the implementation anyway.
Will
Marco Elver
maintainerQuoted 18 lines · Marco Elver
This patch series is the conclusion to [1], where we determined that due to various interactions with
no_sanitizeattributes and the new {READ,WRITE}_ONCE(), KCSAN will require Clang 11 or later. Other sanitizers are largely untouched, and only KCSAN now has a hard dependency on Clang 11. To test, a recent Clang development version will suffice [2]. While a little inconvenient for now, it is hoped that in future we may be able to fix GCC and re-enable GCC support.The patch "kcsan: Restrict supported compilers" contains a detailed list of requirements that led to this decision.
Most of the patches are related to KCSAN, however, the first patch also includes an UBSAN related fix and is a dependency for the remaining ones. The last 2 patches clean up the attributes by moving them to the right place, and fix KASAN's way of defining
__no_kasan_or_inline, making it consistent with KCSAN.
Quoted 6 lines
The series has been tested by running kcsan-test several times and completed successfully.
[1] https://lkml.kernel.org/r/CANpmjNOGFqhtDa9wWpXs2kztQsSozbwsuMO5BqqW0c0g0zGfSA@mail.gmail.com
[2] https://github.com/llvm/llvm-project
Superseded by v2:
https://lkml.kernel.org/r/[email protected]