From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A634681 for ; Wed, 13 Jul 2022 15:25:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA648C34114; Wed, 13 Jul 2022 15:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657725929; bh=+/3ieti++Xy7mm8wrFR/by+0eEvgDM9vrqEGTjYrD1c=; h=From:To:Cc:Subject:Date:From; b=g325+NdsQber3QbzH7o3PvdaFg4snqkAZ6+jANUEcdPlvcESIV3T/NqS7C99sc3jW bly3SPQ7GoeFIRGpPEJ03uldmiT5R6S0CHmnEaie8i4Q87Y03j5zZAh6RjzSSsxYlr hkXT6QhUv3gLgYjMiYdnyiGCNNCpbulepk5EHfrUV1sDJFro6BLKwNju3GtUhaim/i 6ygGuSYEjZnXepKGpikUBFlO74y1WPUrpKqpOFmQQpNfvmuAVAUFq0Qcr8FSXLN+ev CcJTHc87Jozw+0r286qaDYIFnzG+2I7MUhhWE+It+O0BP5DoZFj7ZQ6BPmExf7L4cT pzSBl+0nlrDTw== From: Nathan Chancellor To: Linus Torvalds , x86@kernel.org Cc: Nick Desaulniers , Peter Zijlstra , Josh Poimboeuf , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nathan Chancellor , stable@vger.kernel.org, kernel test robot Subject: [PATCH v2] x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current Date: Wed, 13 Jul 2022 08:24:37 -0700 Message-Id: <20220713152436.2294819-1-nathan@kernel.org> X-Mailer: git-send-email 2.37.1 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Clang warns: arch/x86/kernel/cpu/bugs.c:58:21: error: section attribute is specified on redeclared variable [-Werror,-Wsection] DEFINE_PER_CPU(u64, x86_spec_ctrl_current); ^ arch/x86/include/asm/nospec-branch.h:283:12: note: previous declaration is here extern u64 x86_spec_ctrl_current; ^ 1 error generated. The declaration should be using DECLARE_PER_CPU instead so all attributes stay in sync. Cc: stable@vger.kernel.org Fixes: fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS") Reported-by: kernel test robot Signed-off-by: Nathan Chancellor --- v1 -> v2: https://lore.kernel.org/20220713152222.1697913-1-nathan@kernel.org/ * Use asm/percpu.h instead of linux/percpu.h to avoid static call include errors. arch/x86/include/asm/nospec-branch.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index bb05ed4f46bd..10a3bfc1eb23 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -11,6 +11,7 @@ #include #include #include +#include #define RETPOLINE_THUNK_SIZE 32 @@ -280,7 +281,7 @@ static inline void indirect_branch_prediction_barrier(void) /* The Intel SPEC CTRL MSR base value cache */ extern u64 x86_spec_ctrl_base; -extern u64 x86_spec_ctrl_current; +DECLARE_PER_CPU(u64, x86_spec_ctrl_current); extern void write_spec_ctrl_current(u64 val, bool force); extern u64 spec_ctrl_current(void); base-commit: 72a8e05d4f66b5af7854df4490e3135168694b6b -- 2.37.1