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

KVM: SEV: Rename kvm_ghcb_get_sw_exit_code() to kvm_get_cached_sw_exit_code() 



Rename kvm_ghcb_get_sw_exit_code() to kvm_get_cached_sw_exit_code() to make
it clear that KVM is getting the cached value, not reading directly from
the guest-controlled GHCB.  More importantly, vacating
kvm_ghcb_get_sw_exit_code() will allow adding a KVM-specific macro-built
kvm_ghcb_get_##field() helper to read values from the GHCB.

No functional change intended.

Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20250919223258.1604852-2-seanjc@google.com


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

arch/x86/kvm/svm/sev.c

+4 −4
Original line number Diff line number Diff line
@@ -3220,7 +3220,7 @@ void sev_free_vcpu(struct kvm_vcpu *vcpu) 
		kvfree(svm->sev_es.ghcb_sa);

}



static u64 kvm_ghcb_get_sw_exit_code(struct vmcb_control_area *control)

static u64 kvm_get_cached_sw_exit_code(struct vmcb_control_area *control)

{

	return (((u64)control->exit_code_hi) << 32) | control->exit_code;

}
@@ -3246,7 +3246,7 @@ static void dump_ghcb(struct vcpu_svm *svm) 
	 */

	pr_err("GHCB (GPA=%016llx) snapshot:\n", svm->vmcb->control.ghcb_gpa);

	pr_err("%-20s%016llx is_valid: %u\n", "sw_exit_code",

	       kvm_ghcb_get_sw_exit_code(control), kvm_ghcb_sw_exit_code_is_valid(svm));

	       kvm_get_cached_sw_exit_code(control), kvm_ghcb_sw_exit_code_is_valid(svm));

	pr_err("%-20s%016llx is_valid: %u\n", "sw_exit_info_1",

	       control->exit_info_1, kvm_ghcb_sw_exit_info_1_is_valid(svm));

	pr_err("%-20s%016llx is_valid: %u\n", "sw_exit_info_2",
@@ -3335,7 +3335,7 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm) 
	 * Retrieve the exit code now even though it may not be marked valid

	 * as it could help with debugging.

	 */

	exit_code = kvm_ghcb_get_sw_exit_code(control);

	exit_code = kvm_get_cached_sw_exit_code(control);



	/* Only GHCB Usage code 0 is supported */

	if (svm->sev_es.ghcb->ghcb_usage) {
@@ -4340,7 +4340,7 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) 


	svm_vmgexit_success(svm, 0);



	exit_code = kvm_ghcb_get_sw_exit_code(control);

	exit_code = kvm_get_cached_sw_exit_code(control);

	switch (exit_code) {

	case SVM_VMGEXIT_MMIO_READ:

		ret = setup_vmgexit_scratch(svm, true, control->exit_info_2);