KVM: x86: Query vcpu->vcpu_idx directly and drop its accessor, again
Subsystems (4)
Sean Christopherson
maintainerPATCH 1/1 KVM: x86: Query vcpu->vcpu_idx directly and drop its accessor, again
Read vcpu->vcpu_idx directly instead of bouncing through the one-line wrapper, kvm_vcpu_get_idx(), and drop the wrapper. The wrapper is a remnant of the original implementation and serves no purpose; remove it (again) before it gains more users.
kvm_vcpu_get_idx() was removed in the not-too-distant past by commit 4eeef2424153 ("KVM: x86: Query vcpu->vcpu_idx directly and drop its accessor"), but was unintentionally re-introduced by commit a54d806688fe ("KVM: Keep memslots in tree-based structures instead of array-based ones"), likely due to a rebase goof. The wrapper then managed to gain users in KVM's Xen code.
No functional change intended.
--- arch/x86/kvm/xen.c | 10 +++++----- include/linux/kvm_host.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-)
arch/x86/kvm/xen.c +5 -5
@@ -1049,7 +1049,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,else vcpu->arch.xen.poll_evtchn =-1 ; -set_bit (kvm_vcpu_get_idx (vcpu), vcpu->kvm->arch.xen.poll_mask); +set_bit (vcpu->vcpu_idx, vcpu->kvm->arch.xen.poll_mask);if (!wait_pending_event (vcpu, sched_poll.nr_ports, ports)) { vcpu->arch.mp_state =KVM_MP_STATE_HALTED ;
@@ -1071,7 +1071,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode, *r =0 ; out:/* Really, this is only needed in case of timeout */ -clear_bit (kvm_vcpu_get_idx (vcpu), vcpu->kvm->arch.xen.poll_mask); +clear_bit (vcpu->vcpu_idx, vcpu->kvm->arch.xen.poll_mask);if (unlikely (sched_poll.nr_ports >1 ))kfree (ports);
@@ -1311,7 +1311,7 @@ static void kvm_xen_check_poller(struct kvm_vcpu *vcpu, int port)int poll_evtchn = vcpu->arch.xen.poll_evtchn;if ((poll_evtchn == port || poll_evtchn ==-1 ) && -test_and_clear_bit (kvm_vcpu_get_idx (vcpu), vcpu->kvm->arch.xen.poll_mask)) { +test_and_clear_bit (vcpu->vcpu_idx, vcpu->kvm->arch.xen.poll_mask)) {kvm_make_request (KVM_REQ_UNBLOCK , vcpu);kvm_vcpu_kick (vcpu); }
@@ -1344,7 +1344,7 @@ int kvm_xen_set_evtchn_fast(struct kvm_xen_evtchn *xe, struct kvm *kvm) vcpu =kvm_get_vcpu_by_id (kvm, xe->vcpu_id);if (!vcpu)return -EINVAL ; -WRITE_ONCE (xe->vcpu_idx,kvm_vcpu_get_idx (vcpu)); +WRITE_ONCE (xe->vcpu_idx, vcpu->vcpu_idx); }if (!vcpu->arch.xen.vcpu_info_cache.active)
@@ -1540,7 +1540,7 @@ int kvm_xen_setup_evtchn(struct kvm *kvm,*/ vcpu =kvm_get_vcpu_by_id (kvm, ue->u.xen_evtchn.vcpu);if (vcpu) - e->xen_evtchn.vcpu_idx =kvm_vcpu_get_idx (vcpu); + e->xen_evtchn.vcpu_idx = vcpu->vcpu_idx;else e->xen_evtchn.vcpu_idx =-1 ;
include/linux/kvm_host.h +0 -5
@@ -907,11 +907,6 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)return NULL ; } -static inline int kvm_vcpu_get_idx (struct kvm_vcpu *vcpu) -{ -return vcpu->vcpu_idx; -} -void kvm_destroy_vcpus (struct kvm *kvm);void vcpu_load (struct kvm_vcpu *vcpu);
base-commit: 8baacf67c76c560fed954ac972b63e6e59a6fba0
Signature · 1 line
2.36.1.476.g0c4daa206d-goog
Quoted 13 lines · Sean Christopherson
Read
vcpu->vcpu_idxdirectly instead of bouncing through the one-line wrapper,kvm_vcpu_get_idx(), and drop the wrapper. The wrapper is a remnant of the original implementation and serves no purpose; remove it (again) before it gains more users.
kvm_vcpu_get_idx()was removed in the not-too-distant past by commit4eeef2424153("KVM: x86: Queryvcpu->vcpu_idxdirectly and drop its accessor"), but was unintentionally re-introduced by commita54d806688fe("KVM: Keep memslots in tree-based structures instead of array-based ones"), likely due to a rebase goof. The wrapper then managed to gain users in KVM's Xen code.
Quoted 3 lines
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
ROFL