{"id":842659,"url":"http://patchwork.ozlabs.org/api/patches/842659/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-11-christoffer.dall@linaro.org/","project":{"id":23,"url":"http://patchwork.ozlabs.org/api/projects/23/?format=json","name":"KVM PowerPC development","link_name":"kvm-ppc","list_id":"kvm-ppc.vger.kernel.org","list_email":"kvm-ppc@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171129164116.16167-11-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:10","name":"[v2,10/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_translate","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bc02a6afd951c2197f1422418fcf632b030f3add","submitter":{"id":26352,"url":"http://patchwork.ozlabs.org/api/people/26352/?format=json","name":"Christoffer Dall","email":"christoffer.dall@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-11-christoffer.dall@linaro.org/mbox/","series":[{"id":15778,"url":"http://patchwork.ozlabs.org/api/series/15778/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/list/?series=15778","date":"2017-11-29T16:41:00","name":"Move vcpu_load and vcpu_put calls to arch code","version":2,"mbox":"http://patchwork.ozlabs.org/series/15778/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/842659/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842659/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"EsH0KUch\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5sq6D4Xz9t9F\n\tfor ;\n\tThu, 30 Nov 2017 03:42:07 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933778AbdK2Qlj (ORCPT );\n\tWed, 29 Nov 2017 11:41:39 -0500","from mail-wm0-f65.google.com ([74.125.82.65]:35296 \"EHLO\n\tmail-wm0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933748AbdK2Qlh (ORCPT\n\t); Wed, 29 Nov 2017 11:41:37 -0500","by mail-wm0-f65.google.com with SMTP id f9so7259932wmh.0\n\tfor ; Wed, 29 Nov 2017 08:41:36 -0800 (PST)","from localhost.localdomain (x50d2404e.cust.hiper.dk.\n\t[80.210.64.78]) by smtp.gmail.com with ESMTPSA id\n\te71sm2080765wma.13.2017.11.29.08.41.34\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:35 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=OUilMp8GJQaK/3PwvYsmqwhU9F1Bw7TTcmnJ+kgxAzc=;\n\tb=EsH0KUchgJnLuoXIMMEHnN34ckAWO+4MwVdrxSl5frx/iFZ2aYA523lyJ75ebG7Jtp\n\trIbM73ZP8Tf7a53msbjU+f7fVfDsQM9RFz1MiQWcei0t3uRvS4vlW0pA5EnciFExOtcH\n\tvpu0eI1K9PGwi1UXwiqabLauYP5/2MpWeWhjI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=OUilMp8GJQaK/3PwvYsmqwhU9F1Bw7TTcmnJ+kgxAzc=;\n\tb=R5Ht4hWlJioeYPEZ9oMgMH6wgW3Ldp+P88enkwQKSXEbXJPl3qc6N/jNhMmwufwNsN\n\tE4Ioox0FXqP3iKULTzZt3nM1TTDgx7xyfkSQ8gGSLIOOHXwhWB4f9dGG3QEejtchm8Mj\n\tkIZUfNtId3qbpUj1ZenmOvryMBZoNA0ezBAdKFFeuve10V4Be+vDF2EVWidm30NaO1Ib\n\tv30QaszTUehPODxAhMgOxCEd6j0reknM0D/xZg0kF7+Bi3ML4DR+buw3jf1LHo5hqLH4\n\tV5XUOzUFbnUMt2XY9kmG8PVTEATxM+smoD7q94BT1ngx12pGeY3A8exajUz/oRVQCp0u\n\tK5tQ==","X-Gm-Message-State":"AJaThX7DvlKahgm0Gn0bdoXH9u17i2RHtizAxdDZrpKhld8hWsqi3oAo\n\tUbupaRBPjigcoXdtk8hH+TPSPA==","X-Google-Smtp-Source":"AGs4zMbGo+mooMxiNm+5eRst+CffGK3w8+C45r9XoZciINunC3heNytjH7jMPD7gcVjWDRH00MBsHA==","X-Received":"by 10.28.105.196 with SMTP id z65mr3173915wmh.146.1511973696121; \n\tWed, 29 Nov 2017 08:41:36 -0800 (PST)","From":"Christoffer Dall ","To":"kvm@vger.kernel.org","Cc":"Andrew Jones , Christoffer Dall\n\t, Paolo Bonzini ,\n\t=?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= ,\n\tMarc Zyngier , kvmarm@lists.cs.columbia.edu,\n\tlinux-arm-kernel@lists.infradead.org, James Hogan ,\n\tlinux-mips@linux-mips.org, Alexander Graf ,\n\tkvm-ppc@vger.kernel.org, \n\tChristian Borntraeger , Cornelia Huck\n\t, linux-s390@vger.kernel.org","Subject":"[PATCH v2 10/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_translate","Date":"Wed, 29 Nov 2017 17:41:10 +0100","Message-Id":"<20171129164116.16167-11-christoffer.dall@linaro.org>","X-Mailer":"git-send-email 2.14.2","In-Reply-To":"<20171129164116.16167-1-christoffer.dall@linaro.org>","References":"<20171129164116.16167-1-christoffer.dall@linaro.org>","Sender":"kvm-ppc-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"kvm-ppc@vger.kernel.org"},"content":"Move vcpu_load() and vcpu_put() into the architecture specific\nimplementations of kvm_arch_vcpu_ioctl_translate().\n\nSigned-off-by: Christoffer Dall \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(-)","diff":"diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\nindex 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 \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 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 \ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex 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","prefixes":["v2","10/16"]}