From patchwork Mon Dec 4 20:35:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10091501 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 77AB060327 for ; Mon, 4 Dec 2017 20:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B4322925F for ; Mon, 4 Dec 2017 20:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FA88293F9; Mon, 4 Dec 2017 20:37:20 +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 0AD9D2925F for ; Mon, 4 Dec 2017 20:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752273AbdLDUhI (ORCPT ); Mon, 4 Dec 2017 15:37:08 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:44469 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582AbdLDUgD (ORCPT ); Mon, 4 Dec 2017 15:36:03 -0500 Received: by mail-wm0-f68.google.com with SMTP id t8so8187517wmc.3 for ; Mon, 04 Dec 2017 12:36:03 -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=BYxEzG8gJrFWEYjTUtFwtsvYBcArbP6viheD4qC/x1Q=; b=FsARXudPrzqz0E1/0EiMZETgWYATGyk/M9iBJQ0MreQzJUwvC64BZsx43OOzC1iRHd TRMfQ/eh4FGZX57KXOPPuOQl65ZSKS4oykuuGwcyMGI0DPvcVxe30tPeGyr2b0jBVFu7 Ar+9jIvpKKcVZ9WZ7aPOwrRc+sNZgskNjRlPoTWRy8wvT/INHfegcsPp8rYkEKYvqXJK sRnLJie4J7Tn+dzBUNbeiVwa0xqpNo37urpREO2lSDcv/C+PEMpLbM7b4hekEvrf6vvn yVvrc52dufoC2rOcLMIRxGJvPVKrh1a9Rr0SIblgDD+vYOitahWeTpngWDbQyX/svoC3 NevQ== 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=BYxEzG8gJrFWEYjTUtFwtsvYBcArbP6viheD4qC/x1Q=; b=Zvm8M3BGDS2DmGEDTeNI7TiBYwWDtC0GEN7Q8ODM2DAgOjqP6NU+SWKCMs293IwBs2 T3d4cE1wSGL/5f/nvmfh0lpRhNQwJtn+1N7DbuU/9P5mYQjfc3bAnn+WTrnlGvieqoKE TWWC1VMqK2gkKZQ0/4rgmB8J/xB/E8yq9AXWUKxSfHi+Ii33IbgVc7dSNyU8MdTDkVGE bhmJl66Go2mUqH05C4vrB5fnbK/Otxliy7N2LQWy3sZkJoneqadaqON8ZiGHJ9AXAqfg iOakg/oyARrDMDGel2tPoVAsFXAE5V7NhO8VfcVSL5WS6N5JK6fsDV2JBQh6zJs1Mc0K 6/QQ== X-Gm-Message-State: AJaThX5vJr3ZjACTdEjd5JJ/mXkvNe8PWt4c52y0+T8SkTwG333ZD2Vt tZf8Mx2WnTidvIHNrmOD8sVh4fZvHn6zaA== X-Google-Smtp-Source: AGs4zMYwIdOa4odb5VniREcjYA1xyjXs7DFupcdKqpjbpXEJEpV0vFy2L0VLm2xoD1i46Iz2dhUe/A== X-Received: by 10.80.204.72 with SMTP id n8mr22306876edi.64.1512419762441; Mon, 04 Dec 2017 12:36:02 -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.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 12:36:01 -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 10/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_translate Date: Mon, 4 Dec 2017 21:35:32 +0100 Message-Id: <20171204203538.8370-11-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_translate(). Reviewed-by: David Hildenbrand Signed-off-by: Christoffer Dall Reviewed-by: Cornelia Huck --- arch/powerpc/kvm/booke.c | 2 ++ arch/x86/kvm/x86.c | 3 +++ virt/kvm/kvm_main.c | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index cdf0be02c95a..1b491b89cd43 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -1793,7 +1793,9 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, { int r; + vcpu_load(vcpu); r = kvmppc_core_vcpu_translate(vcpu, tr); + vcpu_put(vcpu); return r; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8e67428af01b..c30ba99e7aa3 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7660,6 +7660,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, gpa_t gpa; int idx; + vcpu_load(vcpu); + idx = srcu_read_lock(&vcpu->kvm->srcu); gpa = kvm_mmu_gva_to_gpa_system(vcpu, vaddr, NULL); srcu_read_unlock(&vcpu->kvm->srcu, idx); @@ -7668,6 +7670,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, tr->writeable = 1; tr->usermode = 0; + vcpu_put(vcpu); return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f3600052adbb..0a8a49073a23 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2627,9 +2627,7 @@ static long kvm_vcpu_ioctl(struct file *filp, r = -EFAULT; if (copy_from_user(&tr, argp, sizeof(tr))) goto out; - vcpu_load(vcpu); r = kvm_arch_vcpu_ioctl_translate(vcpu, &tr); - vcpu_put(vcpu); if (r) goto out; r = -EFAULT;