From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F09BCCA9EA0 for ; Tue, 22 Oct 2019 12:33:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF08D218AE for ; Tue, 22 Oct 2019 12:33:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389120AbfJVMd6 (ORCPT ); Tue, 22 Oct 2019 08:33:58 -0400 Received: from [217.140.110.172] ([217.140.110.172]:51226 "EHLO foss.arm.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S2388512AbfJVMd6 (ORCPT ); Tue, 22 Oct 2019 08:33:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D49D215BF; Tue, 22 Oct 2019 05:33:36 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5A5DA3F71F; Tue, 22 Oct 2019 05:33:32 -0700 (PDT) Date: Tue, 22 Oct 2019 13:33:30 +0100 From: Mark Rutland To: Marco Elver Cc: akiyks@gmail.com, stern@rowland.harvard.edu, glider@google.com, parri.andrea@gmail.com, andreyknvl@google.com, luto@kernel.org, ard.biesheuvel@linaro.org, arnd@arndb.de, boqun.feng@gmail.com, bp@alien8.de, dja@axtens.net, dlustig@nvidia.com, dave.hansen@linux.intel.com, dhowells@redhat.com, dvyukov@google.com, hpa@zytor.com, mingo@redhat.com, j.alglave@ucl.ac.uk, joel@joelfernandes.org, corbet@lwn.net, jpoimboe@redhat.com, luc.maranget@inria.fr, npiggin@gmail.com, paulmck@linux.ibm.com, peterz@infradead.org, tglx@linutronix.de, will@kernel.org, kasan-dev@googlegroups.com, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: Re: [PATCH v2 7/8] locking/atomics, kcsan: Add KCSAN instrumentation Message-ID: <20191022123329.GC11583@lakrids.cambridge.arm.com> References: <20191017141305.146193-1-elver@google.com> <20191017141305.146193-8-elver@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191017141305.146193-8-elver@google.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 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 < #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 > #include > +#include > + > +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 >