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=unavailable 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 C4140FA3728 for ; Wed, 16 Oct 2019 11:19:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 900952067B for ; Wed, 16 Oct 2019 11:19:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 900952067B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 113688E0018; Wed, 16 Oct 2019 07:19:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C4318E0001; Wed, 16 Oct 2019 07:19:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1BF08E0018; Wed, 16 Oct 2019 07:19:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0043.hostedemail.com [216.40.44.43]) by kanga.kvack.org (Postfix) with ESMTP id D006F8E0001 for ; Wed, 16 Oct 2019 07:19:00 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 7D8181806E781 for ; Wed, 16 Oct 2019 11:18:59 +0000 (UTC) X-FDA: 76049400798.09.time73_6b45f0e93d614 X-HE-Tag: time73_6b45f0e93d614 X-Filterd-Recvd-Size: 4877 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Oct 2019 11:18:57 +0000 (UTC) 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 005F828; Wed, 16 Oct 2019 04:18:54 -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 2B2573F6C4; Wed, 16 Oct 2019 04:18:50 -0700 (PDT) Date: Wed, 16 Oct 2019 12:18:47 +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 7/8] locking/atomics, kcsan: Add KCSAN instrumentation Message-ID: <20191016111847.GB44246@lakrids.cambridge.arm.com> References: <20191016083959.186860-1-elver@google.com> <20191016083959.186860-8-elver@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191016083959.186860-8-elver@google.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Marco, On Wed, Oct 16, 2019 at 10:39:58AM +0200, Marco Elver wrote: > This adds KCSAN instrumentation to atomic-instrumented.h. > > Signed-off-by: Marco Elver > --- > include/asm-generic/atomic-instrumented.h | 192 +++++++++++++++++++++- > scripts/atomic/gen-atomic-instrumented.sh | 9 +- > 2 files changed, 199 insertions(+), 2 deletions(-) > > diff --git a/include/asm-generic/atomic-instrumented.h b/include/asm-generic/atomic-instrumented.h > index e8730c6b9fe2..9e487febc610 100644 > --- a/include/asm-generic/atomic-instrumented.h > +++ b/include/asm-generic/atomic-instrumented.h > @@ -19,11 +19,13 @@ > > #include > #include > +#include > > static inline int > atomic_read(const atomic_t *v) > { > kasan_check_read(v, sizeof(*v)); > + kcsan_check_atomic(v, sizeof(*v), false); For legibility and consistency with kasan, it would be nicer to avoid the bool argument here and have kcsan_check_atomic_{read,write}() helpers... > diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh > index e09812372b17..c0553743a6f4 100755 > --- a/scripts/atomic/gen-atomic-instrumented.sh > +++ b/scripts/atomic/gen-atomic-instrumented.sh > @@ -12,15 +12,20 @@ gen_param_check() > local type="${arg%%:*}" > local name="$(gen_param_name "${arg}")" > local rw="write" > + local is_write="true" > > case "${type#c}" in > i) return;; > esac > > # We don't write to constant parameters > - [ ${type#c} != ${type} ] && rw="read" > + if [ ${type#c} != ${type} ]; then > + rw="read" > + is_write="false" > + fi > > printf "\tkasan_check_${rw}(${name}, sizeof(*${name}));\n" > + printf "\tkcsan_check_atomic(${name}, sizeof(*${name}), ${is_write});\n" ... which would also simplify this. Though as below, we might want to wrap both in a helper local to atomic-instrumented.h. > } > > #gen_param_check(arg...) > @@ -108,6 +113,7 @@ cat < ({ \\ > typeof(ptr) __ai_ptr = (ptr); \\ > kasan_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ > + kcsan_check_atomic(__ai_ptr, ${mult}sizeof(*__ai_ptr), true); \\ > arch_${xchg}(__ai_ptr, __VA_ARGS__); \\ > }) > EOF > @@ -148,6 +154,7 @@ cat << EOF > > #include > #include > +#include We could add the following to this preamble: static inline void __atomic_check_read(const volatile void *v, size_t size) { kasan_check_read(v, sizeof(*v)); kcsan_check_atomic(v, sizeof(*v), false); } static inline void __atomic_check_write(const volatile void *v, size_t size) { kasan_check_write(v, sizeof(*v)); kcsan_check_atomic(v, sizeof(*v), true); } ... and only have the one call in each atomic wrapper. Otherwise, this looks good to me. Thanks, Mark.