Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b9e3fc4 authored by Greg Kurz's avatar Greg Kurz Committed by Paolo Bonzini
Browse files

KVM: remove NULL return path for vcpu ids >= KVM_MAX_VCPUS 



Commit c896939f ("KVM: use heuristic for fast VCPU lookup by id") added
a return path that prevents vcpu ids to exceed KVM_MAX_VCPUS. This is a
problem for powerpc where vcpu ids can grow up to 8*KVM_MAX_VCPUS.

This patch simply reverses the logic so that we only try fast path if the
vcpu id can be tried as an index in kvm->vcpus[]. The slow path is not
affected by the change.

Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bdb4094e

include/linux/kvm_host.h

+4 −3
Original line number Diff line number Diff line
@@ -447,11 +447,12 @@ static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i) 


static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)

{

	struct kvm_vcpu *vcpu;

	struct kvm_vcpu *vcpu = NULL;

	int i;



	if (id < 0 || id >= KVM_MAX_VCPUS)

	if (id < 0)

		return NULL;

	if (id < KVM_MAX_VCPUS)

		vcpu = kvm_get_vcpu(kvm, id);

	if (vcpu && vcpu->vcpu_id == id)

		return vcpu;