{"id":842656,"url":"http://patchwork.ozlabs.org/api/patches/842656/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-ppc/patch/20171129164116.16167-14-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-14-christoffer.dall@linaro.org>","list_archive_url":null,"date":"2017-11-29T16:41:13","name":"[v2,13/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_fpu","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ab08a6cde12bc45db009b1368f0d53469777d9d2","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-14-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/842656/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/842656/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=\"TUA1xHVm\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yn5sf0HWpz9t8s\n\tfor ;\n\tThu, 30 Nov 2017 03:41:58 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933794AbdK2Qlp (ORCPT );\n\tWed, 29 Nov 2017 11:41:45 -0500","from mail-wm0-f66.google.com ([74.125.82.66]:45577 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933780AbdK2Qlm (ORCPT\n\t); Wed, 29 Nov 2017 11:41:42 -0500","by mail-wm0-f66.google.com with SMTP id 9so7568590wme.4\n\tfor ; Wed, 29 Nov 2017 08:41:41 -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.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 29 Nov 2017 08:41:40 -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=SDbGekwTGfPeOtIY2YvyvCh3khoLc38Ey9F55tV3OzA=;\n\tb=TUA1xHVmPw6HhIspyafTM96ZBHoTQSAHY5W1ESq/GTA4WsfUbAoIDQkpnCcKR4sRhR\n\ttu46FTdPCHtq9jCaUphotAC2FwxcaCIFu9QarRPQdLZp2NCEmngmL8FIVQtTbLshfkXR\n\tZiqt3qlSF1f81sRK35uiIAstpAiHybKenNUKQ=","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=SDbGekwTGfPeOtIY2YvyvCh3khoLc38Ey9F55tV3OzA=;\n\tb=BzkhgQRsWsX7CCcXuatwI2+vGgifJ0lNMSG0KKIdBCOxbTHjNUew5lbz2vhwKTG8Hu\n\t01Dpba6T5W+Dud5vEh1Z5HplFR81Z2KqOIqTYL1wGXJRHNriRsG8RFGa+JUnDNVHOiWJ\n\twefntXMb9AIzxab2C9hALySYB7uuwCxQaIVDXFVDaVG13pH+n919or/r66zVVpLvNZ/7\n\tJzOd1oCGOCbjn8g0r1mnoWZ40dcN3ogx77MdaBBpJIS/eZt2l3amfyV8zwVRIqdjXckE\n\tI9Y32HXq6N7rmPbJf97DRP7JfWRNbck+Fi5aSeH8WDxHFM5SKyWWAZNIZimG2FqIEjEy\n\t93NQ==","X-Gm-Message-State":"AJaThX7/HpOS8VuLNaeUJe8DLn7+G3RJYM6FGRaj9CF1kxay9EF3w/gx\n\tQTPTcVW2SgWsqzU4rxAn1JjipQ==","X-Google-Smtp-Source":"AGs4zMYdR7I998I3tymksI+Ie8LeJ8RwXeP+fEHp9QltLrFMUtAVaZ77xHguNx/isHjkk/Qg6zuZUA==","X-Received":"by 10.28.12.75 with SMTP id 72mr2872353wmm.133.1511973701269;\n\tWed, 29 Nov 2017 08:41:41 -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 13/16] KVM: Move vcpu_load to arch-specific\n\tkvm_arch_vcpu_ioctl_set_fpu","Date":"Wed, 29 Nov 2017 17:41:13 +0100","Message-Id":"<20171129164116.16167-14-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_fpu().\n\nSigned-off-by: Christoffer Dall \n---\n arch/s390/kvm/kvm-s390.c | 15 ++++++++++++---\n arch/x86/kvm/x86.c | 8 ++++++--\n virt/kvm/kvm_main.c | 2 --\n 3 files changed, 18 insertions(+), 7 deletions(-)","diff":"diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c\nindex 88dcb89..43278f3 100644\n--- a/arch/s390/kvm/kvm-s390.c\n+++ b/arch/s390/kvm/kvm-s390.c\n@@ -2752,15 +2752,24 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,\n \n int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\n {\n-\tif (test_fp_ctl(fpu->fpc))\n-\t\treturn -EINVAL;\n+\tint ret = 0;\n+\n+\tvcpu_load(vcpu);\n+\n+\tif (test_fp_ctl(fpu->fpc)) {\n+\t\tret = -EINVAL;\n+\t\tgoto out;\n+\t}\n \tvcpu->run->s.regs.fpc = fpu->fpc;\n \tif (MACHINE_HAS_VX)\n \t\tconvert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs,\n \t\t\t\t (freg_t *) fpu->fprs);\n \telse\n \t\tmemcpy(vcpu->run->s.regs.fprs, &fpu->fprs, sizeof(fpu->fprs));\n-\treturn 0;\n+\n+out:\n+\tvcpu_put(vcpu);\n+\treturn ret;\n }\n \n int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\ndiff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c\nindex 8b54567..fd8b92f 100644\n--- a/arch/x86/kvm/x86.c\n+++ b/arch/x86/kvm/x86.c\n@@ -7699,8 +7699,11 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\n \n int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\n {\n-\tstruct fxregs_state *fxsave =\n-\t\t\t&vcpu->arch.guest_fpu.state.fxsave;\n+\tstruct fxregs_state *fxsave;\n+\n+\tvcpu_load(vcpu);\n+\n+\tfxsave = &vcpu->arch.guest_fpu.state.fxsave;\n \n \tmemcpy(fxsave->st_space, fpu->fpr, 128);\n \tfxsave->cwd = fpu->fcw;\n@@ -7711,6 +7714,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)\n \tfxsave->rdp = fpu->last_dp;\n \tmemcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space);\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 73ad70a..06751bb 100644\n--- a/virt/kvm/kvm_main.c\n+++ b/virt/kvm/kvm_main.c\n@@ -2689,9 +2689,7 @@ static long kvm_vcpu_ioctl(struct file *filp,\n \t\t\tfpu = NULL;\n \t\t\tgoto out;\n \t\t}\n-\t\tvcpu_load(vcpu);\n \t\tr = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);\n-\t\tvcpu_put(vcpu);\n \t\tbreak;\n \t}\n \tdefault:\n","prefixes":["v2","13/16"]}