x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV
PATCH v2 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 patch.
With Jian's patch 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.
NOTE: My patch is independent from Jian's patch and should be applied separately.
---
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 37 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a patch.
With Jian's patch 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^<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;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 6 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.
NOTE: My patch is independent from Jian's patch and should be applied separately.
Hi Sedat,
Thanks for the patch! Nice job finding the fix.
I would like to see a v3 with the commit message trimmed a bit. In particular, you mention that Jian's patch is unrelated. In that case, please don't mention it in the commit message, drop the link to issue #1043, and drop the lore link. I think if the commit was just simply:
``` x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV When assembling with Clang via `make LLVM_IAS=1`, we observe the following error: <instantiation>:9:6: error: expected absolute expression <rest of the diagnostic> This is caused by typos in arch/x86/include/asm/idtentry.h: HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTOR HYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR ```
Then the tags you have below minus the unrelated ones.
Quoted 11 lines
Cc Jian Cai <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Reviewed-by Wei Liu <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Signed-off-by Sedat Dilek <[email protected]>---
Otherwise you can put some additional info here "below the fold." It doesn't hurt to say "I also need 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. Sorry to be a pedant about this. With those changes, I'd be happy to sign off on the patch.
Quoted 24 lines
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 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 ) --
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 81 lines · Nick Desaulniers
Quoted 37 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a patch.
With Jian's patch 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^<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;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_VECTORQuoted 6 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.
NOTE: My patch is independent from Jian's patch and should be applied separately.
Hi Sedat,
Thanks for the patch! Nice job finding the fix.I would like to see a v3 with the commit message trimmed a bit. In particular, you mention that Jian's patch is unrelated. In that case, please don't mention it in the commit message, drop the link to issue #1043, and drop the lore link. I think if the commit was just simply:
``` x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV When assembling with Clang via `make LLVM_IAS=1`, we observe the following error: <instantiation>:9:6: error: expected absolute expression <rest of the diagnostic> This is caused by typos in arch/x86/include/asm/idtentry.h: HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTOR HYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR ```Then the tags you have below minus the unrelated ones.
Quoted 11 lines
Cc Jian Cai <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Reviewed-by Wei Liu <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Signed-off-by Sedat Dilek <[email protected]>---
Quoted 6 lines
Otherwise you can put some additional info here "below the fold." It doesn't hurt to say "I also need 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. Sorry to be a pedant about this. With those changes, I'd be happy to sign off on the patch.
Yeah, that sounds like good compromise.
Without Jian's fix/patch we did not found the issue. I wanted to respect this.
I will send out a v3 soonish.
- Sedat -
Quoted 28 lines
Quoted 14 lines
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 patcharch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/idtentry.h +0
-0@@ -626,8 +626,8 @@ DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nestedarch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested
Quoted 10 lines
arch/x86/include/asm/idtentry.h +2
-3#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 ) ----
Thanks,
~Nick Desaulniers
Quoted 81 lines · Nick Desaulniers
Quoted 37 lines · Sedat Dilek
When using Clang's Integrated Assembler (LLVM_IAS=1) we fell over ClangBuiltLinux (CBL) issue #1043 where Jian Cai provided a patch.
With Jian's patch 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^<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;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_VECTORQuoted 6 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.
NOTE: My patch is independent from Jian's patch and should be applied separately.
Hi Sedat,
Thanks for the patch! Nice job finding the fix.I would like to see a v3 with the commit message trimmed a bit. In particular, you mention that Jian's patch is unrelated. In that case, please don't mention it in the commit message, drop the link to issue #1043, and drop the lore link. I think if the commit was just simply:
``` x86/entry: Fix vectors to IDTENTRY_SYSVEC for CONFIG_HYPERV When assembling with Clang via `make LLVM_IAS=1`, we observe the following error: <instantiation>:9:6: error: expected absolute expression <rest of the diagnostic> This is caused by typos in arch/x86/include/asm/idtentry.h: HYPERVISOR_REENLIGHTENMENT_VECTOR -> HYPERV_REENLIGHTENMENT_VECTOR HYPERVISOR_STIMER0_VECTOR -> HYPERV_STIMER0_VECTOR ```Then the tags you have below minus the unrelated ones.
Quoted 11 lines
Cc Jian Cai <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Reviewed-by Wei Liu <[email protected]>Fixes a16be368dd3f ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")Signed-off-by Sedat Dilek <[email protected]>---
Quoted 6 lines
Otherwise you can put some additional info here "below the fold." It doesn't hurt to say "I also need 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. Sorry to be a pedant about this. With those changes, I'd be happy to sign off on the patch.
Patch v3 submitted (see [1]).
Feel free to add your S-o-b.
- Sedat -
[1] https://lore.kernel.org/patchwork/patch/1273010/
Quoted 28 lines
Quoted 14 lines
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 patcharch/x86/include/asm/idtentry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/idtentry.h +0
-0@@ -626,8 +626,8 @@ DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nestedarch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR, sysvec_kvm_posted_intr_nested
Quoted 10 lines
arch/x86/include/asm/idtentry.h +2
-3#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 ) ----
Thanks,
~Nick Desaulniers