From patchwork Mon Dec 4 20:35:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10091513 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 664BE60327 for ; Mon, 4 Dec 2017 20:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58D232925F for ; Mon, 4 Dec 2017 20:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BB3129416; Mon, 4 Dec 2017 20:39:16 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D77942925F for ; Mon, 4 Dec 2017 20:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZCUEh5+DxrV4Vtwh3QQxQmCGszPQvfXiuc7LEqO0Tfk=; b=e7OBkhVfXW6SdkKPedooyiv0+y CXqE30J0C64PgA6F+hMK/ZwezkDEj2U975UMUaTmNj1ANb0Y1r83vM115Sxkq4A6+peLcO5yFZZWs ymZrkPR5T4osj1LkQsSxAg9HOf0Z988tUozvlikkb/x6bJh7iOTHRUMs50lAsEIpLhYVeF86mjUIr mEKJTCEjsu7e1HTeZVt6679g64w4PGRWivIIBgZM85EiDBLgpc/4KETJ8tWaZSgk15Gz+G1qrYxF8 fyrdGXUxaYK+DRifMUFuveS6eqwPz+3cQ0oXQ+l6HjxGKPWape40v583ywubK9o45oiRmlYaHNNxp QsH5E2uQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eLxWF-0000oL-7K; Mon, 04 Dec 2017 20:39:15 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLxTS-0006Ca-P3 for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2017 20:36:30 +0000 Received: by mail-wm0-x244.google.com with SMTP id f206so10420069wmf.5 for ; Mon, 04 Dec 2017 12:36:06 -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=0jA6jwwKq/w9QX6Sb+PJi/1faDcXiI97NtbAWON3tMM=; b=Cw6UZNtTULNDo1fU/X6OUgrpJg6o7i9Nxa/HjHIEpXefoNbs+a0eJG418L0b5/7c5q HBm8ga56pJaFMEDdHW2g90eMPfTwB/FKVDQKS66BuA4Pz7vWwjM0Jozd7GOLEDfETpjN Sj19ZmNRe13XXGzsNdsQoweK++GQ0YpJrFMmgSzxMHh4nvtpsKbc0oPYsmx92f8ij4VD GGimReEl2WbpMIYKdUgzmzligAU111zSBHm5xH2VEY0m0WicFRAC5iZ+M18LF/XYxn2L 1ksvYdUf4ATG0FK89qsINutfP0KCrhgkgclJkJTLdQ2+ghjWBO0tO1fctBo3823VKLt8 wPZA== 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=0jA6jwwKq/w9QX6Sb+PJi/1faDcXiI97NtbAWON3tMM=; b=RDnSlzBpU2Qs1yCH40/sx7uN2kQS/ozHMwmMC3HMCyh4H3eyZdgJoQn3rGXoRYjcI2 5GV/gMFtgUrT8F+WCOpnoS414YWl27qIQgCiTGYZ4PHYKwTKeJFMOpUMgzLREOjjotpG WqfUxb+4dEwEfx0Ram7UflhoQt4HOVmpEahNaFcbhCD9H6kA+HVsGJR+MQnr1mQjvkK5 A75l833nwu6odOGRUtwT40VLbi+W2sGgPCjN7yTfazq70yMuKDnPyav1y4GgGkWhQQcv w1+C6DNYhL6LWHh46VAmQPOuuBI7c6ZSyM2j7XFz6aOQ5pqCWzAQ8toQnjyxbF2TAfGC RF7w== X-Gm-Message-State: AKGB3mJD2vE6OUCa1HU0bx39QzkIrlb8IdXdbwbwms4rjTVJxhEfSpEG V+93+DU7c0a4P0XYobF84UelTw== X-Google-Smtp-Source: AGs4zMbcOXdLLFKvrX6kVFhAZhjqnoumP7Njt+KqnF197iTzI7VZxnVTA52ADCtTBDNjLrc70j5hcA== X-Received: by 10.80.165.41 with SMTP id y38mr1230084edb.72.1512419765211; Mon, 04 Dec 2017 12:36:05 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 12:36:04 -0800 (PST) From: Christoffer Dall To: kvm@vger.kernel.org Subject: [PATCH v3 12/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_get_fpu Date: Mon, 4 Dec 2017 21:35:34 +0100 Message-Id: <20171204203538.8370-13-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171204_123623_738906_5A475054 X-CRM114-Status: GOOD ( 11.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Andrew Jones , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Marc Zyngier , James Hogan , Cornelia Huck , kvm-ppc@vger.kernel.org, Paul Mackerras , Christian Borntraeger , linux-arm-kernel@lists.infradead.org, Paolo Bonzini , linux-s390@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Christoffer Dall MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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_get_fpu(). Reviewed-by: David Hildenbrand Signed-off-by: Christoffer Dall Reviewed-by: Cornelia Huck --- arch/s390/kvm/kvm-s390.c | 4 ++++ arch/x86/kvm/x86.c | 7 +++++-- virt/kvm/kvm_main.c | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 4bf80b57b5c1..88dcb89656be 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2765,6 +2765,8 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) { + vcpu_load(vcpu); + /* make sure we have the latest values */ save_fpu_regs(); if (MACHINE_HAS_VX) @@ -2773,6 +2775,8 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) else memcpy(fpu->fprs, vcpu->run->s.regs.fprs, sizeof(fpu->fprs)); fpu->fpc = vcpu->run->s.regs.fpc; + + vcpu_put(vcpu); return 0; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5d19caee6d51..19b70e016858 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7678,9 +7678,11 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, int kvm_arch_vcpu_ioctl_get_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(fpu->fpr, fxsave->st_space, 128); fpu->fcw = fxsave->cwd; fpu->fsw = fxsave->swd; @@ -7690,6 +7692,7 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) fpu->last_dp = fxsave->rdp; memcpy(fpu->xmm, fxsave->xmm_space, sizeof fxsave->xmm_space); + vcpu_put(vcpu); return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c688eb777bec..73ad70af6b2d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2673,9 +2673,7 @@ static long kvm_vcpu_ioctl(struct file *filp, r = -ENOMEM; if (!fpu) goto out; - vcpu_load(vcpu); r = kvm_arch_vcpu_ioctl_get_fpu(vcpu, fpu); - vcpu_put(vcpu); if (r) goto out; r = -EFAULT;