[PATCH v4.{9,14,17,18}] x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

[PATCH v4.{9,14,17,18}] x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

[Guenter Roeck]

commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream

allmodconfig+CONFIG_INTEL_KVM=n results in the following build error.

  ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined!

Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry")
Reported-by: Meelis Roos <mroos@linux.ee>
Cc: Meelis Roos <mroos@linux.ee>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/x86/kernel/cpu/bugs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 5229eaf73828..ac67a76550bd 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -647,10 +647,9 @@ void x86_spec_ctrl_setup_ap(void)
 enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH;
 #if IS_ENABLED(CONFIG_KVM_INTEL)
 EXPORT_SYMBOL_GPL(l1tf_mitigation);
-
+#endif
 enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO;
 EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation);
-#endif
 
 static void __init l1tf_select_mitigation(void)
 {
-- 
2.7.4

Re: [PATCH v4.{9,14,17,18}] x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

[Greg Kroah-Hartman]

On Wed, Aug 15, 2018 at 10:15:21AM -0700, Guenter Roeck wrote:
> commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream
> 
> allmodconfig+CONFIG_INTEL_KVM=n results in the following build error.
> 
>   ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined!
> 
> Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry")
> Reported-by: Meelis Roos <mroos@linux.ee>
> Cc: Meelis Roos <mroos@linux.ee>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  arch/x86/kernel/cpu/bugs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)


Already queued up, Linus pointed me at it before you did :)

thanks,

greg k-h

Re: [PATCH v4.{9,14,17,18}] x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

[Guenter Roeck]

On Wed, Aug 15, 2018 at 07:32:16PM +0200, Greg Kroah-Hartman wrote:
> On Wed, Aug 15, 2018 at 10:15:21AM -0700, Guenter Roeck wrote:
> > commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream
> > 
> > allmodconfig+CONFIG_INTEL_KVM=n results in the following build error.
> > 
> >   ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined!
> > 
> > Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry")
> > Reported-by: Meelis Roos <mroos@linux.ee>
> > Cc: Meelis Roos <mroos@linux.ee>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> > Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> > ---
> >  arch/x86/kernel/cpu/bugs.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> 
> Already queued up, Linus pointed me at it before you did :)
> 

Yes, I noticed after I sent it. Sorry for the noise.

Guenter