Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2119243ybl; Sun, 19 Jan 2020 19:35:16 -0800 (PST) X-Google-Smtp-Source: APXvYqx9NN4OK2AxrEUXMVQGCMAAnnDL2CBTHSIWDXO1aUyFqVNwvUl3YPN31AH2ie6uaGuhPbsX X-Received: by 2002:a05:6830:1e1c:: with SMTP id s28mr14269659otr.335.1579491316527; Sun, 19 Jan 2020 19:35:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579491316; cv=none; d=google.com; s=arc-20160816; b=OsfJ2JeZ/jrnKRT/+2sDamOYUXEVbRHGnZgadZ5tmR5gnhO1ol6fDzR7NvOMlKWp83 wjTBKJNGV6fRj4AhCLFuviEm/7B9KuWtKsE1TfcDOQOqIiM6Sw8+2WFERuBLBENEM0in 91GB3N0bLYynKA2TDxsiAGN/2qsEq+Sl18g0eI9L/kN5nl5a2PrJtbHZK4LjjwoEwrbb w8OEyBYd/gQNyyXh2vSZZ232LKiDgoAORKt+ZIlWJdxt9KQSeTJXJfyvqxHcCEIY5SDA MrZZomPP4DIxO0FuKLW9zYoIpEKx5NMFNCPCUCsNt5G5MxoHF+Lam6N2mf7fvDj5G53F Yq4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=BEHcNOxdfpQY5d4+nXSw4kK/iyo/LI7n4Ym33s4iCzE=; b=E8mgeKUw/5Da+K5Bz3vxEEBnFNEnN3xjiK07oz8fljVLWcq/3jFgE7OOBtdmx95DHX INnzJODPq4LgjloRykJmvKFW7HWf5LR9SLdn4JHhTv0oxutj5w6Opbju6Hju5MPaqe+X PccGBEGezF3SG7to4L+ptRHvzMP83RikTq7PPzF5QoViNqbIDGmYvD/th+wLHbJRUPkH qMUvLaQNYsMtzap68MDYg9PYygnKRmx6T9uUuEbfuQFt0VxTzHgDUxuyl8K/tT0UswQ0 0z6qS+ECAVdCd8j4sNWMudEnSJND6rsDyg+wl0n3gtboqYcp81N6RPDyomnB9pbku95q 1wAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ozlabs.org header.s=201707 header.b=BalvDW2w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ozlabs.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i124si16660435oif.214.2020.01.19.19.35.04; Sun, 19 Jan 2020 19:35:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ozlabs.org header.s=201707 header.b=BalvDW2w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ozlabs.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729142AbgATDeM (ORCPT + 99 others); Sun, 19 Jan 2020 22:34:12 -0500 Received: from ozlabs.org ([203.11.71.1]:37193 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729011AbgATDeM (ORCPT ); Sun, 19 Jan 2020 22:34:12 -0500 Received: by ozlabs.org (Postfix, from userid 1003) id 481HMj02PMz9sRK; Mon, 20 Jan 2020 14:34:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1579491249; bh=Bx1QENbI/taNJYozRF14LNd8JjoLRwCSpGh5bRXaoZc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BalvDW2whNPsvCmtISkbOhDMpZauUgvHl09Uaty2WElwJ6Cza+b4DeHGcnUNwOLV3 g6DRm1DMzCI/vBJ1PlZfghThTKRiDTXm/9cEYl1gDtPWzG4q+29NKYsabkOFnLKJZW pu7HnKn8KFD4ACQ0z1wJAaZ09+iERSqPxVmZuqJ9tVnb3xT4AbRscYT7AxP5jHVWa0 3Gb0VAa6x9zDA27RPpRqnF9yfWp6Q9n39W6+HvqOjYYy/h9z34BptPYaZs8RzgPLLz x8CTvY8aTo7+f8KU7v7y459Sv+srWbj2FDlNPNQXb3Ix1Y7vabAiDRVuXNEoR2XexB QTFYCAbB5+mEg== Date: Mon, 20 Jan 2020 13:57:16 +1100 From: Paul Mackerras To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Christian Borntraeger , Janosch Frank , Paolo Bonzini , 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, Greg Kurz Subject: Re: [PATCH v2 01/45] KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails Message-ID: <20200120025716.GA14307@blackberry> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> <20191218215530.2280-2-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191218215530.2280-2-sean.j.christopherson@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 18, 2019 at 01:54:46PM -0800, Sean Christopherson wrote: > Call kvm_vcpu_uninit() if vcore creation fails to avoid leaking any > resources allocated by kvm_vcpu_init(), i.e. the vcpu->run page. > > Fixes: 371fefd6f2dc4 ("KVM: PPC: Allow book3s_hv guests to use SMT processor modes") > Cc: stable@vger.kernel.org > Reviewed-by: Greg Kurz > Signed-off-by: Sean Christopherson > --- > arch/powerpc/kvm/book3s_hv.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index dc53578193ee..d07d2f5273e5 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2368,7 +2368,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm, > mutex_unlock(&kvm->lock); > > if (!vcore) > - goto free_vcpu; > + goto uninit_vcpu; > > spin_lock(&vcore->lock); > ++vcore->num_threads; > @@ -2385,6 +2385,8 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm, > > return vcpu; > > +uninit_vcpu: > + kvm_vcpu_uninit(vcpu); > free_vcpu: > kmem_cache_free(kvm_vcpu_cache, vcpu); > out: > -- > 2.24.1 Looks correct. Acked-by: Paul Mackerras