From patchwork Tue Feb 27 17:52:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 878791 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zrScP6BmGz9s19 for ; Wed, 28 Feb 2018 05:57:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZOf4oyaK"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zrScP4TpkzF1Vj for ; Wed, 28 Feb 2018 05:57:25 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZOf4oyaK"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::242; helo=mail-pl0-x242.google.com; envelope-from=wei.guo.simon@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZOf4oyaK"; dkim-atps=neutral Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zrRN801WbzDrvS for ; Wed, 28 Feb 2018 05:01:43 +1100 (AEDT) Received: by mail-pl0-x242.google.com with SMTP id c11-v6so8417240plo.0 for ; Tue, 27 Feb 2018 10:01:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nZQ8blA5IjL26Hg0aI9D7Rwq9a8csgTQLqqC2kfFuSY=; b=ZOf4oyaKxlM56iuoxyK0U3G5nJefz6hxqfGqpF0/2HaKvtrkwXmF05bZu6KNZE/U7+ vRBKX6aqF0nfRfpwqf2Gq6aRYNzaLZNqbtOywc6cnr5Ibkirqku5bVwr/bKr1QMUG0uU TnKYD3oB8OnoT6dsv8luXrHTgOE6Q4qwcWrs59F5GuXRROdh/AfzAx+E+bDNOVbth6f/ VgO9ZKAV/U+f1v/x00GTchtMLAkP7mmeoAPvUossrILeWTNkrxiivrd4EWN4MuUzieU2 UcUBpqSojMWDQ9UgsnGuN9CBfP5ZUtkPo2qom79WHV/cUrIGIgquZmsKbeh8Sq0q3lBl lRdQ== 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=nZQ8blA5IjL26Hg0aI9D7Rwq9a8csgTQLqqC2kfFuSY=; b=NCvr3v5qOSITozqQ1zq+0RTAXOVgAvEM2gdQ8R189iveGgb+f9JCVqJNav5D1dDH6c OcoD8MN4hv/DgYt6mx4+6OgmOkAjCuYd2GL58Fx4hyZ6HfybJT5GX6Zvubz2G8CZnupC S8kGn2JNZ1ZFSPEWTwWJIipFlc0IO4Ltg4ImkYqHVzkAoT/oS/bnBV31xPbFNbNDNuRj iagNTKjxMQ2/R135dDIkdeGnXoNqwdK2AxREvxg8QvcFfcDe+PwkMr2molBdmdlRoXWJ VeTHdv0WU48ZSrJKsCBU8U++xaKrmDSg8yCdp/vSSLvC0v8r+IZfl03hy9urJ4+GEL4r UWAQ== X-Gm-Message-State: APf1xPBXJHavIM/rJ1bSAzlhv2uCh8BfXy25/ZtTrc8Aq/vaTJEOqU8V FbVPnY5XdHpTsw2hDcPh32jClA== X-Google-Smtp-Source: AG47ELurLxj6J+QNPvmTY2pkHFVqoXd1W9D2x5Yd1X/ykREtRnQBK8sdDdzjp5OsAuQ97Bu7PwiRmw== X-Received: by 2002:a17:902:407:: with SMTP id 7-v6mr2274420ple.9.1519754501961; Tue, 27 Feb 2018 10:01:41 -0800 (PST) Received: from simonLocalRHEL7.x64 ([101.80.181.226]) by smtp.gmail.com with ESMTPSA id m83sm24360910pfk.107.2018.02.27.10.01.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 10:01:41 -0800 (PST) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 26/30] KVM: PPC: move vcpu_load/vcpu_put down to each ioctl case in kvm_arch_vcpu_ioctl Date: Wed, 28 Feb 2018 01:52:34 +0800 Message-Id: <1519753958-11756-16-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1519753958-11756-1-git-send-email-wei.guo.simon@gmail.com> References: <1519753958-11756-1-git-send-email-wei.guo.simon@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Guo , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Simon Guo Although we already have kvm_arch_vcpu_async_ioctl() which doesn't require ioctl to load vcpu, the sync ioctl code need to be cleaned up when CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL is not configured. This patch moves vcpu_load/vcpu_put down to each ioctl switch case so that each ioctl can decide to do vcpu_load/vcpu_put or not independently. Signed-off-by: Simon Guo --- arch/powerpc/kvm/powerpc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 2d10314..cf3effd 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -1629,16 +1629,16 @@ long kvm_arch_vcpu_ioctl(struct file *filp, void __user *argp = (void __user *)arg; long r; - vcpu_load(vcpu); - switch (ioctl) { case KVM_ENABLE_CAP: { struct kvm_enable_cap cap; r = -EFAULT; + vcpu_load(vcpu); if (copy_from_user(&cap, argp, sizeof(cap))) goto out; r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap); + vcpu_put(vcpu); break; } @@ -1647,12 +1647,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp, { struct kvm_one_reg reg; r = -EFAULT; + vcpu_load(vcpu); if (copy_from_user(®, argp, sizeof(reg))) goto out; if (ioctl == KVM_SET_ONE_REG) r = kvm_vcpu_ioctl_set_one_reg(vcpu, ®); else r = kvm_vcpu_ioctl_get_one_reg(vcpu, ®); + vcpu_put(vcpu); break; } @@ -1660,9 +1662,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp, case KVM_DIRTY_TLB: { struct kvm_dirty_tlb dirty; r = -EFAULT; + vcpu_load(vcpu); if (copy_from_user(&dirty, argp, sizeof(dirty))) goto out; r = kvm_vcpu_ioctl_dirty_tlb(vcpu, &dirty); + vcpu_put(vcpu); break; } #endif @@ -1671,7 +1675,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, } out: - vcpu_put(vcpu); return r; }