This is early RFC to understand if there are any concerns with enabling AVIC by default from Zen 4. There are a few issues related to irq window inhibits (*) that will need to be addressed before we can enable AVIC, but I wanted to understand if there are other issues that I may not be aware of. I will split up the changes and turn this into a proper patch series once there is agreement on how to proceed. AVIC (and x2AVIC) is fully functional since Zen 4, and has so far been working well in our tests across various workloads. So, enable AVIC by default from Zen 4. CPUs prior to Zen 4 are affected by hardware errata related to AVIC and workaround for those (erratum #1235) is only just landing upstream. So, it is unlikely that anyone was using AVIC on those CPUs. Start requiring users on those CPUs to pass force_avic=1 to explicitly enable AVIC going forward. This helps convey that AVIC isn't fully enabled (so users are aware of what they are signing up for), while allowing us to make kvm_amd module parameter 'avic' as an alias for 'enable_apicv' simplifying the code. The only downside is that force_avic taints the kernel, but if this is otherwise agreeable, the taint can be restricted to the AVIC feature bit not being enabled. Finally, stop complaining that x2AVIC CPUID feature bit is present without basic AVIC feature bit, since that looks to be the way AVIC is being disabled on certain systems and enabling AVIC by default will start printing this warning on systems that have AVIC disabled. (*) http://lkml.kernel.org/r/Z6JoInXNntIoHLQ8@xxxxxxxxxx Signed-off-by: Naveen N Rao (AMD) <naveen@xxxxxxxxxx> --- arch/x86/kvm/svm/avic.c | 11 +++++------ arch/x86/kvm/svm/svm.c | 10 +++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index a34c5c3b164e..bf7f91f41a6e 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -1101,12 +1101,11 @@ bool avic_hardware_setup(void) if (!npt_enabled) return false; - /* AVIC is a prerequisite for x2AVIC. */ - if (!boot_cpu_has(X86_FEATURE_AVIC) && !force_avic) { - if (boot_cpu_has(X86_FEATURE_X2AVIC)) { - pr_warn(FW_BUG "Cannot support x2AVIC due to AVIC is disabled"); - pr_warn(FW_BUG "Try enable AVIC using force_avic option"); - } + if (!boot_cpu_has(X86_FEATURE_AVIC) && !force_avic) + return false; + + if (!force_avic && (boot_cpu_data.x86 < 0x19 || boot_cpu_has(X86_FEATURE_ZEN3))) { + pr_warn("AVIC disabled due to hardware errata. Use force_avic=1 if you really want to enable AVIC.\n"); return false; } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ab11d1d0ec51..9b5356e74384 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -158,12 +158,7 @@ module_param(lbrv, int, 0444); static int tsc_scaling = true; module_param(tsc_scaling, int, 0444); -/* - * enable / disable AVIC. Because the defaults differ for APICv - * support between VMX and SVM we cannot use module_param_named. - */ -static bool avic; -module_param(avic, bool, 0444); +module_param_named(avic, enable_apicv, bool, 0444); module_param(enable_ipiv, bool, 0444); module_param(enable_device_posted_irqs, bool, 0444); @@ -5404,7 +5399,8 @@ static __init int svm_hardware_setup(void) goto err; } - enable_apicv = avic = avic && avic_hardware_setup(); + if (enable_apicv) + enable_apicv = avic_hardware_setup(); if (!enable_apicv) { enable_ipiv = false; base-commit: 7ee45fdd644b138e7a213c6936474161b28d0e1a -- 2.49.0
