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

KVM: SEV: Fold sev_es_vcpu_reset() into sev_vcpu_create() 



Fold the remaining line of sev_es_vcpu_reset() into sev_vcpu_create() as
there's no need for a dedicated RESET hook just to init a mutex, and the
mutex should be initialized as early as possible anyways.

No functional change intended.

Reviewed-by: default avatarNikunj A Dadhania <nikunj@amd.com>
Link: https://lore.kernel.org/r/20250819234833.3080255-8-seanjc@google.com


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

arch/x86/kvm/svm/sev.c

+2 −5
Original line number Diff line number Diff line
@@ -4577,6 +4577,8 @@ int sev_vcpu_create(struct kvm_vcpu *vcpu) 
	struct vcpu_svm *svm = to_svm(vcpu);

	struct page *vmsa_page;



	mutex_init(&svm->sev_es.snp_vmsa_mutex);



	if (!sev_es_guest(vcpu->kvm))

		return 0;
@@ -4592,11 +4594,6 @@ int sev_vcpu_create(struct kvm_vcpu *vcpu) 
	return 0;

}



void sev_es_vcpu_reset(struct vcpu_svm *svm)

{

	mutex_init(&svm->sev_es.snp_vmsa_mutex);

}



void sev_es_prepare_switch_to_guest(struct vcpu_svm *svm, struct sev_es_save_area *hostsa)

{

	struct kvm *kvm = svm->vcpu.kvm;

arch/x86/kvm/svm/svm.c

+0 −3
Original line number Diff line number Diff line
@@ -1244,9 +1244,6 @@ static void __svm_vcpu_reset(struct kvm_vcpu *vcpu) 


	svm->nmi_masked = false;

	svm->awaiting_iret_completion = false;



	if (sev_es_guest(vcpu->kvm))

		sev_es_vcpu_reset(svm);

}



static void svm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)

arch/x86/kvm/svm/svm.h

+0 −1
Original line number Diff line number Diff line
@@ -829,7 +829,6 @@ int pre_sev_run(struct vcpu_svm *svm, int cpu); 
void sev_init_vmcb(struct vcpu_svm *svm, bool init_event);

void sev_vcpu_after_set_cpuid(struct vcpu_svm *svm);

int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in);

void sev_es_vcpu_reset(struct vcpu_svm *svm);

void sev_es_recalc_msr_intercepts(struct kvm_vcpu *vcpu);

void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector);

void sev_es_prepare_switch_to_guest(struct vcpu_svm *svm, struct sev_es_save_area *hostsa);