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: