From: Christian Borntraeger <borntraeger@de.ibm.com> To: Paolo Bonzini <pbonzini@redhat.com>, Alexander Graf <agraf@suse.de>, Paul Mackerras <paulus@samba.org>, David Hildenbrand <dahi@linux.vnet.ibm.com> Cc: KVM <kvm@vger.kernel.org>, Cornelia Huck <cornelia.huck@de.ibm.com>, Jens Freimann <jfrei@linux.vnet.ibm.com>, linux-s390 <linux-s390@vger.kernel.org>, kvm-ppc@vger.kernel.org, Christian Borntraeger <borntraeger@de.ibm.com> Subject: [PATCH 4/4] KVM: Use common function for VCPU lookup by id Date: Thu, 19 Nov 2015 09:37:31 +0100 [thread overview] Message-ID: <1447922251-54261-5-git-send-email-borntraeger@de.ibm.com> (raw) In-Reply-To: <1447922251-54261-1-git-send-email-borntraeger@de.ibm.com> From: David Hildenbrand <dahi@linux.vnet.ibm.com> Let's reuse the new common function for VPCU lookup by id. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [split out the new function into a separate patch] --- arch/powerpc/kvm/book3s_hv.c | 10 ++-------- arch/s390/kvm/diag.c | 11 +++-------- virt/kvm/kvm_main.c | 12 +++++------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 54b45b7..904b3b0 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -308,16 +308,10 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu) static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id) { - int r; - struct kvm_vcpu *v, *ret = NULL; + struct kvm_vcpu *ret; mutex_lock(&kvm->lock); - kvm_for_each_vcpu(r, v, kvm) { - if (v->vcpu_id == id) { - ret = v; - break; - } - } + ret = kvm_lookup_vcpu(kvm, id); mutex_unlock(&kvm->lock); return ret; } diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index 5fbfb88..aaa7cc0 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -155,10 +155,8 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) { - struct kvm *kvm = vcpu->kvm; struct kvm_vcpu *tcpu; int tid; - int i; tid = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4]; vcpu->stat.diagnose_9c++; @@ -167,12 +165,9 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) if (tid == vcpu->vcpu_id) return 0; - kvm_for_each_vcpu(i, tcpu, kvm) - if (tcpu->vcpu_id == tid) { - kvm_vcpu_yield_to(tcpu); - break; - } - + tcpu = kvm_lookup_vcpu(vcpu->kvm, tid); + if (tcpu) + kvm_vcpu_yield_to(tcpu); return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 484079e..244c9b4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2257,7 +2257,7 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu) static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) { int r; - struct kvm_vcpu *vcpu, *v; + struct kvm_vcpu *vcpu; if (id >= KVM_MAX_VCPUS) return -EINVAL; @@ -2281,12 +2281,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) r = -EINVAL; goto unlock_vcpu_destroy; } - - kvm_for_each_vcpu(r, v, kvm) - if (v->vcpu_id == id) { - r = -EEXIST; - goto unlock_vcpu_destroy; - } + if (kvm_lookup_vcpu(kvm, id)) { + r = -EEXIST; + goto unlock_vcpu_destroy; + } BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]); -- 2.3.0
WARNING: multiple messages have this Message-ID (diff)
From: Christian Borntraeger <borntraeger@de.ibm.com> To: Paolo Bonzini <pbonzini@redhat.com>, Alexander Graf <agraf@suse.de>, Paul Mackerras <paulus@samba.org>, David Hildenbrand <dahi@linux.vnet.ibm.com> Cc: KVM <kvm@vger.kernel.org>, Cornelia Huck <cornelia.huck@de.ibm.com>, Jens Freimann <jfrei@linux.vnet.ibm.com>, linux-s390 <linux-s390@vger.kernel.org>, kvm-ppc@vger.kernel.org, Christian Borntraeger <borntraeger@de.ibm.com> Subject: [PATCH 4/4] KVM: Use common function for VCPU lookup by id Date: Thu, 19 Nov 2015 08:37:31 +0000 [thread overview] Message-ID: <1447922251-54261-5-git-send-email-borntraeger@de.ibm.com> (raw) In-Reply-To: <1447922251-54261-1-git-send-email-borntraeger@de.ibm.com> From: David Hildenbrand <dahi@linux.vnet.ibm.com> Let's reuse the new common function for VPCU lookup by id. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [split out the new function into a separate patch] --- arch/powerpc/kvm/book3s_hv.c | 10 ++-------- arch/s390/kvm/diag.c | 11 +++-------- virt/kvm/kvm_main.c | 12 +++++------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 54b45b7..904b3b0 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -308,16 +308,10 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu) static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id) { - int r; - struct kvm_vcpu *v, *ret = NULL; + struct kvm_vcpu *ret; mutex_lock(&kvm->lock); - kvm_for_each_vcpu(r, v, kvm) { - if (v->vcpu_id = id) { - ret = v; - break; - } - } + ret = kvm_lookup_vcpu(kvm, id); mutex_unlock(&kvm->lock); return ret; } diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index 5fbfb88..aaa7cc0 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -155,10 +155,8 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) { - struct kvm *kvm = vcpu->kvm; struct kvm_vcpu *tcpu; int tid; - int i; tid = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4]; vcpu->stat.diagnose_9c++; @@ -167,12 +165,9 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) if (tid = vcpu->vcpu_id) return 0; - kvm_for_each_vcpu(i, tcpu, kvm) - if (tcpu->vcpu_id = tid) { - kvm_vcpu_yield_to(tcpu); - break; - } - + tcpu = kvm_lookup_vcpu(vcpu->kvm, tid); + if (tcpu) + kvm_vcpu_yield_to(tcpu); return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 484079e..244c9b4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2257,7 +2257,7 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu) static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) { int r; - struct kvm_vcpu *vcpu, *v; + struct kvm_vcpu *vcpu; if (id >= KVM_MAX_VCPUS) return -EINVAL; @@ -2281,12 +2281,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) r = -EINVAL; goto unlock_vcpu_destroy; } - - kvm_for_each_vcpu(r, v, kvm) - if (v->vcpu_id = id) { - r = -EEXIST; - goto unlock_vcpu_destroy; - } + if (kvm_lookup_vcpu(kvm, id)) { + r = -EEXIST; + goto unlock_vcpu_destroy; + } BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]); -- 2.3.0
next prev parent reply other threads:[~2015-11-19 8:37 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-19 8:37 [PATCH 0/4] Preview: vcpu lookup by id changes Christian Borntraeger 2015-11-19 8:37 ` Christian Borntraeger 2015-11-19 8:37 ` [PATCH 1/4] KVM: Provide function for VCPU lookup by id Christian Borntraeger 2015-11-19 8:37 ` Christian Borntraeger 2015-11-19 12:11 ` Thomas Huth 2015-11-19 12:11 ` Thomas Huth 2015-11-19 12:55 ` David Hildenbrand 2015-11-19 12:55 ` David Hildenbrand 2015-11-19 13:13 ` Paolo Bonzini 2015-11-19 13:13 ` Paolo Bonzini 2015-11-19 13:23 ` Christian Borntraeger 2015-11-19 13:23 ` Christian Borntraeger 2015-11-19 13:36 ` David Hildenbrand 2015-11-19 13:36 ` David Hildenbrand 2015-11-19 8:37 ` [PATCH 2/4] KVM: s390: fix wrong lookup of VCPUs by array index Christian Borntraeger 2015-11-19 8:37 ` Christian Borntraeger 2015-11-19 8:52 ` Christian Borntraeger 2015-11-19 8:52 ` Christian Borntraeger 2015-11-19 8:37 ` [PATCH 3/4] KVM: use heuristic for fast VCPU lookup by id Christian Borntraeger 2015-11-19 8:37 ` Christian Borntraeger 2015-11-19 8:37 ` Christian Borntraeger [this message] 2015-11-19 8:37 ` [PATCH 4/4] KVM: Use common function for " Christian Borntraeger 2015-11-19 9:38 ` [PATCH 0/4] Preview: vcpu lookup by id changes Paolo Bonzini 2015-11-19 9:38 ` Paolo Bonzini 2015-11-19 9:51 ` Christian Borntraeger 2015-11-19 9:51 ` Christian Borntraeger 2015-11-19 9:52 ` Paolo Bonzini 2015-11-19 9:52 ` Paolo Bonzini
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1447922251-54261-5-git-send-email-borntraeger@de.ibm.com \ --to=borntraeger@de.ibm.com \ --cc=agraf@suse.de \ --cc=cornelia.huck@de.ibm.com \ --cc=dahi@linux.vnet.ibm.com \ --cc=jfrei@linux.vnet.ibm.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=paulus@samba.org \ --cc=pbonzini@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.