Skip to content

Commit 51d8b66

Browse files
aprzywaravikivity
aprzywar
authored and
avikivity
committed
KVM: cleanup emulate_instruction
emulate_instruction had many callers, but only one used all parameters. One parameter was unused, another one is now hidden by a wrapper function (required for a future addition anyway), so most callers use now a shorter parameter list. Signed-off-by: Andre Przywara <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]>
1 parent db8fcef commit 51d8b66

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

‎arch/x86/include/asm/kvm_host.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,15 @@ enum emulation_result {
634634
#define EMULTYPE_NO_DECODE (1 << 0)
635635
#define EMULTYPE_TRAP_UD (1 << 1)
636636
#define EMULTYPE_SKIP (1 << 2)
637-
int emulate_instruction(struct kvm_vcpu *vcpu,
638-
unsigned long cr2, u16 error_code, int emulation_type);
637+
int x86_emulate_instruction(struct kvm_vcpu *vcpu,
638+
unsigned long cr2, int emulation_type);
639+
640+
static inline int emulate_instruction(struct kvm_vcpu *vcpu,
641+
int emulation_type)
642+
{
643+
return x86_emulate_instruction(vcpu, 0, emulation_type);
644+
}
645+
639646
void realmode_lgdt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
640647
void realmode_lidt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
641648

‎arch/x86/kvm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3348,7 +3348,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code)
33483348
if (r)
33493349
goto out;
33503350

3351-
er = emulate_instruction(vcpu, cr2, error_code, 0);
3351+
er = x86_emulate_instruction(vcpu, cr2, 0);
33523352

33533353
switch (er) {
33543354
case EMULATE_DONE:

‎arch/x86/kvm/svm.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu)
475475
svm->next_rip = svm->vmcb->control.next_rip;
476476

477477
if (!svm->next_rip) {
478-
if (emulate_instruction(vcpu, 0, 0, EMULTYPE_SKIP) !=
478+
if (emulate_instruction(vcpu, EMULTYPE_SKIP) !=
479479
EMULATE_DONE)
480480
printk(KERN_DEBUG "%s: NOP\n", __func__);
481481
return;
@@ -1586,7 +1586,7 @@ static int ud_interception(struct vcpu_svm *svm)
15861586
{
15871587
int er;
15881588

1589-
er = emulate_instruction(&svm->vcpu, 0, 0, EMULTYPE_TRAP_UD);
1589+
er = emulate_instruction(&svm->vcpu, EMULTYPE_TRAP_UD);
15901590
if (er != EMULATE_DONE)
15911591
kvm_queue_exception(&svm->vcpu, UD_VECTOR);
15921592
return 1;
@@ -1703,7 +1703,7 @@ static int io_interception(struct vcpu_svm *svm)
17031703
string = (io_info & SVM_IOIO_STR_MASK) != 0;
17041704
in = (io_info & SVM_IOIO_TYPE_MASK) != 0;
17051705
if (string || in)
1706-
return emulate_instruction(vcpu, 0, 0, 0) == EMULATE_DONE;
1706+
return emulate_instruction(vcpu, 0) == EMULATE_DONE;
17071707

17081708
port = io_info >> 16;
17091709
size = (io_info & SVM_IOIO_SIZE_MASK) >> SVM_IOIO_SIZE_SHIFT;
@@ -2648,20 +2648,20 @@ static int iret_interception(struct vcpu_svm *svm)
26482648

26492649
static int invlpg_interception(struct vcpu_svm *svm)
26502650
{
2651-
return emulate_instruction(&svm->vcpu, 0, 0, 0) == EMULATE_DONE;
2651+
return emulate_instruction(&svm->vcpu, 0) == EMULATE_DONE;
26522652
}
26532653

26542654
static int emulate_on_interception(struct vcpu_svm *svm)
26552655
{
2656-
return emulate_instruction(&svm->vcpu, 0, 0, 0) == EMULATE_DONE;
2656+
return emulate_instruction(&svm->vcpu, 0) == EMULATE_DONE;
26572657
}
26582658

26592659
static int cr0_write_interception(struct vcpu_svm *svm)
26602660
{
26612661
struct kvm_vcpu *vcpu = &svm->vcpu;
26622662
int r;
26632663

2664-
r = emulate_instruction(&svm->vcpu, 0, 0, 0);
2664+
r = emulate_instruction(&svm->vcpu, 0);
26652665

26662666
if (svm->nested.vmexit_rip) {
26672667
kvm_register_write(vcpu, VCPU_REGS_RIP, svm->nested.vmexit_rip);
@@ -2680,7 +2680,7 @@ static int cr8_write_interception(struct vcpu_svm *svm)
26802680

26812681
u8 cr8_prev = kvm_get_cr8(&svm->vcpu);
26822682
/* instruction emulation calls kvm_set_cr8() */
2683-
r = emulate_instruction(&svm->vcpu, 0, 0, 0);
2683+
r = emulate_instruction(&svm->vcpu, 0);
26842684
if (irqchip_in_kernel(svm->vcpu.kvm)) {
26852685
clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);
26862686
return r == EMULATE_DONE;

‎arch/x86/kvm/vmx.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2939,7 +2939,7 @@ static int handle_rmode_exception(struct kvm_vcpu *vcpu,
29392939
* Cause the #SS fault with 0 error code in VM86 mode.
29402940
*/
29412941
if (((vec == GP_VECTOR) || (vec == SS_VECTOR)) && err_code == 0)
2942-
if (emulate_instruction(vcpu, 0, 0, 0) == EMULATE_DONE)
2942+
if (emulate_instruction(vcpu, 0) == EMULATE_DONE)
29432943
return 1;
29442944
/*
29452945
* Forward all other exceptions that are valid in real mode.
@@ -3036,7 +3036,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
30363036
}
30373037

30383038
if (is_invalid_opcode(intr_info)) {
3039-
er = emulate_instruction(vcpu, 0, 0, EMULTYPE_TRAP_UD);
3039+
er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
30403040
if (er != EMULATE_DONE)
30413041
kvm_queue_exception(vcpu, UD_VECTOR);
30423042
return 1;
@@ -3127,7 +3127,7 @@ static int handle_io(struct kvm_vcpu *vcpu)
31273127
++vcpu->stat.io_exits;
31283128

31293129
if (string || in)
3130-
return emulate_instruction(vcpu, 0, 0, 0) == EMULATE_DONE;
3130+
return emulate_instruction(vcpu, 0) == EMULATE_DONE;
31313131

31323132
port = exit_qualification >> 16;
31333133
size = (exit_qualification & 7) + 1;
@@ -3372,7 +3372,7 @@ static int handle_vmx_insn(struct kvm_vcpu *vcpu)
33723372

33733373
static int handle_invd(struct kvm_vcpu *vcpu)
33743374
{
3375-
return emulate_instruction(vcpu, 0, 0, 0) == EMULATE_DONE;
3375+
return emulate_instruction(vcpu, 0) == EMULATE_DONE;
33763376
}
33773377

33783378
static int handle_invlpg(struct kvm_vcpu *vcpu)
@@ -3403,7 +3403,7 @@ static int handle_xsetbv(struct kvm_vcpu *vcpu)
34033403

34043404
static int handle_apic_access(struct kvm_vcpu *vcpu)
34053405
{
3406-
return emulate_instruction(vcpu, 0, 0, 0) == EMULATE_DONE;
3406+
return emulate_instruction(vcpu, 0) == EMULATE_DONE;
34073407
}
34083408

34093409
static int handle_task_switch(struct kvm_vcpu *vcpu)
@@ -3618,7 +3618,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
36183618
&& (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
36193619
return handle_interrupt_window(&vmx->vcpu);
36203620

3621-
err = emulate_instruction(vcpu, 0, 0, 0);
3621+
err = emulate_instruction(vcpu, 0);
36223622

36233623
if (err == EMULATE_DO_MMIO) {
36243624
ret = 0;

‎arch/x86/kvm/x86.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4363,10 +4363,9 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)
43634363
return false;
43644364
}
43654365

4366-
int emulate_instruction(struct kvm_vcpu *vcpu,
4367-
unsigned long cr2,
4368-
u16 error_code,
4369-
int emulation_type)
4366+
int x86_emulate_instruction(struct kvm_vcpu *vcpu,
4367+
unsigned long cr2,
4368+
int emulation_type)
43704369
{
43714370
int r;
43724371
struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;
@@ -4474,7 +4473,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
44744473

44754474
return r;
44764475
}
4477-
EXPORT_SYMBOL_GPL(emulate_instruction);
4476+
EXPORT_SYMBOL_GPL(x86_emulate_instruction);
44784477

44794478
int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port)
44804479
{
@@ -5398,7 +5397,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
53985397
vcpu->mmio_needed = 0;
53995398
}
54005399
vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
5401-
r = emulate_instruction(vcpu, 0, 0, EMULTYPE_NO_DECODE);
5400+
r = emulate_instruction(vcpu, EMULTYPE_NO_DECODE);
54025401
srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
54035402
if (r != EMULATE_DONE) {
54045403
r = 0;

0 commit comments

Comments
 (0)