Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932675AbdHVLoT (ORCPT ); Tue, 22 Aug 2017 07:44:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34492 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932575AbdHVLoR (ORCPT ); Tue, 22 Aug 2017 07:44:17 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 76F0D404331 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com Subject: Re: [PATCH RFC v3 3/9] KVM: remember position in kvm->vcpus array To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mips@linux-mips.org, kvm-ppc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Paolo Bonzini , Christoffer Dall , Marc Zyngier , Christian Borntraeger , Cornelia Huck , James Hogan , Paul Mackerras , Alexander Graf References: <20170821203530.9266-1-rkrcmar@redhat.com> <20170821203530.9266-4-rkrcmar@redhat.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <29ad4696-f106-031e-c9b9-b10b4f4c8107@redhat.com> Date: Tue, 22 Aug 2017 13:44:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170821203530.9266-4-rkrcmar@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 22 Aug 2017 11:44:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1702 Lines: 61 On 21.08.2017 22:35, Radim Krčmář wrote: > Signed-off-by: Radim Krčmář > --- > include/linux/kvm_host.h | 11 +++-------- > virt/kvm/kvm_main.c | 5 ++++- > 2 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 6882538eda32..a8ff956616d2 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -220,7 +220,8 @@ struct kvm_vcpu { > struct preempt_notifier preempt_notifier; > #endif > int cpu; > - int vcpu_id; > + int vcpu_id; /* id given by userspace at creation */ > + int vcpus_idx; /* index in kvm->vcpus array */ > int srcu_idx; > int mode; > unsigned long requests; > @@ -516,13 +517,7 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id) > > static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu) > { > - struct kvm_vcpu *tmp; > - int idx; > - > - kvm_for_each_vcpu(idx, tmp, vcpu->kvm) > - if (tmp == vcpu) > - return idx; > - BUG(); > + return vcpu->vcpus_idx; > } > > #define kvm_for_each_memslot(memslot, slots) \ > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index e17c40d986f3..caf8323f7df7 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2498,7 +2498,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) > goto unlock_vcpu_destroy; > } > > - BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]); > + vcpu->vcpus_idx = atomic_read(&kvm->online_vcpus); > + > + BUG_ON(kvm->vcpus[vcpu->vcpus_idx]); > + > > /* Now it's all set up, let userspace reach it */ > kvm_get_kvm(kvm); > Reviewed-by: David Hildenbrand -- Thanks, David