From patchwork Sat Nov 25 20:57:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10075141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A991D60383 for ; Sat, 25 Nov 2017 20:57:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C142286EC for ; Sat, 25 Nov 2017 20:57:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90F2728B53; Sat, 25 Nov 2017 20:57:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C8B2286EC for ; Sat, 25 Nov 2017 20:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751924AbdKYU5n (ORCPT ); Sat, 25 Nov 2017 15:57:43 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:41221 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbdKYU5g (ORCPT ); Sat, 25 Nov 2017 15:57:36 -0500 Received: by mail-wm0-f66.google.com with SMTP id b189so27620218wmd.0 for ; Sat, 25 Nov 2017 12:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SCt8PKDwj8NdxkYkTRO/tiMpMynrFEUWAHQZsoHGuu0=; b=BdbI7PVMIMYMxkUy3u4R0Q4g97BuVrAwOSUge58npKm/ZtzXrvPPO/Ob/Du/OC+jPG Gafnzc3ImU3VR4C+5weSq1ATmc5XCFoQLy2lqACLcioCNwnpN6F8x0w2kEz0oQF61fME 3vfBKOTglO0btuPh2Ogyzp1vvDg3g87vTjc/Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SCt8PKDwj8NdxkYkTRO/tiMpMynrFEUWAHQZsoHGuu0=; b=nxCGa/dkrMZbvezj86364SwEWLlirIqi1lA4dk9/0wnErTCwByfX0VYkQOmuc2KaT4 cvp661hCaemVx2GTbK4WNhZliLBW0T2km6eWsWnF8RiRTaWtY8Betzwv01K7w33iPgVV oL++za8WNrRalz5pgZF61etir42aIRu0MWrhiEZ9EeLMiMaSsCOdPV2sd7jtaCQMOccU kyqtRWq/fFdCZbW5bcjJjQLcb0qhJ/qBVT7pz30WC2JA4tzhrVr0WlfvGNnTJ01a5fEp cLXjUF4MgTgY+dX6K03rgXPGArdOIfIqpIzxWkIpL53piP3p09gB+ozm81DYFoE3zKgg q+hw== X-Gm-Message-State: AJaThX7iZoUOcl0no4Y4RQel9VSGgW/QWkZoVB+EEq2CoMcftukzWbwy vSmZEtZNnNH0G9BFNnu8/xPyIPaf1po= X-Google-Smtp-Source: AGs4zMY77LHfAeb6uGAIzKVGOux3ismS1De3ouZmiwNriq5l2t82Whhcup9P/F17f2lKcmZ5vqARsw== X-Received: by 10.28.6.2 with SMTP id 2mr12557438wmg.37.1511643454449; Sat, 25 Nov 2017 12:57:34 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id z37sm15157577wrc.31.2017.11.25.12.57.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Nov 2017 12:57:33 -0800 (PST) From: Christoffer Dall To: kvm@vger.kernel.org Cc: Andrew Jones , Christoffer Dall , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Marc Zyngier , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, James Hogan , linux-mips@linux-mips.org, Alexander Graf , kvm-ppc@vger.kernel.org, Christian Borntraeger , Cornelia Huck , linux-s390@vger.kernel.org Subject: [PATCH 13/15] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_fpu Date: Sat, 25 Nov 2017 21:57:16 +0100 Message-Id: <20171125205718.7731-14-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171125205718.7731-1-christoffer.dall@linaro.org> References: <20171125205718.7731-1-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move vcpu_load() and vcpu_put() into the architecture specific implementations of kvm_arch_vcpu_ioctl_set_fpu(). Signed-off-by: Christoffer Dall --- arch/s390/kvm/kvm-s390.c | 15 +++++++++++++-- arch/x86/kvm/x86.c | 11 +++++++++-- virt/kvm/kvm_main.c | 4 ---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index e4ddf6a5cb4e..46d015083136 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2769,15 +2769,26 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) { + int ret; + + ret = vcpu_load(vcpu); + if (ret) + return ret; + + ret = -EINVAL; if (test_fp_ctl(fpu->fpc)) - return -EINVAL; + goto out; vcpu->run->s.regs.fpc = fpu->fpc; if (MACHINE_HAS_VX) convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs, (freg_t *) fpu->fprs); else memcpy(vcpu->run->s.regs.fprs, &fpu->fprs, sizeof(fpu->fprs)); - return 0; + + ret = 0; +out: + vcpu_put(vcpu); + return ret; } int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f275fefbc4e0..230d552cdc4b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7701,8 +7701,14 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) { - struct fxregs_state *fxsave = - &vcpu->arch.guest_fpu.state.fxsave; + int ret; + struct fxregs_state *fxsave; + + ret = vcpu_load(vcpu); + if (ret) + return ret; + + fxsave = &vcpu->arch.guest_fpu.state.fxsave; memcpy(fxsave->st_space, fpu->fpr, 128); fxsave->cwd = fpu->fcw; @@ -7713,6 +7719,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) fxsave->rdp = fpu->last_dp; memcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space); + vcpu_put(vcpu); return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8f767922fbbd..08a610619572 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2697,11 +2697,7 @@ static long kvm_vcpu_ioctl(struct file *filp, fpu = NULL; goto out; } - r = vcpu_load(vcpu); - if (r) - goto out; r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu); - vcpu_put(vcpu); break; } default: