[{"id":1812564,"web_url":"http://patchwork.ozlabs.org/comment/1812564/","msgid":"<d8bcffcc-5ffc-ed6d-1920-b3c9fb5d6c9a@redhat.com>","list_archive_url":null,"date":"2017-11-29T17:44:52","subject":"Re: [PATCH v2 10/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_translate","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 29.11.2017 17:41, Christoffer Dall wrote:\n> Move vcpu_load() and vcpu_put() into the architecture specific\n> implementations of kvm_arch_vcpu_ioctl_translate().\n> \n> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>\n> ---\n>  arch/powerpc/kvm/booke.c | 2 ++\n>  arch/x86/kvm/x86.c       | 3 +++\n>  virt/kvm/kvm_main.c      | 2 --\n>  3 files changed, 5 insertions(+), 2 deletions(-)\n> \n> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\n> index cdf0be0..1b491b8 100644\n> --- a/arch/powerpc/kvm/booke.c\n> +++ b/arch/powerpc/kvm/booke.c\n> @@ -1793,7 +1793,9 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,\n>  {\n>  \tint r;\n>  \n> +\tvcpu_load(vcpu);\n>  \tr = kvmppc_core_vcpu_translate(vcpu, tr);\n> +\tvcpu_put(vcpu);\n>  \treturn r;\n>  }\n>  \n> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\n> index ee357b6..eb70974 100644\n> --- a/arch/x86/kvm/x86.c\n> +++ b/arch/x86/kvm/x86.c\n> @@ -7661,6 +7661,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,\n>  \tgpa_t gpa;\n>  \tint idx;\n>  \n> +\tvcpu_load(vcpu);\n> +\n>  \tidx = srcu_read_lock(&vcpu->kvm->srcu);\n>  \tgpa = kvm_mmu_gva_to_gpa_system(vcpu, vaddr, NULL);\n>  \tsrcu_read_unlock(&vcpu->kvm->srcu, idx);\n> @@ -7669,6 +7671,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,\n>  \ttr->writeable = 1;\n>  \ttr->usermode = 0;\n>  \n> +\tvcpu_put(vcpu);\n>  \treturn 0;\n>  }\n>  \n> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\n> index f360005..0a8a490 100644\n> --- a/virt/kvm/kvm_main.c\n> +++ b/virt/kvm/kvm_main.c\n> @@ -2627,9 +2627,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n>  \t\tr = -EFAULT;\n>  \t\tif (copy_from_user(&tr, argp, sizeof(tr)))\n>  \t\t\tgoto out;\n> -\t\tvcpu_load(vcpu);\n>  \t\tr = kvm_arch_vcpu_ioctl_translate(vcpu, &tr);\n> -\t\tvcpu_put(vcpu);\n>  \t\tif (r)\n>  \t\t\tgoto out;\n>  \t\tr = -EFAULT;\n> \n\nReviewed-by: David Hildenbrand <david@redhat.com>","headers":{"Return-Path":"<kvm-ppc-owner@vger.kernel.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=kvm-ppc-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn7GR3b9jz9tBX\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 30 Nov 2017 04:45:03 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S934184AbdK2Ro6 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tWed, 29 Nov 2017 12:44:58 -0500","from mx1.redhat.com ([209.132.183.28]:50753 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752777AbdK2Ro5 (ORCPT <rfc822;kvm-ppc@vger.kernel.org>);\n\tWed, 29 Nov 2017 12:44:57 -0500","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 01C586A7D6;\n\tWed, 29 Nov 2017 17:44:57 +0000 (UTC)","from [10.36.117.80] (ovpn-117-80.ams2.redhat.com [10.36.117.80])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7A90A5C552;\n\tWed, 29 Nov 2017 17:44:53 +0000 (UTC)"],"Subject":"Re: [PATCH v2 10/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_translate","To":"Christoffer Dall <christoffer.dall@linaro.org>, kvm@vger.kernel.org","Cc":"Andrew Jones <drjones@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,\n\t=?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,\n\tMarc Zyngier <marc.zyngier@arm.com>, kvmarm@lists.cs.columbia.edu,\n\tlinux-arm-kernel@lists.infradead.org, James Hogan <jhogan@kernel.org>,\n\tlinux-mips@linux-mips.org, Alexander Graf <agraf@suse.com>,\n\tkvm-ppc@vger.kernel.org, \n\tChristian Borntraeger <borntraeger@de.ibm.com>, Cornelia Huck\n\t<cohuck@redhat.com>, linux-s390@vger.kernel.org","References":"<20171129164116.16167-1-christoffer.dall@linaro.org>\n\t<20171129164116.16167-11-christoffer.dall@linaro.org>","From":"David Hildenbrand <david@redhat.com>","Organization":"Red Hat GmbH","Message-ID":"<d8bcffcc-5ffc-ed6d-1920-b3c9fb5d6c9a@redhat.com>","Date":"Wed, 29 Nov 2017 18:44:52 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.4.0","MIME-Version":"1.0","In-Reply-To":"<20171129164116.16167-11-christoffer.dall@linaro.org>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 29 Nov 2017 17:44:57 +0000 (UTC)","Sender":"kvm-ppc-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<kvm-ppc.vger.kernel.org>","X-Mailing-List":"kvm-ppc@vger.kernel.org"}}]