Commit ce4253e2 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: SVM: Always print "AVIC enabled" separately, even when force enabled 



Print the customary "AVIC enabled" informational message even when AVIC is
force enabled on a system that doesn't advertise supported for AVIC in
CPUID, as not printing the standard message can confuse users and tools.

Opportunistically clean up the scary message when AVIC is force enabled,
but keep it as separate message so that it is printed at level "warn",
versus the standard message only being printed for level "info".

Suggested-by: default avatarNaveen N Rao (AMD) <naveen@kernel.org>
Reviewed-by: default avatarNaveen N Rao (AMD) <naveen@kernel.org>
Tested-by: default avatarNaveen N Rao (AMD) <naveen@kernel.org>
Link: https://lore.kernel.org/r/20250919215934.1590410-5-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent a9095e4f

arch/x86/kvm/svm/avic.c

+9 −10
Original line number Diff line number Diff line
@@ -1167,16 +1167,15 @@ bool __init avic_hardware_setup(void) 
		return false;

	}



	if (boot_cpu_has(X86_FEATURE_AVIC)) {

		pr_info("AVIC enabled\n");

	} else if (force_avic) {

	/*

		 * Some older systems does not advertise AVIC support.

		 * See Revision Guide for specific AMD processor for more detail.

	 * Print a scary message if AVIC is force enabled to make it abundantly

	 * clear that ignoring CPUID could have repercussions.  See Revision

	 * Guide for specific AMD processor for more details.

	 */

		pr_warn("AVIC is not supported in CPUID but force enabled");

		pr_warn("Your system might crash and burn");

	}

	if (!boot_cpu_has(X86_FEATURE_AVIC))

		pr_warn("AVIC unsupported in CPUID but force enabled, your system might crash and burn\n");



	pr_info("AVIC enabled\n");



	/* AVIC is a prerequisite for x2AVIC. */

	x2avic_enabled = boot_cpu_has(X86_FEATURE_X2AVIC);