From: Marco Elver <elver@google.com> To: Mark Rutland <mark.rutland@arm.com> Cc: LKMM Maintainers -- Akira Yokosawa <akiyks@gmail.com>, Alan Stern <stern@rowland.harvard.edu>, Alexander Potapenko <glider@google.com>, Andrea Parri <parri.andrea@gmail.com>, Andrey Konovalov <andreyknvl@google.com>, Andy Lutomirski <luto@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Arnd Bergmann <arnd@arndb.de>, Boqun Feng <boqun.feng@gmail.com>, Borislav Petkov <bp@alien8.de>, Daniel Axtens <dja@axtens.net>, Daniel Lustig <dlustig@nvidia.com>, Dave Hansen <dave.hansen@linux.intel.com>, David Howells <dhowells@redhat.com>, Dmitry Vyukov <dvyukov@google.com>, "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>, Jade Alglave <j.alglave@ucl.ac.uk>, Joel Fernandes <joel@joelfernandes.org>, Jonathan Corbet <corbet@lwn.net>, Josh Poimboeuf <jpoimboe@redhat.com>, Luc Maranget <luc.maranget@inria.fr>, Nicholas Piggin <npiggin@gmail.com>, "Paul E. McKenney" <paulmck@linux.ibm.com>, Peter Zijlstra <peterz@infradead.org>, Thomas Gleixner <tglx@linutronix.de>, Will Deacon <will@kernel.org>, kasan-dev <kasan-dev@googlegroups.com>, linux-arch <linux-arch@vger.kernel.org>, "open list:DOCUMENTATION" <linux-doc@vger.kernel.org>, linux-efi@vger.kernel.org, Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, Linux Memory Management List <linux-mm@kvack.org>, "the arch/x86 maintainers" <x86@kernel.org> Subject: Re: [PATCH v2 7/8] locking/atomics, kcsan: Add KCSAN instrumentation Date: Tue, 22 Oct 2019 20:17:43 +0200 [thread overview] Message-ID: <CANpmjNOhoyDMFMUz6by3hLtX7aBFk4pXTmzjmWYiq2+z+R5fAQ@mail.gmail.com> (raw) In-Reply-To: <20191022123329.GC11583@lakrids.cambridge.arm.com> On Tue, 22 Oct 2019 at 14:33, Mark Rutland <mark.rutland@arm.com> wrote: > > On Thu, Oct 17, 2019 at 04:13:04PM +0200, Marco Elver wrote: > > This adds KCSAN instrumentation to atomic-instrumented.h. > > > > Signed-off-by: Marco Elver <elver@google.com> > > --- > > v2: > > * Use kcsan_check{,_atomic}_{read,write} instead of > > kcsan_check_{access,atomic}. > > * Introduce __atomic_check_{read,write} [Suggested by Mark Rutland]. > > --- > > include/asm-generic/atomic-instrumented.h | 393 +++++++++++----------- > > scripts/atomic/gen-atomic-instrumented.sh | 17 +- > > 2 files changed, 218 insertions(+), 192 deletions(-) > > The script changes and generated code look fine to me, so FWIW: > > Reviewed-by: Mark Rutland <mark.rutland@arm.com> Great, thank you Mark! > Thanks, > Mark. > > > diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh > > index e09812372b17..8b8b2a6f8d68 100755 > > --- a/scripts/atomic/gen-atomic-instrumented.sh > > +++ b/scripts/atomic/gen-atomic-instrumented.sh > > @@ -20,7 +20,7 @@ gen_param_check() > > # We don't write to constant parameters > > [ ${type#c} != ${type} ] && rw="read" > > > > - printf "\tkasan_check_${rw}(${name}, sizeof(*${name}));\n" > > + printf "\t__atomic_check_${rw}(${name}, sizeof(*${name}));\n" > > } > > > > #gen_param_check(arg...) > > @@ -107,7 +107,7 @@ cat <<EOF > > #define ${xchg}(ptr, ...) \\ > > ({ \\ > > typeof(ptr) __ai_ptr = (ptr); \\ > > - kasan_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ > > + __atomic_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ > > arch_${xchg}(__ai_ptr, __VA_ARGS__); \\ > > }) > > EOF > > @@ -148,6 +148,19 @@ cat << EOF > > > > #include <linux/build_bug.h> > > #include <linux/kasan-checks.h> > > +#include <linux/kcsan-checks.h> > > + > > +static inline void __atomic_check_read(const volatile void *v, size_t size) > > +{ > > + kasan_check_read(v, size); > > + kcsan_check_atomic_read(v, size); > > +} > > + > > +static inline void __atomic_check_write(const volatile void *v, size_t size) > > +{ > > + kasan_check_write(v, size); > > + kcsan_check_atomic_write(v, size); > > +} > > > > EOF > > > > -- > > 2.23.0.866.gb869b98d4c-goog > >
WARNING: multiple messages have this Message-ID (diff)
From: Marco Elver <elver@google.com> To: Mark Rutland <mark.rutland@arm.com> Cc: LKMM Maintainers -- Akira Yokosawa <akiyks@gmail.com>, Alan Stern <stern@rowland.harvard.edu>, Alexander Potapenko <glider@google.com>, Andrea Parri <parri.andrea@gmail.com>, Andrey Konovalov <andreyknvl@google.com>, Andy Lutomirski <luto@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Arnd Bergmann <arnd@arndb.de>, Boqun Feng <boqun.feng@gmail.com>, Borislav Petkov <bp@alien8.de>, Daniel Axtens <dja@axtens.net>, Daniel Lustig <dlustig@nvidia.com>, Dave Hansen <dave.hansen@linux.intel.com>, David Howells <dhowells@redhat.com>, Dmitry Vyukov <dvyukov@google.com>, "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>, Jade Alglave <j.alglave@ucl.ac.uk>, Joel Fernandes <joel@joelfernandes.org>, Jonathan Corbet <corbet@lwn.net> Subject: Re: [PATCH v2 7/8] locking/atomics, kcsan: Add KCSAN instrumentation Date: Tue, 22 Oct 2019 20:17:43 +0200 [thread overview] Message-ID: <CANpmjNOhoyDMFMUz6by3hLtX7aBFk4pXTmzjmWYiq2+z+R5fAQ@mail.gmail.com> (raw) In-Reply-To: <20191022123329.GC11583@lakrids.cambridge.arm.com> On Tue, 22 Oct 2019 at 14:33, Mark Rutland <mark.rutland@arm.com> wrote: > > On Thu, Oct 17, 2019 at 04:13:04PM +0200, Marco Elver wrote: > > This adds KCSAN instrumentation to atomic-instrumented.h. > > > > Signed-off-by: Marco Elver <elver@google.com> > > --- > > v2: > > * Use kcsan_check{,_atomic}_{read,write} instead of > > kcsan_check_{access,atomic}. > > * Introduce __atomic_check_{read,write} [Suggested by Mark Rutland]. > > --- > > include/asm-generic/atomic-instrumented.h | 393 +++++++++++----------- > > scripts/atomic/gen-atomic-instrumented.sh | 17 +- > > 2 files changed, 218 insertions(+), 192 deletions(-) > > The script changes and generated code look fine to me, so FWIW: > > Reviewed-by: Mark Rutland <mark.rutland@arm.com> Great, thank you Mark! > Thanks, > Mark. > > > diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh > > index e09812372b17..8b8b2a6f8d68 100755 > > --- a/scripts/atomic/gen-atomic-instrumented.sh > > +++ b/scripts/atomic/gen-atomic-instrumented.sh > > @@ -20,7 +20,7 @@ gen_param_check() > > # We don't write to constant parameters > > [ ${type#c} != ${type} ] && rw="read" > > > > - printf "\tkasan_check_${rw}(${name}, sizeof(*${name}));\n" > > + printf "\t__atomic_check_${rw}(${name}, sizeof(*${name}));\n" > > } > > > > #gen_param_check(arg...) > > @@ -107,7 +107,7 @@ cat <<EOF > > #define ${xchg}(ptr, ...) \\ > > ({ \\ > > typeof(ptr) __ai_ptr = (ptr); \\ > > - kasan_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ > > + __atomic_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ > > arch_${xchg}(__ai_ptr, __VA_ARGS__); \\ > > }) > > EOF > > @@ -148,6 +148,19 @@ cat << EOF > > > > #include <linux/build_bug.h> > > #include <linux/kasan-checks.h> > > +#include <linux/kcsan-checks.h> > > + > > +static inline void __atomic_check_read(const volatile void *v, size_t size) > > +{ > > + kasan_check_read(v, size); > > + kcsan_check_atomic_read(v, size); > > +} > > + > > +static inline void __atomic_check_write(const volatile void *v, size_t size) > > +{ > > + kasan_check_write(v, size); > > + kcsan_check_atomic_write(v, size); > > +} > > > > EOF > > > > -- > > 2.23.0.866.gb869b98d4c-goog > >
next prev parent reply other threads:[~2019-10-22 18:17 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-17 14:12 [PATCH v2 0/8] Add Kernel Concurrency Sanitizer (KCSAN) Marco Elver 2019-10-17 14:12 ` Marco Elver 2019-10-17 14:12 ` [PATCH v2 1/8] kcsan: Add Kernel Concurrency Sanitizer infrastructure Marco Elver 2019-10-17 14:12 ` Marco Elver 2019-10-21 13:37 ` Alexander Potapenko 2019-10-21 13:37 ` Alexander Potapenko 2019-10-21 13:37 ` Alexander Potapenko 2019-10-21 15:54 ` Marco Elver 2019-10-21 15:54 ` Marco Elver 2019-10-21 15:54 ` Marco Elver 2019-10-21 15:54 ` Marco Elver 2019-10-22 14:11 ` Mark Rutland 2019-10-22 16:52 ` Marco Elver 2019-10-22 16:52 ` Marco Elver 2019-10-22 16:52 ` Marco Elver 2019-10-22 15:48 ` Oleg Nesterov 2019-10-22 17:42 ` Marco Elver 2019-10-22 17:42 ` Marco Elver 2019-10-22 17:42 ` Marco Elver 2019-10-23 16:24 ` Oleg Nesterov 2019-10-23 16:24 ` Oleg Nesterov 2019-10-24 11:02 ` Marco Elver 2019-10-24 11:02 ` Marco Elver 2019-10-24 11:02 ` Marco Elver 2019-10-23 9:41 ` Dmitry Vyukov 2019-10-23 9:41 ` Dmitry Vyukov 2019-10-23 9:41 ` Dmitry Vyukov 2019-10-23 9:56 ` Dmitry Vyukov 2019-10-23 9:56 ` Dmitry Vyukov 2019-10-23 9:56 ` Dmitry Vyukov 2019-10-23 10:03 ` Dmitry Vyukov 2019-10-23 10:03 ` Dmitry Vyukov 2019-10-23 10:03 ` Dmitry Vyukov 2019-10-23 10:09 ` Dmitry Vyukov 2019-10-23 10:09 ` Dmitry Vyukov 2019-10-23 10:09 ` Dmitry Vyukov 2019-10-23 10:28 ` Dmitry Vyukov 2019-10-23 10:28 ` Dmitry Vyukov 2019-10-23 10:28 ` Dmitry Vyukov 2019-10-23 11:08 ` Dmitry Vyukov 2019-10-23 11:08 ` Dmitry Vyukov 2019-10-23 11:08 ` Dmitry Vyukov 2019-10-23 11:20 ` Dmitry Vyukov 2019-10-23 11:20 ` Dmitry Vyukov 2019-10-23 11:20 ` Dmitry Vyukov 2019-10-23 12:05 ` Dmitry Vyukov 2019-10-23 12:05 ` Dmitry Vyukov 2019-10-23 12:05 ` Dmitry Vyukov 2019-10-23 12:32 ` Dmitry Vyukov 2019-10-23 12:32 ` Dmitry Vyukov 2019-10-23 12:32 ` Dmitry Vyukov 2019-10-17 14:12 ` [PATCH v2 2/8] objtool, kcsan: Add KCSAN runtime functions to whitelist Marco Elver 2019-10-17 14:12 ` Marco Elver 2019-10-21 15:15 ` Dmitry Vyukov 2019-10-21 15:15 ` Dmitry Vyukov 2019-10-21 15:15 ` Dmitry Vyukov 2019-10-21 15:43 ` Marco Elver 2019-10-21 15:43 ` Marco Elver 2019-10-21 15:43 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 3/8] build, kcsan: Add KCSAN build exceptions Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 4/8] seqlock, kcsan: Add annotations for KCSAN Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-24 12:28 ` Mark Rutland 2019-10-24 14:17 ` Marco Elver 2019-10-24 14:17 ` Marco Elver 2019-10-24 14:17 ` Marco Elver 2019-10-24 16:35 ` Mark Rutland 2019-10-24 16:35 ` Mark Rutland 2019-10-24 17:09 ` Marco Elver 2019-10-24 17:09 ` Marco Elver 2019-10-24 17:09 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 5/8] seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 6/8] asm-generic, kcsan: Add KCSAN instrumentation for bitops Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 7/8] locking/atomics, kcsan: Add KCSAN instrumentation Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-22 12:33 ` Mark Rutland 2019-10-22 18:17 ` Marco Elver [this message] 2019-10-22 18:17 ` Marco Elver 2019-10-22 18:17 ` Marco Elver 2019-10-17 14:13 ` [PATCH v2 8/8] x86, kcsan: Enable KCSAN for x86 Marco Elver 2019-10-17 14:13 ` Marco Elver 2019-10-22 12:59 ` Mark Rutland 2019-10-22 13:02 ` Marco Elver 2019-10-22 13:02 ` Marco Elver 2019-10-22 13:02 ` Marco Elver
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=CANpmjNOhoyDMFMUz6by3hLtX7aBFk4pXTmzjmWYiq2+z+R5fAQ@mail.gmail.com \ --to=elver@google.com \ --cc=akiyks@gmail.com \ --cc=andreyknvl@google.com \ --cc=ard.biesheuvel@linaro.org \ --cc=arnd@arndb.de \ --cc=boqun.feng@gmail.com \ --cc=bp@alien8.de \ --cc=corbet@lwn.net \ --cc=dave.hansen@linux.intel.com \ --cc=dhowells@redhat.com \ --cc=dja@axtens.net \ --cc=dlustig@nvidia.com \ --cc=dvyukov@google.com \ --cc=glider@google.com \ --cc=hpa@zytor.com \ --cc=j.alglave@ucl.ac.uk \ --cc=joel@joelfernandes.org \ --cc=jpoimboe@redhat.com \ --cc=kasan-dev@googlegroups.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luc.maranget@inria.fr \ --cc=luto@kernel.org \ --cc=mark.rutland@arm.com \ --cc=mingo@redhat.com \ --cc=npiggin@gmail.com \ --cc=parri.andrea@gmail.com \ --cc=paulmck@linux.ibm.com \ --cc=peterz@infradead.org \ --cc=stern@rowland.harvard.edu \ --cc=tglx@linutronix.de \ --cc=will@kernel.org \ --cc=x86@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.