* [PATCH] KVM: x86/mmu: Fix incorrect use of CONFIG_RETPOLINE
@ 2022-07-28 0:02 Jarkko Sakkinen
2022-07-28 15:53 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Sakkinen @ 2022-07-28 0:02 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Jarkko Sakkinen, stable, Jarkko Sakkinen, Sean Christopherson,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen,
maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT),
H. Peter Anvin, Brijesh Singh, Isaku Yamahata,
open list:KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86),
open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)
Use "#ifdef" instead of "#if", as it is possible to select KVM
without enabling RETPOLINE.
Adding the following list of flags on top of tinyconfig is an
example of a failing config file:
CONFIG_64BIT=y
CONFIG_PCI=y
CONFIG_ACPI=y
CONFIG_VIRTUALIZATION=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_CRYPTO=y
CONFIG_DMADEVICES=y
CONFIG_X86_MCE=y
CONFIG_RETPOLINE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_KVM=y
CONFIG_KVM_AMD=y
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=y
CONFIG_CRYPTO_DEV_SP_CCP=y
CONFIG_CRYPTO_DEV_SP_PSP=y
CONFIG_KVM_AMD_SEV=y
CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=n
Cc: stable@vger.kernel.org # 5.19
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Fixes: d1f5c8366288 ("KVM: x86/mmu: Introduce kvm_mmu_map_tdp_page() for use by TDX and SNP")
Signed-off-by: Jarkko Sakkinen <jarkko@profian.com>
---
arch/x86/kvm/mmu/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 0b99ee4ea184..e08c7e85bbb9 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4213,7 +4213,7 @@ kvm_pfn_t kvm_mmu_map_tdp_page(struct kvm_vcpu *vcpu, gpa_t gpa,
* direct_page_fault() when appropriate.
*/
//r = direct_page_fault(vcpu, &fault);
-#if CONFIG_RETPOLINE
+#ifdef CONFIG_RETPOLINE
if (fault.is_tdp)
r = kvm_tdp_page_fault(vcpu, &fault);
#else
--
2.36.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: x86/mmu: Fix incorrect use of CONFIG_RETPOLINE
2022-07-28 0:02 [PATCH] KVM: x86/mmu: Fix incorrect use of CONFIG_RETPOLINE Jarkko Sakkinen
@ 2022-07-28 15:53 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2022-07-28 15:53 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: stable, Jarkko Sakkinen, Sean Christopherson, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen,
maintainer : X86 ARCHITECTURE 32-BIT AND 64-BIT, H . Peter Anvin,
Brijesh Singh, Isaku Yamahata,
open list : KERNEL VIRTUAL MACHINE FOR X86 KVM/x86,
open list : X86 ARCHITECTURE 32-BIT AND 64-BIT
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-28 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-28 0:02 [PATCH] KVM: x86/mmu: Fix incorrect use of CONFIG_RETPOLINE Jarkko Sakkinen
2022-07-28 15:53 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.