{"id":842660,"url":"http://patchwork.ozlabs.org/api/patches/842660/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-8-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-8-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:07","name":"[v2,07/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_sregs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3d32435b900be38fca5eddfef9f09161de851d9c","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-8-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/842660/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842660/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=\"GuKIEWJB\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5ss0vsjz9t8s\n\tfor ;\n\tThu, 30 Nov 2017 03:42:09 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933762AbdK2Qlg (ORCPT );\n\tWed, 29 Nov 2017 11:41:36 -0500","from mail-wm0-f68.google.com ([74.125.82.68]:36830 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933743AbdK2Qlc (ORCPT\n\t); Wed, 29 Nov 2017 11:41:32 -0500","by mail-wm0-f68.google.com with SMTP id b76so7247525wmg.1\n\tfor ; Wed, 29 Nov 2017 08:41:31 -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.29\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:29 -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=viNGUJLHWXAK25tf/G0VP0ciIKHrjx6wBS2KqBzuEDQ=;\n\tb=GuKIEWJBPjOhVypJXJLnzRHg66WTR+bCuKVqC3YUEwOV/sutBxvguap5hE+9n2WsjH\n\tjz9kHESW1E1RtgsPKc0wM97Y9eOpEKWLeWcnBLWVI1Fd3vwD+SIIn8smJ1NMihTMI6wF\n\t7VZ/DTwCCNVJph/djjyiSTUxmHtqsb/Lwe7PE=","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=viNGUJLHWXAK25tf/G0VP0ciIKHrjx6wBS2KqBzuEDQ=;\n\tb=Sw63I8HAcBhPetVlw5eo1jqbhiLdCADtdOVu5jQgsXOMV+7/FcAhuFVSqq2zWWHt/E\n\tAZuoDMpQ0fQz4IpGpSnvQF/XC3Qv+tzZLHQ6IOrqeKcx85tcFdJk4pkaeyEpV1tNR6ku\n\tffse/iv7+WcrAc5nAPAHODSKOG+vHPkePc8FiixKVlhCClMsZiEtz5QRxtY6/qYVPr+c\n\tQPahAsa/43SQqh64dl5jBWvjR8VHKiibChPjbc2FpBUzmYaA28vc0mXN3qHSZmIa/zaz\n\tY8epyOdbIfOiq50pG48FWQ9J44LaTfF386+6Vd9w43fCz/el9R4BfKNJl7HxNeOTke1O\n\tgzYA==","X-Gm-Message-State":"AJaThX4vC+19fNf85h9VxzIBTMdyKZcuEVS859EWaownjcusKGej63Vh\n\tunfPjsXso+Vx2c26Qf1CuoUqSQ==","X-Google-Smtp-Source":"AGs4zMb48bLCOhYGzwbL+P4A1EYCQeP/PLBtmYrSJvqOmGBmAgI9MOVmwtNXN3IEsXKM8YCXtaHWFQ==","X-Received":"by 10.28.50.70 with SMTP id y67mr3030571wmy.159.1511973691187;\n\tWed, 29 Nov 2017 08:41:31 -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 07/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_set_sregs","Date":"Wed, 29 Nov 2017 17:41:07 +0100","Message-Id":"<20171129164116.16167-8-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_sregs().\n\nSigned-off-by: Christoffer Dall \n---\n arch/powerpc/kvm/book3s.c | 8 +++++++-\n arch/powerpc/kvm/booke.c | 15 +++++++++++----\n arch/s390/kvm/kvm-s390.c | 4 ++++\n arch/x86/kvm/x86.c | 13 ++++++++++---\n virt/kvm/kvm_main.c | 2 --\n 5 files changed, 32 insertions(+), 10 deletions(-)","diff":"diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c\nindex 6cc2377..0476516 100644\n--- a/arch/powerpc/kvm/book3s.c\n+++ b/arch/powerpc/kvm/book3s.c\n@@ -496,7 +496,13 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_sregs *sregs)\n {\n-\treturn vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);\n+\tint ret;\n+\n+\tvcpu_load(vcpu);\n+\tret = vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);\n+\tvcpu_put(vcpu);\n+\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\ndiff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\nindex f647e12..cdf0be0 100644\n--- a/arch/powerpc/kvm/booke.c\n+++ b/arch/powerpc/kvm/booke.c\n@@ -1632,18 +1632,25 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n {\n \tint ret;\n \n+\tvcpu_load(vcpu);\n+\n+\tret = -EINVAL;\n \tif (vcpu->arch.pvr != sregs->pvr)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tret = set_sregs_base(vcpu, sregs);\n \tif (ret < 0)\n-\t\treturn ret;\n+\t\tgoto out;\n \n \tret = set_sregs_arch206(vcpu, sregs);\n \tif (ret < 0)\n-\t\treturn ret;\n+\t\tgoto out;\n+\n+\tret = vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);\n \n-\treturn vcpu->kvm->arch.kvm_ops->set_sregs(vcpu, sregs);\n+out:\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id,\ndiff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex 18011fc..d95b4f1 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2729,8 +2729,12 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)\n int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n \t\t\t\t struct kvm_sregs *sregs)\n {\n+\tvcpu_load(vcpu);\n+\n \tmemcpy(&vcpu->run->s.regs.acrs, &sregs->acrs, sizeof(sregs->acrs));\n \tmemcpy(&vcpu->arch.sie_block->gcr, &sregs->crs, sizeof(sregs->crs));\n+\n+\tvcpu_put(vcpu);\n \treturn 0;\n }\n \ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 20a5f67..a31a80a 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7500,15 +7500,19 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n \tint mmu_reset_needed = 0;\n \tint pending_vec, max_bits, idx;\n \tstruct desc_ptr dt;\n+\tint ret;\n+\n+\tvcpu_load(vcpu);\n \n+\tret = -EINVAL;\n \tif (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&\n \t\t\t(sregs->cr4 & X86_CR4_OSXSAVE))\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tapic_base_msr.data = sregs->apic_base;\n \tapic_base_msr.host_initiated = true;\n \tif (kvm_set_apic_base(vcpu, &apic_base_msr))\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tdt.size = sregs->idt.limit;\n \tdt.address = sregs->idt.base;\n@@ -7574,7 +7578,10 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,\n \n \tkvm_make_request(KVM_REQ_EVENT, vcpu);\n \n-\treturn 0;\n+\tret = 0;\n+out:\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,\ndiff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c\nindex 779c03e..19cf2d1 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2597,9 +2597,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\t\tkvm_sregs = NULL;\n \t\t\tgoto out;\n \t\t}\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs);\n-\t\tvcpu_put(vcpu);\n \t\tbreak;\n \t}\n \tcase KVM_GET_MP_STATE: {\n","prefixes":["v2","07/16"]}