From patchwork Mon Dec 4 20:35:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10091483 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 7E6CF60327 for ; Mon, 4 Dec 2017 20:36:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71DAA290AA for ; Mon, 4 Dec 2017 20:36:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65516293F1; Mon, 4 Dec 2017 20:36:40 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 09BE7290AA for ; Mon, 4 Dec 2017 20:36:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639AbdLDUgj (ORCPT ); Mon, 4 Dec 2017 15:36:39 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37973 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbdLDUgI (ORCPT ); Mon, 4 Dec 2017 15:36:08 -0500 Received: by mail-wm0-f65.google.com with SMTP id 64so16585758wme.3 for ; Mon, 04 Dec 2017 12:36:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=christofferdall-dk.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/sNphlMbDKiBIPVVmKYnzJtUTOvcCdWKJRmCkp2sPiM=; b=Nmc6iqaEKdu5Hdp4B5yzpdUuFxFm2p2hvoG7wnOxBCjreTYVuM5SerPbgwacQNkjzf txyAuBwsbZ+etzg8fCl2Dsg/3BYCgOGLJvCbcRFPNxgj43yIJFMKJ+k1H8kjwE6nasq8 27FLr7sb5zyGapwjSl8gvs9hF0islUOft1oBuamehtP5+6dAL0Tp2n3BsFtV5wbzHeZ2 tuqrug5gHWY9b94bnH2FN+mfzHzpNC/IFG6cQz3rXit5DZr1mPu6wnBJOmO/Tbgo1psG IAWGl2D1VEJfL4xd0PiPTCC0khPmuURyFz1B62yhK2MlxlmfVHeFhLviKCsCiPHFWa0M S0EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/sNphlMbDKiBIPVVmKYnzJtUTOvcCdWKJRmCkp2sPiM=; b=GnTsFZozZT6qvFoW0RS+YpxJEhAmI8l4Fqn3QhxksB3lU9I9UJ3tyEeSFfYkQeEvaw UJ2aSFaq92Vw7lxegLSmZUQYl/LjDQXx8oUR016Mlwo+7dTyxtZGBhgFUc5+Ng9NyGH5 hoZwUH7QPPu3ujGb7utsUr1/3NM4wnBHfNFuQKI5uiwC+5YNn6jt2UN1FzxAw4Szr9Dl IOs5bb1Qqj/FdIBWXRQBTQbmwkhCd8Lu5XRZKRpvijnX9xnY/rS55PAZfcgJ1N0Tvp5p Kuz8/kHcUxy6NQdTly9YOpjFRt3iBJ6611h29222FWwvEaLgz5hBYhFugu66kGxemj25 VxNg== X-Gm-Message-State: AJaThX6pYjvKhHxc3rDgTslKw1AYSduUSdhMq2ybnejmO0QNIVH8ZUkU kCQbFYChjO/LmguIVwcXFvVqy1r+PPwHNw== X-Google-Smtp-Source: AGs4zMaJwFMjVdWw9m5Qy4MWHBdyMWWc3tiO59muy39op+PH76epdv+6jwgx1v/OVLzvXxFArVOE+w== X-Received: by 10.80.240.200 with SMTP id a8mr32259168edm.288.1512419766569; Mon, 04 Dec 2017 12:36:06 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id k42sm8434943edb.94.2017.12.04.12.36.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 12:36:05 -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, Paul Mackerras , kvm-ppc@vger.kernel.org, Christian Borntraeger , Cornelia Huck , linux-s390@vger.kernel.org Subject: [PATCH v3 13/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_fpu Date: Mon, 4 Dec 2017 21:35:35 +0100 Message-Id: <20171204203538.8370-14-cdall@kernel.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171204203538.8370-1-cdall@kernel.org> References: <20171204203538.8370-1-cdall@kernel.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christoffer Dall Move vcpu_load() and vcpu_put() into the architecture specific implementations of kvm_arch_vcpu_ioctl_set_fpu(). Reviewed-by: David Hildenbrand Signed-off-by: Christoffer Dall Reviewed-by: Cornelia Huck --- arch/s390/kvm/kvm-s390.c | 15 ++++++++++++--- arch/x86/kvm/x86.c | 8 ++++++-- virt/kvm/kvm_main.c | 2 -- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 88dcb89656be..43278f334ce3 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2752,15 +2752,24 @@ 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) { - if (test_fp_ctl(fpu->fpc)) - return -EINVAL; + int ret = 0; + + vcpu_load(vcpu); + + if (test_fp_ctl(fpu->fpc)) { + ret = -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; + +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 19b70e016858..95a329580c8b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7698,8 +7698,11 @@ 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; + struct fxregs_state *fxsave; + + vcpu_load(vcpu); + + fxsave = &vcpu->arch.guest_fpu.state.fxsave; memcpy(fxsave->st_space, fpu->fpr, 128); fxsave->cwd = fpu->fcw; @@ -7710,6 +7713,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 73ad70af6b2d..06751bbecd58 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2689,9 +2689,7 @@ static long kvm_vcpu_ioctl(struct file *filp, fpu = NULL; goto out; } - vcpu_load(vcpu); r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu); - vcpu_put(vcpu); break; } default: