x86: Drop unused evaluations from IO handlers
PATCH 1/1 x86: Drop unused evaluations from IO handlers
Looks like neither the direction nor the rep prefix are used anymore. Drop related evaluations from SVM's and VMX's I/O exit handlers.
---
arch/x86/kvm/svm.c | 4 +--- arch/x86/kvm/vmx.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
arch/x86/kvm/svm.c +1 -3
@@ -1194,7 +1194,7 @@ static int shutdown_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)static int io_interception (struct vcpu_svm *svm,struct kvm_run *kvm_run) {u32 io_info = svm->vmcb->control.exit_info_1;/* address size bug? */ -int size, down, in, string, rep; +int size, in, string;unsigned port; ++svm->vcpu.stat.io_exits;
@@ -1213,8 +1213,6 @@ static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) in = (io_info &SVM_IOIO_TYPE_MASK ) !=0 ; port = io_info >>16 ; size = (io_info &SVM_IOIO_SIZE_MASK ) >>SVM_IOIO_SIZE_SHIFT ; - rep = (io_info &SVM_IOIO_REP_MASK ) !=0 ; - down = (svm->vmcb->save.rflags &X86_EFLAGS_DF ) !=0 ;skip_emulated_instruction (&svm->vcpu);return kvm_emulate_pio (&svm->vcpu, kvm_run, in, size, port);
arch/x86/kvm/vmx.c +1 -3
@@ -2697,7 +2697,7 @@ static int handle_triple_fault(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)static int handle_io (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) {unsigned long exit_qualification; -int size, down, in, string, rep; +int size, in, string;unsigned port; ++vcpu->stat.io_exits;
@@ -2713,8 +2713,6 @@ static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) size = (exit_qualification &7 ) +1 ; in = (exit_qualification &8 ) !=0 ; - down = (vmcs_readl (GUEST_RFLAGS ) &X86_EFLAGS_DF ) !=0 ; - rep = (exit_qualification &32 ) !=0 ; port = exit_qualification >>16 ;skip_emulated_instruction (vcpu);
Quoted 2 lines · Jan Kiszka
Looks like neither the direction nor the rep prefix are used anymore.
Right, this was due to both vmx and svm not fully decoding string pio instructions.
Quoted 2 lines
Drop related evaluations from SVM's and VMX's I/O exit handlers.
Missing signoff.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 4 lines · Avi Kivity
Quoted 2 lines · Jan Kiszka
Looks like neither the direction nor the rep prefix are used anymore.
Quoted 8 lines
Right, this was due to both vmx and svm not fully decoding string pio instructions.
Quoted 2 lines
Drop related evaluations from SVM's and VMX's I/O exit handlers.
Missing signoff.
Ooops.
-------->
Looks like neither the direction nor the rep prefix are used anymore. Drop related evaluations from SVM's and VMX's I/O exit handlers.
---
arch/x86/kvm/svm.c | 4 +--- arch/x86/kvm/vmx.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
arch/x86/kvm/svm.c +1 -3
@@ -1194,7 +1194,7 @@ static int shutdown_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)static int io_interception (struct vcpu_svm *svm,struct kvm_run *kvm_run) {u32 io_info = svm->vmcb->control.exit_info_1;/* address size bug? */ -int size, down, in, string, rep; +int size, in, string;unsigned port; ++svm->vcpu.stat.io_exits;
@@ -1213,8 +1213,6 @@ static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) in = (io_info &SVM_IOIO_TYPE_MASK ) !=0 ; port = io_info >>16 ; size = (io_info &SVM_IOIO_SIZE_MASK ) >>SVM_IOIO_SIZE_SHIFT ; - rep = (io_info &SVM_IOIO_REP_MASK ) !=0 ; - down = (svm->vmcb->save.rflags &X86_EFLAGS_DF ) !=0 ;skip_emulated_instruction (&svm->vcpu);return kvm_emulate_pio (&svm->vcpu, kvm_run, in, size, port);
arch/x86/kvm/vmx.c +1 -3
@@ -2697,7 +2697,7 @@ static int handle_triple_fault(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)static int handle_io (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) {unsigned long exit_qualification; -int size, down, in, string, rep; +int size, in, string;unsigned port; ++vcpu->stat.io_exits;
@@ -2713,8 +2713,6 @@ static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) size = (exit_qualification &7 ) +1 ; in = (exit_qualification &8 ) !=0 ; - down = (vmcs_readl (GUEST_RFLAGS ) &X86_EFLAGS_DF ) !=0 ; - rep = (exit_qualification &32 ) !=0 ; port = exit_qualification >>16 ;skip_emulated_instruction (vcpu);
Avi Kivity
AppliedQuoted 4 lines · Jan Kiszka
Looks like neither the direction nor the rep prefix are used anymore. Drop related evaluations from SVM's and VMX's I/O exit handlers.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function