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=-14.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL 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 2B4B2C433DF for ; Tue, 9 Jun 2020 22:58:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03BBF206D5 for ; Tue, 9 Jun 2020 22:58:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jGKUzdkM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729095AbgFIW63 (ORCPT ); Tue, 9 Jun 2020 18:58:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729043AbgFIW5w (ORCPT ); Tue, 9 Jun 2020 18:57:52 -0400 Received: from mail-ua1-x942.google.com (mail-ua1-x942.google.com [IPv6:2607:f8b0:4864:20::942]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E67BC00862D for ; Tue, 9 Jun 2020 15:57:47 -0700 (PDT) Received: by mail-ua1-x942.google.com with SMTP id c15so188170uar.9 for ; Tue, 09 Jun 2020 15:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Xl5EexOSop6lv+UL7XlaACYBiSImdbhXFtk47GA4aNo=; b=jGKUzdkMHAPPrsDAO+KgKuAkBcwZtqhUNuimhvROzoJ9soMzQeLhFacPERf2F1XAt1 d2bGPLktS4oAbDypyJsO1bp4jOu+yrHrzisYt7q9+K1Hi0hoL3YOduunxwK7YD7Qt7z0 y3licW0I0Hm1qOPCUTKLoyKQp/3B2kLD9SN+DIFf4qUocN8tZ+JcyuvkpeJa+Nx5P9Na 1hfqO82s7cJ49zBil2iU4uF0YAvQfZ67+OT8TQ3PAwA47G7EZ666/1ojukkE3Jpdnxbt eMot5sAzs9ckGI/LQ9GzRveHRIuIi8iCm7iWgocOAu+Hv9q8sX3vAn7FZhDyBYP80Kmo spbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Xl5EexOSop6lv+UL7XlaACYBiSImdbhXFtk47GA4aNo=; b=q0JQnRJVWIZl/CwdAoyRFHNMpTe5z0LsuQa3YeSr1de6n5UXt2oTkHNI8KlHCtKgVW fiCQTgbojpf/Xbyjc2wVEi6WoLhvcukh26yuGyM9fD2k5hx0x200REOByPl7ZvcbakGf L5Z4mGC7PLEPLvLSzciqKOfkNCuFLe+khJHnzD53bjGxmx2X3T8IU1gO0cRvhmvwahvC 4k6nWRdDsbR9bcAb/fFE4qRitxVGLirUf5haUPpEOmB9NCOMxe0stf2+Ens+VMPIi++U 5ylwvD/Ikj/fJkrG9l3Zu7JGqaYatIwTIjFRhyLzx5ZDKrURyPOecVkJf6z3IVOzP0D6 SyIg== X-Gm-Message-State: AOAM531/5cfF0d8CFZed0Vl4Y41ufOPoPpIpBL+e5c7Ch3UEzZLU526b n34QFcbOglSnPE22yHoOPxYaQdF1q88xhBYrll+gbQ== X-Google-Smtp-Source: ABdhPJw+x8rHkvjQXtHjLxkujrakxTirbbawkFrKZAQkOg8tp5FX1PiZ/3qyVw3h4kYT7bC0/YyoJYi+dfxe0RsUL8o= X-Received: by 2002:ab0:70c9:: with SMTP id r9mr536687ual.15.1591743466435; Tue, 09 Jun 2020 15:57:46 -0700 (PDT) MIME-Version: 1.0 References: <20200605213853.14959-1-sean.j.christopherson@intel.com> <20200605213853.14959-5-sean.j.christopherson@intel.com> In-Reply-To: <20200605213853.14959-5-sean.j.christopherson@intel.com> From: Ben Gardon Date: Tue, 9 Jun 2020 15:57:35 -0700 Message-ID: Subject: Re: [PATCH 04/21] KVM: x86/mmu: Remove superfluous gotos from mmu_topup_memory_caches() To: Sean Christopherson Cc: Marc Zyngier , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Cornelia Huck , Claudio Imbrenda , 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@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Feiner , Peter Shier , Junaid Shahid , Christoffer Dall Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 5, 2020 at 2:39 PM Sean Christopherson wrote: > > Return errors directly from mmu_topup_memory_caches() instead of > branching to a label that does the same. > > No functional change intended. > > Signed-off-by: Sean Christopherson Reviewed-by: Ben Gardon > --- > arch/x86/kvm/mmu/mmu.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 36c90f004ef4..ba70de24a5b0 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -1100,13 +1100,11 @@ static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu) > r = mmu_topup_memory_cache(&vcpu->arch.mmu_pte_list_desc_cache, > 8 + PTE_PREFETCH_NUM); > if (r) > - goto out; > + return r; > r = mmu_topup_memory_cache(&vcpu->arch.mmu_page_cache, 8); > if (r) > - goto out; > - r = mmu_topup_memory_cache(&vcpu->arch.mmu_page_header_cache, 4); > -out: > - return r; > + return r; > + return mmu_topup_memory_cache(&vcpu->arch.mmu_page_header_cache, 4); > } > > static void mmu_free_memory_caches(struct kvm_vcpu *vcpu) > -- > 2.26.0 >