Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1285479pxb; Thu, 24 Mar 2022 16:54:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAq8HNSSCdvBG1wcvTwQZPReUOSif6eBjcrf9pFmf207eJ60Tijfr3BfqCXcrnggRqnuYp X-Received: by 2002:a17:90a:de98:b0:1c7:1bed:67f7 with SMTP id n24-20020a17090ade9800b001c71bed67f7mr9357461pjv.199.1648166087332; Thu, 24 Mar 2022 16:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648166087; cv=none; d=google.com; s=arc-20160816; b=tpxELAwZhBxmESAomkdguW93wtrEyntnrkhLzup04ZeaLeIW3rEV/qoex9AJSjvQuw yJ2t9knSKRG15fjc1fIegmcl4p/RwmGdXZ2oOihwBLj5oaJyq+XRFt9/1GX1B5v7paYq 9bwZC7H7husoKl2h7dcKGu5DitmxkqZKDWS8mpx6Mja23exlhDFXC0QfadWT28/+g/TZ nG1RZq1UAeuBBAQ8w0VG3HXuLWw8jy0wZggErpIA1e25rg+/lGUJV5/uhQ26ZatC7PlJ vWhUBAtBdal912a/rQ1JkBiz/4/IlEhyC9aBGcik0aRNLSzT7b0+8DPnDRmRikjyTZKe pLEg== 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:mime-version :dkim-signature; bh=4GBPXMmjtCwB7t0ecjf/4IevMdb1dyWXSGcgSEXFlT8=; b=MP2IbnNEG8pOAhXC732kx5kufDXvdHLIpb7lAo9ijny325yEaB0iyVj8V3WPmtMg7R TsECFYbkv4JISNENI0/GCuqkKz/gN7Mf6mBueYFHCz+OpyzEpjUO8EYd+Vj6MwrmOxRl 5cQLc3BX+2gkaHcOpyuaG9Px/3gYJr8kY36J/fqRpzBB+54hv2Zj5N8hiWhF5jtdS47d exUe8O4uKYbJdFo5fRnAHktdo7Ci9rSVQp7nY1Nhn5UdK8fWpQPMukX4/9xdtkeHSalK ZJBsJPvxCr85OO3ujh7QEpF9WXrCbl/8wVuxvJWS/xH34hqZ018dSAhavKuEXodsanFH 3kgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qtl+lhBa; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d188-20020a6368c5000000b003816043f044si717992pgc.569.2022.03.24.16.54.32; Thu, 24 Mar 2022 16:54:47 -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=@gmail.com header.s=20210112 header.b=qtl+lhBa; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343981AbiCWTcF (ORCPT + 99 others); Wed, 23 Mar 2022 15:32:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234750AbiCWTcE (ORCPT ); Wed, 23 Mar 2022 15:32:04 -0400 Received: from mail-yb1-xb35.google.com (mail-yb1-xb35.google.com [IPv6:2607:f8b0:4864:20::b35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C59AA89083; Wed, 23 Mar 2022 12:30:33 -0700 (PDT) Received: by mail-yb1-xb35.google.com with SMTP id x20so4430327ybi.5; Wed, 23 Mar 2022 12:30:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc; bh=4GBPXMmjtCwB7t0ecjf/4IevMdb1dyWXSGcgSEXFlT8=; b=qtl+lhBaAMthvQDwCYrV6oxBbC+PpsvyuQLj9/TyMc0cCgyzg/Dls7Uf4lCluf5sOx DLyYicn0h5x101JHYSFSrbZBA4YBboKhpgxZfOIKjKBJ2fmLJallwWJEKPTccS1jQp1N pK7eIgpawC5cyF/cod72+8hmqN2tddQFpB8QHs0bk+RHqPXOLUmLC92QqzEAdKmupkbp U7yHXUEuFIn0IDBY6zm3qkGjbtTWJBjSuaIvGL4CEZrV4MB7t/9F10KLzqsDEfy54MyJ tD0/BzuWdLkom/QcU8WK1EwzwLFsnOdMTiBx74ASzxaxaG263bKSDlK7cM+2QoU2LSZ7 uqnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=4GBPXMmjtCwB7t0ecjf/4IevMdb1dyWXSGcgSEXFlT8=; b=3GzLuG8meCNXv/hbZx1p7QqQkbpRlU/vleKsw8M37tIme/4gUqCVw4B/dRLwTdU/E+ 0cNJghu1NtpzlzG9JGQnrvOKrivbjsVhtHioAfqtms1/kADfuFkc/uJbXa979KmQB37w uxrf8iVH8OaOK+XbZ6SQwSaXNM2qlOlPrSud57hBP+UdmT1qxTjRLFSf4P/OBEf9wWyZ QCL1XpYVoKTw8X6fbfTleVDzHYz9E+CtmQqGB+BqWQ885EaYAvbt0h9N53Z7ktvdBQBf nbD4UyPg9un1QD3wJ+kdRfXPtpvhHFJCwGCS7BaLxkGa/e6Ew3gl2qh9GnvbatWOLEX9 lokQ== X-Gm-Message-State: AOAM532518POkunZ1XBvJpMjiPn1p7T/vmtzYRW5ly7f1tnfGOpOi9CS oXmfzI8KRyqVOofTRl4pmu/kFaHOH3VtgP99w1E= X-Received: by 2002:a25:d95:0:b0:633:771f:6118 with SMTP id 143-20020a250d95000000b00633771f6118mr1635509ybn.122.1648063833053; Wed, 23 Mar 2022 12:30:33 -0700 (PDT) MIME-Version: 1.0 From: Charlemagne Lasse Date: Wed, 23 Mar 2022 20:30:22 +0100 Message-ID: Subject: Re: [PATCH] x86: bug.h: merge annotate_reachable into _BUG_FLAGS for __WARN_FLAGS To: ndesaulniers@google.com Cc: adobriyan@gmail.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, jpoimboe@redhat.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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 > @@ -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 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)