{"id":842663,"url":"http://patchwork.ozlabs.org/api/patches/842663/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-5-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-5-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:04","name":"[v2,04/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_get_regs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"05a5f7b1e76196894c4c8dc14c14f33af8aace37","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-5-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/842663/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842663/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=\"g4l8Qpv8\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5t03p9Mz9t3f\n\tfor ;\n\tThu, 30 Nov 2017 03:42:16 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933756AbdK2Qlc (ORCPT );\n\tWed, 29 Nov 2017 11:41:32 -0500","from mail-wm0-f65.google.com ([74.125.82.65]:36813 \"EHLO\n\tmail-wm0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933738AbdK2Ql1 (ORCPT\n\t); Wed, 29 Nov 2017 11:41:27 -0500","by mail-wm0-f65.google.com with SMTP id b76so7246966wmg.1\n\tfor ; Wed, 29 Nov 2017 08:41:26 -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.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:24 -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=fZKJLXcBq/VoFewJmxYKuASa3tMI1Xukcd4eZpT/bVs=;\n\tb=g4l8Qpv8L1J6qujmG4dekt7hN1skQ81yqOIGtzX3C+eURpjCVqgrFTkAUS2OX25k86\n\t/NHH1NWyS1wFBdTtEd7dbvGQZ5HF10ygShSKMtW+2Rf5JW/KISWClhKP1/oGIdtyawjb\n\t4v3HiyFuQQfbiJ35o+5vApHes8VtB9mUM41L0=","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=fZKJLXcBq/VoFewJmxYKuASa3tMI1Xukcd4eZpT/bVs=;\n\tb=Ts6M3LQbAq1b3UQOB8Trc2fcDU0a57reNk5JJDxSpOjcG3vUh26KV+LQF4nd0MNlhG\n\tTdqbHe7xSrBoVSbG5drXIbd4t6CTJ+q7rLNY4gbHyjqHlloMJgzNAqumbqXQ92Jxk7gz\n\tQmZAsq6h0IQBe2Z+0g22PNUTdGCKvcI1oPYLxeRXr22tWnoOOtcsgd+R80jmb4wgxshJ\n\tpIjyL9af5Fzvy196/8qEvefU/jQiyDFm2QcYeowpXZc0AxTwr+Y4ZYEjFEE/aHir1uSl\n\tjlxq05FFUrv5xPPyO3K2yFcOTZVouXRkTGx4lIRuQKNa7cLaAe+nzj793fzkKBf4WzvD\n\t/48g==","X-Gm-Message-State":"AJaThX7DV5nG4+Pe78dLH4+cqjUHVYK/xmCA9Xmucm3a4hGINsVKUhlt\n\tSK7dtfEsWot87x7MlSE8E9JfEg==","X-Google-Smtp-Source":"AGs4zMb3QKYxDALsk2XYjJ6Bx2QsTiNSDd2APUKqaf0bEPEmMNy/89c/BU/SS2bJIOHdoWzeBy+jBQ==","X-Received":"by 10.28.111.146 with SMTP id c18mr3056589wmi.123.1511973685833; \n\tWed, 29 Nov 2017 08:41:25 -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 04/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_get_regs","Date":"Wed, 29 Nov 2017 17:41:04 +0100","Message-Id":"<20171129164116.16167-5-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_get_regs().\n\nSigned-off-by: Christoffer Dall \n---\n arch/mips/kvm/mips.c | 3 +++\n arch/powerpc/kvm/book3s.c | 3 +++\n arch/powerpc/kvm/booke.c | 3 +++\n arch/s390/kvm/kvm-s390.c | 2 ++\n arch/x86/kvm/x86.c | 3 +++\n virt/kvm/kvm_main.c | 2 --\n 6 files changed, 14 insertions(+), 2 deletions(-)","diff":"diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c\nindex b5c28f0..adfca57 100644\n--- a/arch/mips/kvm/mips.c\n+++ b/arch/mips/kvm/mips.c\n@@ -1165,6 +1165,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tfor (i = 0; i < ARRAY_SIZE(vcpu->arch.gprs); i++)\n \t\tregs->gpr[i] = vcpu->arch.gprs[i];\n \n@@ -1172,6 +1174,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tregs->lo = vcpu->arch.lo;\n \tregs->pc = vcpu->arch.pc;\n \n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c\nindex 72d977e..d85bfd7 100644\n--- a/arch/powerpc/kvm/book3s.c\n+++ b/arch/powerpc/kvm/book3s.c\n@@ -497,6 +497,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tregs->pc = kvmppc_get_pc(vcpu);\n \tregs->cr = kvmppc_get_cr(vcpu);\n \tregs->ctr = kvmppc_get_ctr(vcpu);\n@@ -518,6 +520,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tfor (i = 0; i < ARRAY_SIZE(regs->gpr); i++)\n \t\tregs->gpr[i] = kvmppc_get_gpr(vcpu, i);\n \n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\nindex 83b4858..e0e4f04 100644\n--- a/arch/powerpc/kvm/booke.c\n+++ b/arch/powerpc/kvm/booke.c\n@@ -1431,6 +1431,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tregs->pc = vcpu->arch.pc;\n \tregs->cr = kvmppc_get_cr(vcpu);\n \tregs->ctr = vcpu->arch.ctr;\n@@ -1452,6 +1454,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tfor (i = 0; i < ARRAY_SIZE(regs->gpr); i++)\n \t\tregs->gpr[i] = kvmppc_get_gpr(vcpu, i);\n \n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex 2b3e874..37b7caa 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2718,7 +2718,9 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \n int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n+\tvcpu_load(vcpu);\n \tmemcpy(®s->gprs, &vcpu->run->s.regs.gprs, sizeof(regs->gprs));\n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex d9deb62..597e1f8 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7309,6 +7309,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)\n \n int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n+\tvcpu_load(vcpu);\n+\n \tif (vcpu->arch.emulate_regs_need_sync_to_vcpu) {\n \t\t/*\n \t\t * We are here if userspace calls get_regs() in the middle of\n@@ -7342,6 +7344,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tregs->rip = kvm_rip_read(vcpu);\n \tregs->rflags = kvm_get_rflags(vcpu);\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 198f2f9..843d481 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2552,9 +2552,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\tkvm_regs = kzalloc(sizeof(struct kvm_regs), GFP_KERNEL);\n \t\tif (!kvm_regs)\n \t\t\tgoto out;\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_get_regs(vcpu, kvm_regs);\n-\t\tvcpu_put(vcpu);\n \t\tif (r)\n \t\t\tgoto out_free1;\n \t\tr = -EFAULT;\n","prefixes":["v2","04/16"]}