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=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7F896C10F27 for ; Tue, 10 Mar 2020 14:56:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4BA7720674 for ; Tue, 10 Mar 2020 14:56:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BA7720674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D4FE16B0007; Tue, 10 Mar 2020 10:56:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CFF9D6B0008; Tue, 10 Mar 2020 10:56:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C15FC6B000A; Tue, 10 Mar 2020 10:56:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id A753E6B0007 for ; Tue, 10 Mar 2020 10:56:50 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 85AED824805A for ; Tue, 10 Mar 2020 14:56:50 +0000 (UTC) X-FDA: 76579754580.06.vest69_1e99f38622336 X-HE-Tag: vest69_1e99f38622336 X-Filterd-Recvd-Size: 3986 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Mar 2020 14:56:50 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id p2so15477801wrw.7 for ; Tue, 10 Mar 2020 07:56:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GrLGwCNgXbztCMRReSyKuUa/Wr+RcCmi95sU2m2TGR8=; b=B3v8uGd915KzJz7g5vIMYzMuGJlZvuPnDx5wkjN/9K+Pw5DLMTGEE6/4M1RPW8N4ye PIbV9DFecvHzMCNF09Pavxl15q/SDt6HMY41Wf67HbAQZfD6w+wZL71p1/3+oDNUCUIx xR98TJTcAMGZ/FIpXbcDyaL0D1ibDovp7bO9MCszV7j6HTWlT4dBF/cTTSr4een2cOhj lO3Czg7dzNgJfmuCnUBtaMWgiLK/7Oza8xguBJkG12QIu9D8xKLLaeQyf+tlEcYnXf66 tMgcTuAbt9KkQCF54eaRzXQK2qK/mNYWHRFAEI2o6gMDhgaMCbbP+QkuX/eWDfJmREmx 35aw== X-Gm-Message-State: ANhLgQ15A7uYtrN/7eMj9HuABbbKebW86JJEjaqsXyIFohNNpQnBrkHe ysrvMvUpKal6sDu6uI0boHY= X-Google-Smtp-Source: ADFU+vuByKdUn9XJ2iY4aPSdnV5FvFJXdIwLh05Qa4WphMsMCFkF1Y3x+YJKcDeKdLoKQsCKZ8USog== X-Received: by 2002:a5d:6082:: with SMTP id w2mr27809592wrt.300.1583852209062; Tue, 10 Mar 2020 07:56:49 -0700 (PDT) Received: from localhost (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id h18sm4141209wmm.6.2020.03.10.07.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 07:56:48 -0700 (PDT) Date: Tue, 10 Mar 2020 15:56:47 +0100 From: Michal Hocko To: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, david@redhat.com, richardw.yang@linux.intel.com, dan.j.williams@intel.com, osalvador@suse.de, rppt@linux.ibm.com Subject: Re: [PATCH v3 7/7] mm/sparse.c: Use __get_free_pages() instead in populate_section_memmap() Message-ID: <20200310145647.GN8447@dhcp22.suse.cz> References: <20200307084229.28251-1-bhe@redhat.com> <20200307084229.28251-8-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200307084229.28251-8-bhe@redhat.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sat 07-03-20 16:42:29, Baoquan He wrote: > This removes the unnecessary goto, and simplify codes. > > Signed-off-by: Baoquan He > Reviewed-by: Wei Yang > --- > mm/sparse.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/mm/sparse.c b/mm/sparse.c > index fde651ab8741..266f7f5040fb 100644 > --- a/mm/sparse.c > +++ b/mm/sparse.c > @@ -735,23 +735,19 @@ static void free_map_bootmem(struct page *memmap) > struct page * __meminit populate_section_memmap(unsigned long pfn, > unsigned long nr_pages, int nid, struct vmem_altmap *altmap) > { > - struct page *page, *ret; > + struct page *ret; > unsigned long memmap_size = sizeof(struct page) * PAGES_PER_SECTION; > > - page = alloc_pages(GFP_KERNEL|__GFP_NOWARN, get_order(memmap_size)); > - if (page) > - goto got_map_page; > + ret = (void*)__get_free_pages(GFP_KERNEL|__GFP_NOWARN, > + get_order(memmap_size)); > + if (ret) > + return ret; > > ret = vmalloc(memmap_size); > if (ret) > - goto got_map_ptr; > + return ret; > > return NULL; > -got_map_page: > - ret = (struct page *)pfn_to_kaddr(page_to_pfn(page)); > -got_map_ptr: > - > - return ret; > } Boy this code is ugly. Is there any reason we cannot simply use kvmalloc_array(PAGES_PER_SECTION, sizeof(struct page), GFP_KERNEL | __GFP_NOWARN) And if we care about locality then go even one step further kvmalloc_node(PAGES_PER_SECTION * sizeof(struct page), GFP_KERNEL | __GFP_NOWARN, nid) -- Michal Hocko SUSE Labs