Commit ecc513e5 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Drop "pre_" from enter/leave_smm() helpers 



Now that .post_leave_smm() is gone, drop "pre_" from the remaining
helpers.  The helpers aren't invoked purely before SMI/RSM processing,
e.g. both helpers are invoked after state is snapshotted (from regs or
SMRAM), and the RSM helper is invoked after some amount of register state
has been stuffed.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210609185619.992058-10-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 01281165

arch/x86/include/asm/kvm-x86-ops.h

+2 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ KVM_X86_OP_NULL(set_hv_timer) 
KVM_X86_OP_NULL(cancel_hv_timer)

KVM_X86_OP(setup_mce)

KVM_X86_OP(smi_allowed)

KVM_X86_OP(pre_enter_smm)

KVM_X86_OP(pre_leave_smm)

KVM_X86_OP(enter_smm)

KVM_X86_OP(leave_smm)

KVM_X86_OP(enable_smi_window)

KVM_X86_OP_NULL(mem_enc_op)

KVM_X86_OP_NULL(mem_enc_reg_region)

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -1372,8 +1372,8 @@ struct kvm_x86_ops { 
	void (*setup_mce)(struct kvm_vcpu *vcpu);



	int (*smi_allowed)(struct kvm_vcpu *vcpu, bool for_injection);

	int (*pre_enter_smm)(struct kvm_vcpu *vcpu, char *smstate);

	int (*pre_leave_smm)(struct kvm_vcpu *vcpu, const char *smstate);

	int (*enter_smm)(struct kvm_vcpu *vcpu, char *smstate);

	int (*leave_smm)(struct kvm_vcpu *vcpu, const char *smstate);

	void (*enable_smi_window)(struct kvm_vcpu *vcpu);



	int (*mem_enc_op)(struct kvm *kvm, void __user *argp);

arch/x86/kvm/emulate.c

+3 −3
Original line number Diff line number Diff line
@@ -2574,11 +2574,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) 
	}



	/*

	 * Give pre_leave_smm() a chance to make ISA-specific changes to the

	 * vCPU state (e.g. enter guest mode) before loading state from the SMM

	 * Give leave_smm() a chance to make ISA-specific changes to the vCPU

	 * state (e.g. enter guest mode) before loading state from the SMM

	 * state-save area.

	 */

	if (ctxt->ops->pre_leave_smm(ctxt, buf))

	if (ctxt->ops->leave_smm(ctxt, buf))

		goto emulate_shutdown;



#ifdef CONFIG_X86_64

arch/x86/kvm/kvm_emulate.h

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ struct x86_emulate_ops { 


	unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);

	void (*exiting_smm)(struct x86_emulate_ctxt *ctxt);

	int (*pre_leave_smm)(struct x86_emulate_ctxt *ctxt,

			     const char *smstate);

	int (*leave_smm)(struct x86_emulate_ctxt *ctxt, const char *smstate);

	void (*triple_fault)(struct x86_emulate_ctxt *ctxt);

	int (*set_xcr)(struct x86_emulate_ctxt *ctxt, u32 index, u64 xcr);

};

arch/x86/kvm/svm/svm.c

+4 −4
Original line number Diff line number Diff line
@@ -4258,7 +4258,7 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) 
	return !svm_smi_blocked(vcpu);

}



static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)

static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate)

{

	struct vcpu_svm *svm = to_svm(vcpu);

	int ret;
@@ -4280,7 +4280,7 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate) 
	return 0;

}



static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)

static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)

{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct kvm_host_map map;
@@ -4555,8 +4555,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.setup_mce = svm_setup_mce,



	.smi_allowed = svm_smi_allowed,

	.pre_enter_smm = svm_pre_enter_smm,

	.pre_leave_smm = svm_pre_leave_smm,

	.enter_smm = svm_enter_smm,

	.leave_smm = svm_leave_smm,

	.enable_smi_window = svm_enable_smi_window,



	.mem_enc_op = svm_mem_enc_op,