Skip to contentSkip to conversation

mainline build failure due to fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")

DISCUSSION Sudip Mukherjee (Codethink) 2 participants 4 messages Jul 13, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi All,

The latest mainline kernel branch fails to build for x86_64 allmodconfig with clang and the error is:

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;

git bisect pointed to fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")

I will be happy to test any patch or provide any extra log if needed.

--
Regards
Sudip

maintainer
#1 lore raw
Quoted 8 lines · Sudip Mukherjee (Codethink)

Hi All,

The latest mainline kernel branch fails to build for x86_64 allmodconfig with clang and the error is:

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);
                    ^
Quoted 7 lines

./arch/x86/include/asm/nospec-branch.h:283:12: note: previous declaration is here extern u64 x86_spec_ctrl_current;

git bisect pointed to fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")

I will be happy to test any patch or provide any extra log if needed.

I suspect something like this will do.

arch/x86/include/asm/nospec-branch.h +1 -1
index bb05ed4f46bd..6398d39e66b0 100644
@@ -280,7 +280,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);
 
maintainer
#2 lore raw
Quoted 24 lines · Peter Zijlstra
Quoted 8 lines · Sudip Mukherjee (Codethink)

Hi All,

The latest mainline kernel branch fails to build for x86_64 allmodconfig with clang and the error is:

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);
                    ^
Quoted 7 lines

./arch/x86/include/asm/nospec-branch.h:283:12: note: previous declaration is here extern u64 x86_spec_ctrl_current;

git bisect pointed to fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")

I will be happy to test any patch or provide any extra log if needed.

I suspect something like this will do.

arch/x86/include/asm/nospec-branch.h +0 -0
index bb05ed4f46bd..6398d39e66b0 100644

arch/x86/include/asm/nospec-branch.h static inline void indirect_branch_prediction_barrier(void) · line 286

Quoted 8 lines
arch/x86/include/asm/nospec-branch.h +1 -1
@@ -280,7 +280,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);
 

I hate headers...

---

arch/x86/include/asm/nospec-branch.h +0 -1
index bb05ed4f46bd..cbc3b8348939 100644
@@ -280,7 +280,6 @@ 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;
 extern void write_spec_ctrl_current(u64 val, bool force);
 extern u64 spec_ctrl_current(void);
 
arch/x86/kvm/vmx/vmx.c +2 -0
index be7c19374fdd..b64512978534 100644
@@ -6831,6 +6831,8 @@ void noinstr vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp)
 	}
 }
 
+DECLARE_PER_CPU(u64, x86_spec_ctrl_current);
+
 void noinstr vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx,
 					unsigned int flags)
 {
#3 lore raw
Quoted 8 lines · Peter Zijlstra
Quoted 6 lines · Peter Zijlstra
Quoted 5 lines · Sudip Mukherjee (Codethink)

Hi All,

The latest mainline kernel branch fails to build for x86_64 allmodconfig with clang and the error is:

<snip>

Quoted 4 lines
Quoted 2 lines

extern u64 spec_ctrl_current(void);

I hate headers...

very short commit message :D

Quoted 19 lines

---

arch/x86/include/asm/nospec-branch.h +0 -1
index bb05ed4f46bd..cbc3b8348939 100644
@@ -280,7 +280,6 @@ 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;
 extern void write_spec_ctrl_current(u64 val, bool force);
 extern u64 spec_ctrl_current(void);
 
arch/x86/kvm/vmx/vmx.c +0 -0
index be7c19374fdd..b64512978534 100644

arch/x86/kvm/vmx/vmx.c void noinstr vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp) · line 6838

Quoted 8 lines
arch/x86/kvm/vmx/vmx.c +2 -0
@@ -6831,6 +6831,8 @@ void noinstr vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp)
        }
 }
 
+DECLARE_PER_CPU(u64, x86_spec_ctrl_current);
+
 void noinstr vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx,
                                        unsigned int flags)
 {

The build failure is fixed with this change. Thanks.

Signature · 2 lines
Regards
Sudip