From patchwork Wed Nov 29 16:41:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 842659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EsH0KUch"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yn5sq6D4Xz9t9F for ; Thu, 30 Nov 2017 03:42:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933778AbdK2Qlj (ORCPT ); Wed, 29 Nov 2017 11:41:39 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35296 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933748AbdK2Qlh (ORCPT ); Wed, 29 Nov 2017 11:41:37 -0500 Received: by mail-wm0-f65.google.com with SMTP id f9so7259932wmh.0 for ; Wed, 29 Nov 2017 08:41:36 -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=OUilMp8GJQaK/3PwvYsmqwhU9F1Bw7TTcmnJ+kgxAzc=; b=EsH0KUchgJnLuoXIMMEHnN34ckAWO+4MwVdrxSl5frx/iFZ2aYA523lyJ75ebG7Jtp rIbM73ZP8Tf7a53msbjU+f7fVfDsQM9RFz1MiQWcei0t3uRvS4vlW0pA5EnciFExOtcH vpu0eI1K9PGwi1UXwiqabLauYP5/2MpWeWhjI= 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=OUilMp8GJQaK/3PwvYsmqwhU9F1Bw7TTcmnJ+kgxAzc=; b=R5Ht4hWlJioeYPEZ9oMgMH6wgW3Ldp+P88enkwQKSXEbXJPl3qc6N/jNhMmwufwNsN E4Ioox0FXqP3iKULTzZt3nM1TTDgx7xyfkSQ8gGSLIOOHXwhWB4f9dGG3QEejtchm8Mj kIZUfNtId3qbpUj1ZenmOvryMBZoNA0ezBAdKFFeuve10V4Be+vDF2EVWidm30NaO1Ib v30QaszTUehPODxAhMgOxCEd6j0reknM0D/xZg0kF7+Bi3ML4DR+buw3jf1LHo5hqLH4 V5XUOzUFbnUMt2XY9kmG8PVTEATxM+smoD7q94BT1ngx12pGeY3A8exajUz/oRVQCp0u K5tQ== X-Gm-Message-State: AJaThX7DvlKahgm0Gn0bdoXH9u17i2RHtizAxdDZrpKhld8hWsqi3oAo UbupaRBPjigcoXdtk8hH+TPSPA== X-Google-Smtp-Source: AGs4zMbGo+mooMxiNm+5eRst+CffGK3w8+C45r9XoZciINunC3heNytjH7jMPD7gcVjWDRH00MBsHA== X-Received: by 10.28.105.196 with SMTP id z65mr3173915wmh.146.1511973696121; Wed, 29 Nov 2017 08:41:36 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id e71sm2080765wma.13.2017.11.29.08.41.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Nov 2017 08:41:35 -0800 (PST) From: Christoffer Dall To: kvm@vger.kernel.org Cc: Andrew Jones , Christoffer Dall , Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , 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 v2 10/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_translate Date: Wed, 29 Nov 2017 17:41:10 +0100 Message-Id: <20171129164116.16167-11-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 Move vcpu_load() and vcpu_put() into the architecture specific implementations of kvm_arch_vcpu_ioctl_translate(). Signed-off-by: Christoffer Dall Reviewed-by: David Hildenbrand --- 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 cdf0be0..1b491b8 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 ee357b6..eb70974 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7661,6 +7661,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); @@ -7669,6 +7671,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 f360005..0a8a490 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;