x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
PATCH v3 1/1 x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
When assembling with Clang via make LLVM_IAS=1 and CONFIG_HYPERV enabled, we observe the following 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;
This is caused by typos in arch/x86/include/asm/idtentry.h:
HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR
For more details see ClangBuiltLinux issue #1088.
---
Personal note:
I also needed Jian's patch to completely build with LLVM_IAS=1" but I don't think that should be in the message that gets committed per se. Without Jian's patch we did NOT catch this one!
Changes v2->v3:
- Fold in comments suggested by Nick
- Add Nick's Suggested-by
- Drop unneeded tags and order the rest alphabetically
- Move comments and links to Jian's patch to a personal note
Changes v1->v2:
- Add Wei Liu's Reviewed-by
- Add note to clarify my patch is independent from Jian's patch
- Add link to latest version of Jian's patch
arch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/idtentry.h +2 -2
@@ -626,8 +626,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.28.0.rc0
Quoted 29 lines · Sedat Dilek
When assembling with Clang via
make LLVM_IAS=1andCONFIG_HYPERVenabled, we observe the following 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^<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;This is caused by typos in
arch/x86/include/asm/idtentry.h:
HYPERVISOR_REENLIGHTENMENT_VECTOR->HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR->HYPERV_STIMER0_VECTORFor more details see ClangBuiltLinux issue #1088.
Quoted 7 lines
Cc Jian Cai <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Reviewed-by Nathan Chancellor <[email protected]>Reviewed-by Wei Liu <[email protected]>Suggested-by Nick Desaulniers <[email protected]>Signed-off-by Sedat Dilek <[email protected]>
LGTM, thanks Sedat.
Quoted 40 lines
---
Personal note:
I also needed Jian's patch to completely build with LLVM_IAS=1" but I don't think that should be in the message that gets committed per se. Without Jian's patch we did NOT catch this one!Changes
v2->v3:
- Fold in comments suggested by Nick
- Add Nick's Suggested-by
- Drop unneeded tags and order the rest alphabetically
- Move comments and links to Jian's patch to a personal noteChanges
v1->v2:
- Add Wei Liu's Reviewed-by
- Add note to clarify my patch is independent from Jian's patch
- Add link to latest version of Jian's patcharch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/idtentry.h +2
-3@@ -626,8 +626,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 ) --2.28.0.rc0
Signature · 2 lines
Thanks, ~Nick Desaulniers
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 5769fe26f389b0002ed48fd16d642a1d86edaf79 Gitweb: https://git.kernel.org/tip/5769fe26f389b0002ed48fd16d642a1d86edaf79 Author: Sedat Dilek <[email protected]> AuthorDate: Tue, 14 Jul 2020 21:47:40 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 16 Jul 2020 17:25:10 +02:00
x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
When assembling with Clang via make LLVM_IAS=1 and CONFIG_HYPERV enabled, we observe the following 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;
This is caused by typos in arch/x86/include/asm/idtentry.h:
HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTORHYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR
For more details see ClangBuiltLinux issue #1088.
--- 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 )