x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
PATCH 1/1 x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a fix.
With Jian's fix applied another issue raised up when CONFIG_HYPERV=m.
It turned out that the conversion of vectors to IDTENTRY_SYSVEC in case of CONFIG_HYPERV was incomplete and fails with a build error:
<instantiation>:9:6: error: expected absolute expression
.if HYPERVISOR_REENLIGHTENMENT_VECTOR == 3
^
<instantiation>:1:1: note: while in macro instantiation
idtentry HYPERVISOR_REENLIGHTENMENT_VECTOR asm_sysvec_hyperv_reenlightenment sysvec_hyperv_reenlightenment has_error_code=0 ^./arch/x86/include/asm/idtentry.h:627:1: note: while in macro instantiationidtentry_sysvec HYPERVISOR_REENLIGHTENMENT_VECTOR sysvec_hyperv_reenlightenment;
^
<instantiation>:9:6: error: expected absolute expression
.if HYPERVISOR_STIMER0_VECTOR == 3
^
<instantiation>:1:1: note: while in macro instantiation
idtentry HYPERVISOR_STIMER0_VECTOR asm_sysvec_hyperv_stimer0 sysvec_hyperv_stimer0 has_error_code=0 ^./arch/x86/include/asm/idtentry.h:628:1: note: while in macro instantiation idtentry_sysvec HYPERVISOR_STIMER0_VECTOR sysvec_hyperv_stimer0;
I and Nathan double-checked the hyperv(isor) vectors:
$ rg --no-heading "HYPERVISOR_REENLIGHTENMENT_VECTOR|HYPERVISOR_STIMER0_VECTOR" $ rg --no-heading "HYPERV_REENLIGHTENMENT_VECTOR|HYPERV_STIMER0_VECTOR"
Fix these typos in arch/x86/include/asm/idtentry.h:
HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR
For more details see CBL issue #1088.
With both fixes applied I was able to build/assemble with a snapshot version of LLVM/Clang from Debian/experimental.
--- arch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/idtentry.h +2 -2
@@ -624,8 +624,8 @@ DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested#if IS_ENABLED (CONFIG_HYPERV )DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_CALLBACK_VECTOR , sysvec_hyperv_callback); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_STIMER0_VECTOR , sysvec_hyperv_stimer0); +DECLARE_IDTENTRY_SYSVEC (HYPERV_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); +DECLARE_IDTENTRY_SYSVEC (HYPERV_STIMER0_VECTOR , sysvec_hyperv_stimer0);#endif #if IS_ENABLED (CONFIG_ACRN_GUEST )
Signature · 1 line
2.27.0
Quoted 4 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a fix.
Just FYI: Patch submitted by Jian.
- Sedat -
[1] https://lore.kernel.org/patchwork/patch/1271455/
[2] https://lore.kernel.org/lkml/[email protected]/
Quoted 19 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a fix.
With Jian's fix applied another issue raised up when
CONFIG_HYPERV=m.It turned out that the conversion of vectors to
IDTENTRY_SYSVECin case ofCONFIG_HYPERVwas incomplete and fails with a build error:<instantiation>:9:6: error: expected absolute expression
.ifHYPERVISOR_REENLIGHTENMENT_VECTOR== 3^<instantiation>:1:1: note: while in macro instantiation
idtentryHYPERVISOR_REENLIGHTENMENT_VECTORasm_sysvec_hyperv_reenlightenmentsysvec_hyperv_reenlightenmenthas_error_code=0 ^./arch/x86/include/asm/idtentry.h:627:1: note: while in macro instantiationidtentry_sysvecHYPERVISOR_REENLIGHTENMENT_VECTORsysvec_hyperv_reenlightenment;
^
<instantiation>:9:6: error: expected absolute expression
.ifHYPERVISOR_STIMER0_VECTOR== 3
Quoted 6 lines
^<instantiation>:1:1: note: while in macro instantiation
idtentryHYPERVISOR_STIMER0_VECTORasm_sysvec_hyperv_stimer0sysvec_hyperv_stimer0has_error_code=0 ^./arch/x86/include/asm/idtentry.h:628:1: note: while in macro instantiationidtentry_sysvecHYPERVISOR_STIMER0_VECTORsysvec_hyperv_stimer0;
Hmm... Interesting. GCC never complained. Guests are perhaps broken in a rather subtle way.
Quoted 8 lines
I and Nathan double-checked the hyperv(isor) vectors:
$ rg --no-heading "HYPERVISOR_REENLIGHTENMENT_VECTOR|HYPERVISOR_STIMER0_VECTOR" $ rg --no-heading "HYPERV_REENLIGHTENMENT_VECTOR|HYPERV_STIMER0_VECTOR"Fix these typos in
arch/x86/include/asm/idtentry.h:
Quoted 7 lines
HYPERVISOR_REENLIGHTENMENT_VECTOR->HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR->HYPERV_STIMER0_VECTORFor more details see CBL issue #1088.
With both fixes applied I was able to build/assemble with a snapshot version of LLVM/Clang from Debian/experimental.
I think the issue found here is independent of the other. This patch shouldn't need to wait for the other to land.
Quoted 17 lines
Cc Jian Cai <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Signed-off-by Sedat Dilek <[email protected]>--- arch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/idtentry.h +0
-0
arch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested · line 628
Quoted 7 lines
arch/x86/include/asm/idtentry.h +2
-2@@ -624,8 +624,8 @@ DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested#if IS_ENABLED (CONFIG_HYPERV )DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_CALLBACK_VECTOR , sysvec_hyperv_callback); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_STIMER0_VECTOR , sysvec_hyperv_stimer0); +DECLARE_IDTENTRY_SYSVEC (HYPERV_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); +DECLARE_IDTENTRY_SYSVEC (HYPERV_STIMER0_VECTOR , sysvec_hyperv_stimer0);
Thomas, can you pick this up for 5.8? Thanks.
Wei.
Quoted 42 lines · Wei Liu
Quoted 19 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a fix.
With Jian's fix applied another issue raised up when
CONFIG_HYPERV=m.It turned out that the conversion of vectors to
IDTENTRY_SYSVECin case ofCONFIG_HYPERVwas incomplete and fails with a build error:<instantiation>:9:6: error: expected absolute expression
.ifHYPERVISOR_REENLIGHTENMENT_VECTOR== 3^<instantiation>:1:1: note: while in macro instantiation
idtentryHYPERVISOR_REENLIGHTENMENT_VECTORasm_sysvec_hyperv_reenlightenmentsysvec_hyperv_reenlightenmenthas_error_code=0 ^./arch/x86/include/asm/idtentry.h:627:1: note: while in macro instantiationidtentry_sysvecHYPERVISOR_REENLIGHTENMENT_VECTORsysvec_hyperv_reenlightenment;
^
<instantiation>:9:6: error: expected absolute expression
.ifHYPERVISOR_STIMER0_VECTOR== 3Quoted 6 lines
^<instantiation>:1:1: note: while in macro instantiation
idtentryHYPERVISOR_STIMER0_VECTORasm_sysvec_hyperv_stimer0sysvec_hyperv_stimer0has_error_code=0 ^./arch/x86/include/asm/idtentry.h:628:1: note: while in macro instantiationidtentry_sysvecHYPERVISOR_STIMER0_VECTORsysvec_hyperv_stimer0;Hmm... Interesting. GCC never complained. Guests are perhaps broken in a rather subtle way.
Quoted 11 lines
I and Nathan double-checked the hyperv(isor) vectors:
$ rg --no-heading "HYPERVISOR_REENLIGHTENMENT_VECTOR|HYPERVISOR_STIMER0_VECTOR" $ rg --no-heading "HYPERV_REENLIGHTENMENT_VECTOR|HYPERV_STIMER0_VECTOR"Fix these typos in
arch/x86/include/asm/idtentry.h:
HYPERVISOR_REENLIGHTENMENT_VECTOR->HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR->HYPERV_STIMER0_VECTOR
Quoted 8 lines
Quoted 4 lines
For more details see CBL issue #1088.
With both fixes applied I was able to build/assemble with a snapshot version of LLVM/Clang from Debian/experimental.
I think the issue found here is independent of the other. This patch shouldn't need to wait for the other to land.
Yes, this one is - and can land - independently. Without Jian's fix and CONFIG_HYPERV=m we have not seen the issue.
Quoted 18 lines
Quoted 18 lines
Cc Jian Cai <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Signed-off-by Sedat Dilek <[email protected]>--- arch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/idtentry.h +0
-0@@ -624,8 +624,8 @@ DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested
Quoted 9 lines
arch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested · line 628
Quoted 6 lines
arch/x86/include/asm/idtentry.h +2
-2#if IS_ENABLED (CONFIG_HYPERV )DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_CALLBACK_VECTOR , sysvec_hyperv_callback); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); -DECLARE_IDTENTRY_SYSVEC (HYPERVISOR_STIMER0_VECTOR , sysvec_hyperv_stimer0); +DECLARE_IDTENTRY_SYSVEC (HYPERV_REENLIGHTENMENT_VECTOR , sysvec_hyperv_reenlightenment); +DECLARE_IDTENTRY_SYSVEC (HYPERV_STIMER0_VECTOR , sysvec_hyperv_stimer0);Reviewed-by Wei Liu <[email protected]>
Thanks for your review.
- Sedat -
Quoted 3 lines
Thomas, can you pick this up for 5.8? Thanks.
Wei.
Quoted 9 lines · Wei Liu
Quoted 2 lines
With both fixes applied I was able to build/assemble with a snapshot version of LLVM/Clang from Debian/experimental.
I think the issue found here is independent of the other. This patch shouldn't need to wait for the other to land.
Reviewed-by Wei Liu <[email protected]>
Submitted a v2.
- Sedat -