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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 D9D9EC433DF for ; Tue, 21 Jul 2020 14:09:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A829422C9D for ; Tue, 21 Jul 2020 14:09:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="DG5AbKr2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728189AbgGUOJi (ORCPT ); Tue, 21 Jul 2020 10:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726120AbgGUOJi (ORCPT ); Tue, 21 Jul 2020 10:09:38 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A6FBC061794; Tue, 21 Jul 2020 07:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=bck5iFe0qNEfND6yPrfltx4XHg11WKlZZGgqWSXEbeM=; b=DG5AbKr2hMKTJx8kECWtW35DUW d8nrcG8IEz6EezQuspJJvlr01E63u5FpZUYe/E8yH3amhIvoHVrXSCnuILKCJ4tShC/KtnhPERuPc hICPqgwPI8AkE5moy4RkF72cTtMe0n58XkH1qrTN96udzHXopziPnDJUEM8SpsakWuR+sSlGl0caS NBCU3AoyxrLsrH2vkA7HsMEcMekkwiS5Rp/Y+hYOWT4gsUYljRhZAyRvV1w3fgr/fAfuiuDECwBJz b74PjsC52zjnJdTEDVGQW8UoUBiY/wTtfXYLsxXBr42SVrjiK/RIB716f0BH7GLUumYtmxCE83TxG kJ25CU4g==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxsxW-0007Zu-U5; Tue, 21 Jul 2020 14:09:31 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 18E353011C6; Tue, 21 Jul 2020 16:09:30 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 03D43203C0597; Tue, 21 Jul 2020 16:09:29 +0200 (CEST) Date: Tue, 21 Jul 2020 16:09:29 +0200 From: Peter Zijlstra To: Marco Elver 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 Message-ID: <20200721140929.GB10769@hirez.programming.kicks-ass.net> References: <20200721103016.3287832-1-elver@google.com> <20200721103016.3287832-5-elver@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200721103016.3287832-5-elver@google.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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.