Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1278537pxb; Thu, 24 Mar 2022 16:44:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3n8DD4ThgNeJ+W8QhYFuhrtGDobVu6AlaM9Z5QboB1j2ucZJuABCDSRQnvsm6tX6Nu3kn X-Received: by 2002:a17:902:e882:b0:154:445d:9818 with SMTP id w2-20020a170902e88200b00154445d9818mr8684463plg.40.1648165491078; Thu, 24 Mar 2022 16:44:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648165491; cv=none; d=google.com; s=arc-20160816; b=Baany8KRsjAz74SV/HAsGUOueueYKtfiZagiSVNUorFTCU8pL4ZckuZFOqALaRh7mI HYR2mQlCe2J1Dhu3GTzkEFoytts4rVWFPZq8Idy+Z8HPWtpb+eD0EbDiRTzQrSKdsKJX /xKoaa1SUGtONQUeAQ1KJRVT4oGMAIw1iSq5Dx5FMbMwwRXfam29PZrZRE2DG25DpZ1N df+PIE01nBogDuPNZsJys0FXWFRxXKfXiT39qiJOgLXxUNCHlbQV94hWXoApr24wNuxE ubFy45P1DC3Qk0EOavDxPn4JS9RCD6KWioGMOdGHPUNXTLg0RlotlHSeDt7aMXces2Ud ip+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=kQrBGFwucrBKBVfXucD62w2ROKP/3gosyL/mFvFuauw=; b=pdYNBwYWHl0lKvPz5dmBAHpyRzaq+sd0Wc7MNc7BVplpPYLGDc9mkkZO/+2dHYHrk1 0Iq2iUnMDybUrdZiZK0tNef1Vgbs6eRPC43/KMk9zAao8wX+XbQ0H+jFotjpO6RaKjPw d5Ixi/dKHQJPKAW9ln/n5RekQI+VRoiWAIhPT5SPwHGPRJXnsmZvQgwSxpPbsrntBWIG k+l/iDjYm2vWECR+lCoDSFTPvFwaDn1S+VT2qepNTQvQXWpi5ibq7CSI7MS4CoU2/z0s WmSEwk41UDVXC3/N2vbAHLsi4KyWvtVb2EDM34BcLP9hJzcdkXsEmTwYjIJ9dm48gerW k38Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=SBbwCPey; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n7-20020a17090a928700b001bd14e01fc4si4097139pjo.178.2022.03.24.16.44.37; Thu, 24 Mar 2022 16:44:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=SBbwCPey; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343990AbiCWTnS (ORCPT + 99 others); Wed, 23 Mar 2022 15:43:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344334AbiCWTnP (ORCPT ); Wed, 23 Mar 2022 15:43:15 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13F858BE00 for ; Wed, 23 Mar 2022 12:41:45 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id q5so3321366ljb.11 for ; Wed, 23 Mar 2022 12:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=kQrBGFwucrBKBVfXucD62w2ROKP/3gosyL/mFvFuauw=; b=SBbwCPeyER6bdPDyzhQl8Ssg5BBoNYoxM4wuCfgnDMBpBaTxeqvdt/O+JMNniz4Myr AdkoKTp8pj5cEZ7B1s7i22BAAMAln1zN/s5LGOGGUaXqkEyoeXmpJZGsd41WBh8obao9 pYKhcJps1P+IYJoqKMNmjNrvkWb20OvKGDggaxBL0ZGg9vSo1RzjWYXyLsF1PerHnr2c nsO8JOb+kjtiZDBdztqa00hyErV3EmCPRUTp3rN2xNNIbbqRgWpKrkDPz/uLFOdiCcjQ jkNlTUj3B8eSsD8dx+YpoFkZcoeocthFtBuffFjS9zUnTUK3XTXSLwCp7gYoYqVSHr4R 5bkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kQrBGFwucrBKBVfXucD62w2ROKP/3gosyL/mFvFuauw=; b=H1/JYsq1ZKUyN1TMKOJ9uccxOfwviBAW81w3C1Q2MPPn5vFz7bA0UOLXklLzIw8CRN uqpYUadiwXw/gd5XD2Aw+4cXRl1xWAXJJL2zTzBF0Pw7VeVQU/SlGRbKL3C4RHJa/HWC IhJ9Oe09fJw4PzB3Ql7y2SCokQD1AAjdiVcwMWxlAYwVSzlubmoLZeohrRn35DEvjbTT SVSml5dIYdULojedlouvzBx3Uz9VdF4QhzzjPPiLhNgp8cYm4pfA44f+lm9dw237aGO0 5w2DwcDh3a0i7skSm4+aNUIPYUaOGECpAGNC6e8WeGMdpWZHZgZX1E9Y6RkXqtg922Fi bzyQ== X-Gm-Message-State: AOAM530RDr9NVM0HXk1HfXPEdCjJVXNPkWjLCvSvoP2cGMuUanhJKQnH dGamyO6pXKJ91c8CYB+ljR44iwC0rNFM1nXLAnjArg== X-Received: by 2002:a2e:904c:0:b0:23e:d7ad:3fdd with SMTP id n12-20020a2e904c000000b0023ed7ad3fddmr1318780ljg.239.1648064503179; Wed, 23 Mar 2022 12:41:43 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Nick Desaulniers Date: Wed, 23 Mar 2022 12:41:31 -0700 Message-ID: Subject: Re: [PATCH] x86: bug.h: merge annotate_reachable into _BUG_FLAGS for __WARN_FLAGS To: Charlemagne Lasse , Vincent Mailhol , jpoimboe@redhat.com Cc: adobriyan@gmail.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, linux-sparse@vger.kernel.org, llvm@lists.linux.dev, luc.vanoostenryck@gmail.com, mingo@redhat.com, nathan@kernel.org, peterz@infradead.org, tglx@linutronix.de, x86@kernel.org, Sasha Levin Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 23, 2022 at 12:30 PM Charlemagne Lasse wrote: > > > @@ -75,9 +77,9 @@ do { \ > > */ > > #define __WARN_FLAGS(flags) \ > > do { \ > > + __auto_type f = BUGFLAG_WARNING|(flags); \ > > instrumentation_begin(); \ > > - _BUG_FLAGS(ASM_UD2, BUGFLAG_WARNING|(flags)); \ > > - annotate_reachable(); \ > > + _BUG_FLAGS(ASM_UD2, f, ASM_REACHABLE); \ > > instrumentation_end(); \ > > } while (0) > > This causes following sparse warning on x86: > > make allnoconfig && touch init/version.c && make CHECK="sparse > -Wshadow" C=1 init/version.o > # > # No change to .config > # > CALL scripts/checksyscalls.sh > CALL scripts/atomic/check-atomics.sh > CHK include/generated/compile.h > CC init/version.o > CHECK init/version.c > init/version.c: note: in included file (through > include/linux/rculist.h, include/linux/pid.h, include/linux/sched.h, > include/linux/utsname.h): > ./include/linux/rcupdate.h:1007:9: warning: symbol 'f' shadows an earlier one > ./include/linux/rcupdate.h:1001:47: originally declared here Thanks for the report. There was already a fix sent for this: https://lore.kernel.org/lkml/20220317065743.8467-1-mailhol.vincent@wanadoo.fr/ but it doesn't mention that sparse is warning about this, too. I think if Vincent sent a v3 that mentioned that sparse is warning about this, too, and cc'ed you, you could then supply signed-off/tested-by tags (or just do so on v2, though it doesn't mention sparse), and maybe Josh would be so kind as to pick that up? > > > Affected versions (from the ones on kernel.org): > > * 5.17 - bfb1a7c91fb7 ("x86/bug: Merge annotate_reachable() into > _BUG_FLAGS() asm") > * 5.16.17 - fe0c95903a68 ("x86/bug: Merge annotate_reachable() into > _BUG_FLAGS() asm") > > Cannot be seen when changing the variable name: > > diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h > index bab883c0b6fe..cbd11e38252a 100644 > --- a/arch/x86/include/asm/bug.h > +++ b/arch/x86/include/asm/bug.h > @@ -77,9 +77,9 @@ do { \ > */ > #define __WARN_FLAGS(flags) \ > do { \ > - __auto_type f = BUGFLAG_WARNING|(flags); \ > + __auto_type __f = BUGFLAG_WARNING|(flags); \ > instrumentation_begin(); \ > - _BUG_FLAGS(ASM_UD2, f, ASM_REACHABLE); \ > + _BUG_FLAGS(ASM_UD2, __f, ASM_REACHABLE); \ > instrumentation_end(); \ > } while (0) -- Thanks, ~Nick Desaulniers