Skip to content

Fix KCSAN for new ONCE (require Clang 11)

Marco Elver lkml 3 versions – Applied

Status from this message: The following commit has been merged into the locking/kcsan branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest11 patches 20 repliesApplied
  2. v211 patches 9 repliesSuperseded
  3. v110 patches 4 repliesSuperseded

Changes in v3 from the cover letter

* data_race() fix for 'const' non-scalar expressions.
* Add a missing commit message.
* Add Will's Acked-by.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/11ubsan, kcsan: don't combine sanitizer with kcov on clanglib/Kconfig.kcsan lib/Kconfig.ubsan+22 -00 replies
2/11kcsan: Avoid inserting __tsan_func_entry/exit if possiblescripts/Makefile.kcsan+10 -10 replies
3/11kcsan: Support distinguishing volatile accesseskernel/kcsan/core.c scripts/Makefile.kcsan+47 -13 replies
4/11kcsan: Pass option tsan-instrument-read-before-write to Clangscripts/Makefile.kcsan+1 -00 replies
5/11kcsan: Remove 'noinline' from __no_kcsan_or_inlineinclude/linux/compiler.h+2 -43 replies
6/11kcsan: Restrict supported compilerslib/Kconfig.kcsan+8 -10 replies
7/11kcsan: Update Documentation to change supported compilersDocumentation/dev-tools/kcsan.rst+1 -80 replies
8/11READ_ONCE, WRITE_ONCE: Remove data_race() and unnecessary checksinclude/linux/compiler.h+2 -110 replies
9/11data_race: Avoid nested statement expressioninclude/linux/compiler.h+5 -513 replies
10/11compiler.h: Move function attributes to compiler_types.hinclude/linux/compiler.h include/linux/compiler_types.h+29 -290 replies
11/11compiler_types.h, kasan: Use __SANITIZE_ADDRESS__ instead of CONFIG_KASAN to decide inlininginclude/linux/compiler_types.h+8 -50 replies

Reviews trailers per patch

All 11 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMarco ElverWill DeaconNick DesaulniersPeter Zijlstra (Intel)
SeriesA-b
1/11A-b
2/11A-b
3/11A-b
4/11A-b
5/11A-b
6/11A-b
7/11A-b
8/11A-b
9/11A-b T-b
10/11A-b
11/11A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH -tip v3 00/11] 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

v3:
* data_race() fix for 'const' non-scalar expressions.
* Add a missing commit message.
* Add Will's Acked-by.

v2: https://lkml.kernel.org/r/[email protected]
* Remove unnecessary kcsan_check_atomic in ONCE.
* Simplify __READ_ONCE_SCALAR and remove __WRITE_ONCE_SCALAR. This effectively restores Will Deacon's pre-KCSAN version:
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/tree/include/linux/compiler.h?h=rwonce/cleanup#n202
* Introduce patch making data_race() a single statement expression in response to apparent issues that compilers are having with nested statement expressions.

Arnd Bergmann (1):
ubsan, kcsan: don't combine sanitizer with kcov on clang

Marco Elver (10):
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() and unnecessary checks
data_race: Avoid nested statement expression 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          | 54 ++++---------------------------
 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, 127 insertions(+), 57 deletions(-)
Signature · 1 line
2.26.2.761.g0e0b3e54be-goog