Commit a65c5437 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Zheng Zengkai
Browse files

x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current 

stable inclusion
from stable-v5.10.133
commit abf88ff13414f3991b35c295c4b564c31e3cb2b0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5PTAS
CVE: CVE-2022-29900,CVE-2022-23816,CVE-2022-29901

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=abf88ff13414f3991b35c295c4b564c31e3cb2b0



--------------------------------

commit db886979 upstream.

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: fc02735b ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLin Yujun <linyujun809@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 8f922f9f

arch/x86/include/asm/nospec-branch.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/cpufeatures.h>

#include <asm/msr-index.h>

#include <asm/unwind_hints.h>

#include <asm/percpu.h>



#define RETPOLINE_THUNK_SIZE	32
@@ -288,7 +289,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);