{"id":842666,"url":"http://patchwork.ozlabs.org/api/patches/842666/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-6-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-6-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:05","name":"[v2,05/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_regs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"31fe82f05a17d7463180d680466099dcb84234fe","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-6-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/842666/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842666/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=\"gGVSkV4F\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5t64t5fz9t3Z\n\tfor ;\n\tThu, 30 Nov 2017 03:42:22 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933754AbdK2Qla (ORCPT );\n\tWed, 29 Nov 2017 11:41:30 -0500","from mail-wm0-f66.google.com ([74.125.82.66]:33073 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933747AbdK2Ql2 (ORCPT\n\t); Wed, 29 Nov 2017 11:41:28 -0500","by mail-wm0-f66.google.com with SMTP id g130so37167532wme.0\n\tfor ; Wed, 29 Nov 2017 08:41:28 -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.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:26 -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=Dc+K6GcI8JciAx3+9nFGUD/9jiDe0Rr3SUqjuPfgac0=;\n\tb=gGVSkV4FpQdzCsTJVbXNgsraWua0ZRqIaxFy1fzKxGf6gASTOezngQkQ5gXfjh0rDk\n\tVpfWRRzUvwu1fiHAuTHD1HzlFat5y5F3k43LMjQHWpuGaWb1rcpRa6BP6aNv5xe5kSEx\n\thLcH8IEOJ8m9kPKvB2xxEGDkbE4fC5K5BfwIU=","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=Dc+K6GcI8JciAx3+9nFGUD/9jiDe0Rr3SUqjuPfgac0=;\n\tb=cw5XB0d3HIiMAWTKTXGCFlltNNJ6OcVaAGaJcsoEhsNERYAQOzod4gdNdu5ximr7+H\n\tmqq8Qi7ONuDNtrwfcEjK06vYbJd7bLbbZNwpU1ReDqQew/2KQBLdzwl5TJzCKPGjRth5\n\tqX1fps7vllDOxXaqeqvfW5kqJmM64r+/+j2tEs/t5B0+13oN5SKp5CLRa6Zxz7MTiWn0\n\tOYetBUktf0FbLTreQbiO5TzY+zS5hWZB7PHkGguP3QSSGIFh5FS7VBh7UhJQMaROtsHK\n\trH1dDVQQRKoh3ULyvRmFVfXCOte4YLgCorT/Cbh2QMmg3r44Wou6J/DPN8BWwFv/jT9y\n\tl+gQ==","X-Gm-Message-State":"AJaThX7Tx+e4gtkVMsHsqjyWGAGvRWh0xsx43kjmjMNFlG9ncnsitA/T\n\tSll1snE80Xv2Qsm3+/iaK0KkNg==","X-Google-Smtp-Source":"AGs4zMZdqKqMX+FdFk5QlHszN/MlwPcqcizYnHgHv421QbmgjGhH+UExirxxyySb7D7rYZaGtHr0ag==","X-Received":"by 10.28.31.131 with SMTP id f125mr2776759wmf.18.1511973687444; \n\tWed, 29 Nov 2017 08:41:27 -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 05/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_set_regs","Date":"Wed, 29 Nov 2017 17:41:05 +0100","Message-Id":"<20171129164116.16167-6-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_set_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 adfca57..3a89871 100644\n--- a/arch/mips/kvm/mips.c\n+++ b/arch/mips/kvm/mips.c\n@@ -1151,6 +1151,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tfor (i = 1; i < ARRAY_SIZE(vcpu->arch.gprs); i++)\n \t\tvcpu->arch.gprs[i] = regs->gpr[i];\n \tvcpu->arch.gprs[0] = 0; /* zero is special, and cannot be set. */\n@@ -1158,6 +1160,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tvcpu->arch.lo = regs->lo;\n \tvcpu->arch.pc = regs->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 d85bfd7..24bc7aa 100644\n--- a/arch/powerpc/kvm/book3s.c\n+++ b/arch/powerpc/kvm/book3s.c\n@@ -528,6 +528,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tkvmppc_set_pc(vcpu, regs->pc);\n \tkvmppc_set_cr(vcpu, regs->cr);\n \tkvmppc_set_ctr(vcpu, regs->ctr);\n@@ -548,6 +550,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tfor (i = 0; i < ARRAY_SIZE(regs->gpr); i++)\n \t\tkvmppc_set_gpr(vcpu, i, regs->gpr[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 e0e4f04..bcbbedd 100644\n--- a/arch/powerpc/kvm/booke.c\n+++ b/arch/powerpc/kvm/booke.c\n@@ -1462,6 +1462,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n \tint i;\n \n+\tvcpu_load(vcpu);\n+\n \tvcpu->arch.pc = regs->pc;\n \tkvmppc_set_cr(vcpu, regs->cr);\n \tvcpu->arch.ctr = regs->ctr;\n@@ -1483,6 +1485,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \tfor (i = 0; i < ARRAY_SIZE(regs->gpr); i++)\n \t\tkvmppc_set_gpr(vcpu, i, regs->gpr[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 37b7caa..e347643 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2712,7 +2712,9 @@ static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)\n \n int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n+\tvcpu_load(vcpu);\n \tmemcpy(&vcpu->run->s.regs.gprs, ®s->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 597e1f8..75eacce 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7350,6 +7350,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \n int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n {\n+\tvcpu_load(vcpu);\n+\n \tvcpu->arch.emulate_regs_need_sync_from_vcpu = true;\n \tvcpu->arch.emulate_regs_need_sync_to_vcpu = false;\n \n@@ -7379,6 +7381,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n \n \tkvm_make_request(KVM_REQ_EVENT, 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 843d481..963e249 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2572,9 +2572,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\t\tr = PTR_ERR(kvm_regs);\n \t\t\tgoto out;\n \t\t}\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_set_regs(vcpu, kvm_regs);\n-\t\tvcpu_put(vcpu);\n \t\tkfree(kvm_regs);\n \t\tbreak;\n \t}\n","prefixes":["v2","05/16"]}