2024-02-16 20:25:54

by Arnd Bergmann

Subject: [PATCH] x86/fred: fix building without CONFIG_KVM

From: Arnd Bergmann <[email protected]>

Some constants are only defined if KVM is enabled:

arch/x86/entry/entry_fred.c:117:9: error: use of undeclared identifier 'POSTED_INTR_VECTOR'
117 | SYSVEC(POSTED_INTR_VECTOR, kvm_posted_intr_ipi),
| ^
arch/x86/entry/entry_fred.c:118:9: error: use of undeclared identifier 'POSTED_INTR_WAKEUP_VECTOR'
118 | SYSVEC(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),
| ^
arch/x86/entry/entry_fred.c:119:9: error: use of undeclared identifier 'POSTED_INTR_NESTED_VECTOR'
119 | SYSVEC(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),
| ^

Hiding the references behind the same preprocessor conditional is
probably the best fix here.

Fixes: 14619d912b65 ("x86/fred: FRED entry/exit and dispatch code")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/x86/entry/entry_fred.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/entry/entry_fred.c b/arch/x86/entry/entry_fred.c
index ac120cbdaaf2..660b7f7f9a79 100644
--- a/arch/x86/entry/entry_fred.c
+++ b/arch/x86/entry/entry_fred.c
@@ -114,9 +114,11 @@ static idtentry_t sysvec_table[NR_SYSTEM_VECTORS] __ro_after_init = {

SYSVEC(IRQ_WORK_VECTOR, irq_work),

+#if IS_ENABLED(CONFIG_KVM)
SYSVEC(POSTED_INTR_VECTOR, kvm_posted_intr_ipi),
SYSVEC(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),
SYSVEC(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),
+#endif
};

static bool fred_setup_done __initdata;
--
2.39.2

2024-02-17 01:47:24

by Randy Dunlap

Subject: Re: [PATCH] x86/fred: fix building without CONFIG_KVM

On 2/16/24 12:25, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> Some constants are only defined if KVM is enabled:
>
> arch/x86/entry/entry_fred.c:117:9: error: use of undeclared identifier 'POSTED_INTR_VECTOR'
> 117 | SYSVEC(POSTED_INTR_VECTOR, kvm_posted_intr_ipi),
> | ^
> arch/x86/entry/entry_fred.c:118:9: error: use of undeclared identifier 'POSTED_INTR_WAKEUP_VECTOR'
> 118 | SYSVEC(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),
> | ^
> arch/x86/entry/entry_fred.c:119:9: error: use of undeclared identifier 'POSTED_INTR_NESTED_VECTOR'
> 119 | SYSVEC(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),
> | ^
>
> Hiding the references behind the same preprocessor conditional is
> probably the best fix here.
>
> Fixes: 14619d912b65 ("x86/fred: FRED entry/exit and dispatch code")
> Signed-off-by: Arnd Bergmann <[email protected]>

Acked-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]>

Thanks.

> ---
> arch/x86/entry/entry_fred.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/entry/entry_fred.c b/arch/x86/entry/entry_fred.c
> index ac120cbdaaf2..660b7f7f9a79 100644
> --- a/arch/x86/entry/entry_fred.c
> +++ b/arch/x86/entry/entry_fred.c
> @@ -114,9 +114,11 @@ static idtentry_t sysvec_table[NR_SYSTEM_VECTORS] __ro_after_init = {
>
> SYSVEC(IRQ_WORK_VECTOR, irq_work),
>
> +#if IS_ENABLED(CONFIG_KVM)
> SYSVEC(POSTED_INTR_VECTOR, kvm_posted_intr_ipi),
> SYSVEC(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),
> SYSVEC(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),
> +#endif
> };
>
> static bool fred_setup_done __initdata;

--
#Randy

2024-02-19 15:43:04

by Sean Christopherson

Subject: Re: [PATCH] x86/fred: fix building without CONFIG_KVM

On Fri, Feb 16, 2024, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> Some constants are only defined if KVM is enabled:
>
> arch/x86/entry/entry_fred.c:117:9: error: use of undeclared identifier 'POSTED_INTR_VECTOR'
> 117 | SYSVEC(POSTED_INTR_VECTOR, kvm_posted_intr_ipi),
> | ^
> arch/x86/entry/entry_fred.c:118:9: error: use of undeclared identifier 'POSTED_INTR_WAKEUP_VECTOR'
> 118 | SYSVEC(POSTED_INTR_WAKEUP_VECTOR, kvm_posted_intr_wakeup_ipi),
> | ^
> arch/x86/entry/entry_fred.c:119:9: error: use of undeclared identifier 'POSTED_INTR_NESTED_VECTOR'
> 119 | SYSVEC(POSTED_INTR_NESTED_VECTOR, kvm_posted_intr_nested_ipi),
> | ^
>
> Hiding the references behind the same preprocessor conditional is
> probably the best fix here.
>
> Fixes: 14619d912b65 ("x86/fred: FRED entry/exit and dispatch code")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---

Late to the party :-)

https://lore.kernel.org/all/[email protected]