Commit 9aabc88f authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: store x86_emulate_ops in emulation context 



It doesn't ever change, so we don't need to pass it around everywhere.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent ab85b12b

arch/x86/include/asm/kvm_emulate.h

+4 −5
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ struct decode_cache { 
};



struct x86_emulate_ctxt {

	struct x86_emulate_ops *ops;



	/* Register state before/after emulation. */

	struct kvm_vcpu *vcpu;
@@ -249,12 +251,9 @@ struct x86_emulate_ctxt { 
#define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64

#endif



int x86_decode_insn(struct x86_emulate_ctxt *ctxt,

		    struct x86_emulate_ops *ops);

int x86_emulate_insn(struct x86_emulate_ctxt *ctxt,

		     struct x86_emulate_ops *ops);

int x86_decode_insn(struct x86_emulate_ctxt *ctxt);

int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);

int emulator_task_switch(struct x86_emulate_ctxt *ctxt,

			 struct x86_emulate_ops *ops,

			 u16 tss_selector, int reason,

			 bool has_error_code, u32 error_code);

arch/x86/kvm/emulate.c

+5 −3
Original line number Diff line number Diff line
@@ -943,8 +943,9 @@ done: 
}



int

x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)

x86_decode_insn(struct x86_emulate_ctxt *ctxt)

{

	struct x86_emulate_ops *ops = ctxt->ops;

	struct decode_cache *c = &ctxt->decode;

	int rc = X86EMUL_CONTINUE;

	int mode = ctxt->mode;
@@ -2586,10 +2587,10 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, 
}



int emulator_task_switch(struct x86_emulate_ctxt *ctxt,

			 struct x86_emulate_ops *ops,

			 u16 tss_selector, int reason,

			 bool has_error_code, u32 error_code)

{

	struct x86_emulate_ops *ops = ctxt->ops;

	struct decode_cache *c = &ctxt->decode;

	int rc;
@@ -2619,8 +2620,9 @@ static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned long base, 
}



int

x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)

x86_emulate_insn(struct x86_emulate_ctxt *ctxt)

{

	struct x86_emulate_ops *ops = ctxt->ops;

	u64 msr_data;

	struct decode_cache *c = &ctxt->decode;

	int rc = X86EMUL_CONTINUE;

arch/x86/kvm/x86.c

+4 −3
Original line number Diff line number Diff line
@@ -3998,7 +3998,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 
		vcpu->arch.emulate_ctxt.interruptibility = 0;

		vcpu->arch.emulate_ctxt.exception = -1;



		r = x86_decode_insn(&vcpu->arch.emulate_ctxt, &emulate_ops);

		r = x86_decode_insn(&vcpu->arch.emulate_ctxt);

		trace_kvm_emulate_insn_start(vcpu);



		/* Only allow emulation of specific instructions on #UD
@@ -4048,7 +4048,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 
	memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);



restart:

	r = x86_emulate_insn(&vcpu->arch.emulate_ctxt, &emulate_ops);

	r = x86_emulate_insn(&vcpu->arch.emulate_ctxt);



	if (r) { /* emulation failed */

		if (reexecute_instruction(vcpu, cr2))
@@ -5067,7 +5067,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, 
	memset(c, 0, sizeof(struct decode_cache));

	memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);



	ret = emulator_task_switch(&vcpu->arch.emulate_ctxt, &emulate_ops,

	ret = emulator_task_switch(&vcpu->arch.emulate_ctxt,

				   tss_selector, reason, has_error_code,

				   error_code);
@@ -5424,6 +5424,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	BUG_ON(vcpu->kvm == NULL);

	kvm = vcpu->kvm;



	vcpu->arch.emulate_ctxt.ops = &emulate_ops;

	vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE