From: Peter Zijlstra <peterz@infradead.org>
To: Marco Elver <elver@google.com>
Cc: paulmck@kernel.org, will@kernel.org, arnd@arndb.de,
mark.rutland@arm.com, dvyukov@google.com, glider@google.com,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Subject: Re: [PATCH 4/8] kcsan: Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks
Date: Tue, 21 Jul 2020 16:09:29 +0200 [thread overview]
Message-ID: <20200721140929.GB10769@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20200721103016.3287832-5-elver@google.com>
On Tue, Jul 21, 2020 at 12:30:12PM +0200, Marco Elver wrote:
> Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks for the builtin atomics
> instrumentation.
>
> Signed-off-by: Marco Elver <elver@google.com>
> ---
> Added to this series, as it would otherwise cause patch conflicts.
> ---
> kernel/kcsan/core.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/kcsan/core.c b/kernel/kcsan/core.c
> index 4633baebf84e..f53524ea0292 100644
> --- a/kernel/kcsan/core.c
> +++ b/kernel/kcsan/core.c
> @@ -892,14 +892,17 @@ EXPORT_SYMBOL(__tsan_init);
> u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder); \
> u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder) \
> { \
> - check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_ATOMIC); \
> + if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) \
> + check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_ATOMIC); \
> return __atomic_load_n(ptr, memorder); \
> } \
> EXPORT_SYMBOL(__tsan_atomic##bits##_load); \
> void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int memorder); \
> void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int memorder) \
> { \
> - check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC); \
> + if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) \
> + check_access(ptr, bits / BITS_PER_BYTE, \
> + KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC); \
> __atomic_store_n(ptr, v, memorder); \
> } \
> EXPORT_SYMBOL(__tsan_atomic##bits##_store)
> @@ -908,8 +911,10 @@ EXPORT_SYMBOL(__tsan_init);
> u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int memorder); \
> u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int memorder) \
> { \
> - check_access(ptr, bits / BITS_PER_BYTE, \
> - KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC); \
> + if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) \
> + check_access(ptr, bits / BITS_PER_BYTE, \
> + KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | \
> + KCSAN_ACCESS_ATOMIC); \
> return __atomic_##op##suffix(ptr, v, memorder); \
> } \
> EXPORT_SYMBOL(__tsan_atomic##bits##_##op)
> @@ -937,8 +942,10 @@ EXPORT_SYMBOL(__tsan_init);
> int __tsan_atomic##bits##_compare_exchange_##strength(u##bits *ptr, u##bits *exp, \
> u##bits val, int mo, int fail_mo) \
> { \
> - check_access(ptr, bits / BITS_PER_BYTE, \
> - KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC); \
> + if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) \
> + check_access(ptr, bits / BITS_PER_BYTE, \
> + KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | \
> + KCSAN_ACCESS_ATOMIC); \
> return __atomic_compare_exchange_n(ptr, exp, val, weak, mo, fail_mo); \
> } \
> EXPORT_SYMBOL(__tsan_atomic##bits##_compare_exchange_##strength)
> @@ -949,8 +956,10 @@ EXPORT_SYMBOL(__tsan_init);
> u##bits __tsan_atomic##bits##_compare_exchange_val(u##bits *ptr, u##bits exp, u##bits val, \
> int mo, int fail_mo) \
> { \
> - check_access(ptr, bits / BITS_PER_BYTE, \
> - KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC); \
> + if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) \
> + check_access(ptr, bits / BITS_PER_BYTE, \
> + KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE | \
> + KCSAN_ACCESS_ATOMIC); \
> __atomic_compare_exchange_n(ptr, &exp, val, 0, mo, fail_mo); \
> return exp; \
> } \
*groan*, that could really do with a bucket of '{', '}'. Also, it is
inconsistent in style with the existing use in
DEFINE_TSAN_VOLATILE_READ_WRITE() where the define causes an early
return.
next prev parent reply other threads:[~2020-07-21 14:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 10:30 [PATCH 0/8] kcsan: Compound read-write instrumentation Marco Elver
2020-07-21 10:30 ` [PATCH 1/8] kcsan: Support compounded " Marco Elver
2020-07-21 10:30 ` Marco Elver
2020-07-21 10:30 ` [PATCH 2/8] objtool, kcsan: Add __tsan_read_write to uaccess whitelist Marco Elver
2020-07-21 14:04 ` Peter Zijlstra
2020-07-21 10:30 ` [PATCH 3/8] kcsan: Skew delay to be longer for certain access types Marco Elver
2020-07-21 10:30 ` Marco Elver
2020-07-21 14:05 ` Peter Zijlstra
2020-07-21 14:26 ` Marco Elver
2020-07-21 14:34 ` peterz
2020-07-21 10:30 ` [PATCH 4/8] kcsan: Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks Marco Elver
2020-07-21 14:09 ` Peter Zijlstra [this message]
2020-07-21 14:21 ` Marco Elver
2020-07-21 10:30 ` [PATCH 5/8] kcsan: Test support for compound instrumentation Marco Elver
2020-07-21 10:30 ` Marco Elver
2020-07-21 11:06 ` Marco Elver
2020-07-21 10:30 ` [PATCH 6/8] instrumented.h: Introduce read-write instrumentation hooks Marco Elver
2020-07-21 10:30 ` [PATCH 7/8] asm-generic/bitops: Use instrument_read_write() where appropriate Marco Elver
2020-07-21 10:30 ` Marco Elver
2020-07-21 10:30 ` [PATCH 8/8] locking/atomics: Use read-write instrumentation for atomic RMWs Marco Elver
2020-07-21 14:18 ` Peter Zijlstra
2020-07-21 14:18 ` Peter Zijlstra
2020-07-22 10:11 ` Marco Elver
2020-08-14 11:28 ` Mark Rutland
2020-08-14 11:31 ` Mark Rutland
2020-08-14 11:59 ` Marco Elver
2020-08-14 12:34 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721140929.GB10769@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=arnd@arndb.de \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=paulmck@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).