From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kurz Date: Thu, 24 Oct 2019 07:05:27 +0000 Subject: Re: [PATCH 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Message-Id: <20191024090527.6b73a3bc@bahia.lan> List-Id: References: <20191022015925.31916-1-sean.j.christopherson@intel.com> <20191022015925.31916-3-sean.j.christopherson@intel.com> In-Reply-To: <20191022015925.31916-3-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Cornelia Huck , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org On Mon, 21 Oct 2019 18:58:42 -0700 Sean Christopherson wrote: > Explicitly free the shared page if kvmppc_mmu_init() fails during > kvmppc_core_vcpu_create(), as the page is freed only in > kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit(). > > Fixes: 96bc451a15329 ("KVM: PPC: Introduce shared page") > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- Reviewed-by: Greg Kurz > arch/powerpc/kvm/book3s_pr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index cc65af8fe6f7..3f6ad3f58628 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -1769,10 +1769,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, > > err = kvmppc_mmu_init(vcpu); > if (err < 0) > - goto uninit_vcpu; > + goto free_shared_page; > > return vcpu; > > +free_shared_page: > + free_page((unsigned long)vcpu->arch.shared); > uninit_vcpu: > kvm_vcpu_uninit(vcpu); > free_shadow_vcpu: From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8425CA9EBC for ; Thu, 24 Oct 2019 08:08:14 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 9A06A20684 for ; Thu, 24 Oct 2019 08:08:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A06A20684 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3FB9C4A847; Thu, 24 Oct 2019 04:08:14 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2QXiYBwrT2fj; Thu, 24 Oct 2019 04:08:12 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id BD7214A7D7; Thu, 24 Oct 2019 04:08:11 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 11AE24A659 for ; Thu, 24 Oct 2019 03:06:19 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N9SoSwAbGUbt for ; Thu, 24 Oct 2019 03:06:18 -0400 (EDT) Received: from 3.mo178.mail-out.ovh.net (3.mo178.mail-out.ovh.net [46.105.44.197]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id E6C6D4A555 for ; Thu, 24 Oct 2019 03:06:17 -0400 (EDT) Received: from player737.ha.ovh.net (unknown [10.108.35.27]) by mo178.mail-out.ovh.net (Postfix) with ESMTP id C3D1D7C318 for ; Thu, 24 Oct 2019 09:06:16 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player737.ha.ovh.net (Postfix) with ESMTPSA id DFAA11E5A0F5; Thu, 24 Oct 2019 07:05:28 +0000 (UTC) Date: Thu, 24 Oct 2019 09:05:27 +0200 From: Greg Kurz To: Sean Christopherson Subject: Re: [PATCH 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Message-ID: <20191024090527.6b73a3bc@bahia.lan> In-Reply-To: <20191022015925.31916-3-sean.j.christopherson@intel.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> <20191022015925.31916-3-sean.j.christopherson@intel.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Ovh-Tracer-Id: 5577708138938931537 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrledtgdduudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-Mailman-Approved-At: Thu, 24 Oct 2019 04:08:10 -0400 Cc: Wanpeng Li , kvm@vger.kernel.org, James Hogan , linux-kernel@vger.kernel.org, Paul Mackerras , kvmarm@lists.cs.columbia.edu, Janosch Frank , Marc Zyngier , Joerg Roedel , David Hildenbrand , Christian Borntraeger , kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jim Mattson , Cornelia Huck , linux-mips@vger.kernel.org, Paolo Bonzini , Vitaly Kuznetsov X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Mon, 21 Oct 2019 18:58:42 -0700 Sean Christopherson wrote: > Explicitly free the shared page if kvmppc_mmu_init() fails during > kvmppc_core_vcpu_create(), as the page is freed only in > kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit(). > > Fixes: 96bc451a15329 ("KVM: PPC: Introduce shared page") > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- Reviewed-by: Greg Kurz > arch/powerpc/kvm/book3s_pr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index cc65af8fe6f7..3f6ad3f58628 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -1769,10 +1769,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, > > err = kvmppc_mmu_init(vcpu); > if (err < 0) > - goto uninit_vcpu; > + goto free_shared_page; > > return vcpu; > > +free_shared_page: > + free_page((unsigned long)vcpu->arch.shared); > uninit_vcpu: > kvm_vcpu_uninit(vcpu); > free_shadow_vcpu: _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D7C4CA9EBC for ; Thu, 24 Oct 2019 09:34:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CBA020684 for ; Thu, 24 Oct 2019 09:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404261AbfJXJeV (ORCPT ); Thu, 24 Oct 2019 05:34:21 -0400 Received: from 13.mo3.mail-out.ovh.net ([188.165.33.202]:50791 "EHLO 13.mo3.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732686AbfJXJeV (ORCPT ); Thu, 24 Oct 2019 05:34:21 -0400 X-Greylist: delayed 8884 seconds by postgrey-1.27 at vger.kernel.org; Thu, 24 Oct 2019 05:34:21 EDT Received: from player737.ha.ovh.net (unknown [10.108.35.110]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 54E1E22C0C8 for ; Thu, 24 Oct 2019 09:06:16 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player737.ha.ovh.net (Postfix) with ESMTPSA id DFAA11E5A0F5; Thu, 24 Oct 2019 07:05:28 +0000 (UTC) Date: Thu, 24 Oct 2019 09:05:27 +0200 From: Greg Kurz To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Cornelia Huck , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Message-ID: <20191024090527.6b73a3bc@bahia.lan> In-Reply-To: <20191022015925.31916-3-sean.j.christopherson@intel.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> <20191022015925.31916-3-sean.j.christopherson@intel.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 5577708138938931537 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrledtgdduudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Mon, 21 Oct 2019 18:58:42 -0700 Sean Christopherson wrote: > Explicitly free the shared page if kvmppc_mmu_init() fails during > kvmppc_core_vcpu_create(), as the page is freed only in > kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit(). > > Fixes: 96bc451a15329 ("KVM: PPC: Introduce shared page") > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- Reviewed-by: Greg Kurz > arch/powerpc/kvm/book3s_pr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index cc65af8fe6f7..3f6ad3f58628 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -1769,10 +1769,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, > > err = kvmppc_mmu_init(vcpu); > if (err < 0) > - goto uninit_vcpu; > + goto free_shared_page; > > return vcpu; > > +free_shared_page: > + free_page((unsigned long)vcpu->arch.shared); > uninit_vcpu: > kvm_vcpu_uninit(vcpu); > free_shadow_vcpu: From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFEC4CA9EAF for ; Thu, 24 Oct 2019 07:06:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0A452166E for ; Thu, 24 Oct 2019 07:06:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oiQ2BGj6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0A452166E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vxmQ/ZnElsF8JoWv566wBWw0PlZk/3J3LbSCFHgJ5rw=; b=oiQ2BGj6LnZRw+ pvut0K826PntHSCxx2WTPgb8Im0Ghq+wTedh88bno0/wkh4xbxDQfm4FnduTsigrzCcww7RVmy+Ub rRmWukuUYQt4uiS6hNeEu8TN22+PW5RwMmkVmQ4/f6G9kjDLYJr2Oe6W2uC9sh/NcxAxwTgKZu1C0 E0ZB9AviA5gpxglNwMjkngjtEw8eYP9hnY0n92c6NE5MbcZQOu19vpUjfPPx6PvT5qCr4JXWKmAta dSN102+Q0vngUO+H52i721ZPlnX8GwoC0GrthLpUlAFoWLQbYLq9UlVgRCvb0+R+6x49BZXaWnHg4 G+945MCf6yWm3LqRlg1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNXCS-00077L-7j; Thu, 24 Oct 2019 07:06:24 +0000 Received: from 5.mo7.mail-out.ovh.net ([178.32.120.239]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNXCP-000705-5g for linux-arm-kernel@lists.infradead.org; Thu, 24 Oct 2019 07:06:22 +0000 Received: from player737.ha.ovh.net (unknown [10.108.57.188]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 5BB5D138CDF for ; Thu, 24 Oct 2019 09:06:17 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player737.ha.ovh.net (Postfix) with ESMTPSA id DFAA11E5A0F5; Thu, 24 Oct 2019 07:05:28 +0000 (UTC) Date: Thu, 24 Oct 2019 09:05:27 +0200 From: Greg Kurz To: Sean Christopherson Subject: Re: [PATCH 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails Message-ID: <20191024090527.6b73a3bc@bahia.lan> In-Reply-To: <20191022015925.31916-3-sean.j.christopherson@intel.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> <20191022015925.31916-3-sean.j.christopherson@intel.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Ovh-Tracer-Id: 5577708138938931537 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrledtgdduudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191024_000621_355462_917E164D X-CRM114-Status: GOOD ( 14.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wanpeng Li , kvm@vger.kernel.org, Radim =?UTF-8?B?S3LEjW3DocWZ?= , James Hogan , linux-kernel@vger.kernel.org, Paul Mackerras , kvmarm@lists.cs.columbia.edu, Janosch Frank , Marc Zyngier , Joerg Roedel , David Hildenbrand , Christian Borntraeger , Julien Thierry , Suzuki K Poulose , kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jim Mattson , Cornelia Huck , linux-mips@vger.kernel.org, James Morse , Paolo Bonzini , Vitaly Kuznetsov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 21 Oct 2019 18:58:42 -0700 Sean Christopherson wrote: > Explicitly free the shared page if kvmppc_mmu_init() fails during > kvmppc_core_vcpu_create(), as the page is freed only in > kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit(). > > Fixes: 96bc451a15329 ("KVM: PPC: Introduce shared page") > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- Reviewed-by: Greg Kurz > arch/powerpc/kvm/book3s_pr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c > index cc65af8fe6f7..3f6ad3f58628 100644 > --- a/arch/powerpc/kvm/book3s_pr.c > +++ b/arch/powerpc/kvm/book3s_pr.c > @@ -1769,10 +1769,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, > > err = kvmppc_mmu_init(vcpu); > if (err < 0) > - goto uninit_vcpu; > + goto free_shared_page; > > return vcpu; > > +free_shared_page: > + free_page((unsigned long)vcpu->arch.shared); > uninit_vcpu: > kvm_vcpu_uninit(vcpu); > free_shadow_vcpu: _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel