Commit db264509 authored by Tom Lendacky's avatar Tom Lendacky Committed by Sean Christopherson
Browse files

KVM: SVM: Add the type of VM for which the VMCB/VMSA is being dumped 



Add the type of VM (SVM, SEV, SEV-ES, or SEV-SNP) being dumped to the
dump_vmcb() function.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Acked-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Tested-by: default avatarKim Phillips <kim.phillips@amd.com>
Link: https://lore.kernel.org/r/7a183a8beedf4ee26c42001160e073a884fe466e.1742477213.git.thomas.lendacky@amd.com


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

arch/x86/kvm/svm/svm.c

+7 −2
Original line number Diff line number Diff line
@@ -3397,14 +3397,19 @@ static void dump_vmcb(struct kvm_vcpu *vcpu) 
	struct vmcb_control_area *control = &svm->vmcb->control;

	struct vmcb_save_area *save = &svm->vmcb->save;

	struct vmcb_save_area *save01 = &svm->vmcb01.ptr->save;

	char *vm_type;



	if (!dump_invalid_vmcb) {

		pr_warn_ratelimited("set kvm_amd.dump_invalid_vmcb=1 to dump internal KVM state.\n");

		return;

	}



	pr_err("VMCB %p, last attempted VMRUN on CPU %d\n",

	       svm->current_vmcb->ptr, vcpu->arch.last_vmentry_cpu);

	vm_type = sev_snp_guest(vcpu->kvm) ? "SEV-SNP" :

		  sev_es_guest(vcpu->kvm) ? "SEV-ES" :

		  sev_guest(vcpu->kvm) ? "SEV" : "SVM";



	pr_err("%s VMCB %p, last attempted VMRUN on CPU %d\n",

	       vm_type, svm->current_vmcb->ptr, vcpu->arch.last_vmentry_cpu);

	pr_err("VMCB Control Area:\n");

	pr_err("%-20s%04x\n", "cr_read:", control->intercepts[INTERCEPT_CR] & 0xffff);

	pr_err("%-20s%04x\n", "cr_write:", control->intercepts[INTERCEPT_CR] >> 16);