Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1048135pxb; Wed, 29 Sep 2021 15:50:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlVATkpBnAC9J93yHjjzQdDmKiFF3VIDSGfMMVmituySOtKj5gYusEzBodhK13qTZAkU/0 X-Received: by 2002:a50:d94f:: with SMTP id u15mr3029087edj.140.1632955853823; Wed, 29 Sep 2021 15:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632955853; cv=none; d=google.com; s=arc-20160816; b=zQakv1NBxpHJLpcrOO8ihXcX2Rzrw17UCrUCVErHruGIbCCRxCIb+T4dpHXKFfI6L1 0fqQEFA+iP2YH+BCncDgOYY6lttAmxlYMdoWHIBZU3tWf7wyn3uTe2LonDcem+Udys7V Q1gMJzdbSYx4KDRUYIS3FYsLT007e/WuF/XP9iFHQL4Bahf9UjP86SY3kMsDtE5ceDtC DCMg2uiND6bXBwF/gTHq/INXsL3SpyAyVIoKRKlrkwIJr/BdKZSHa82Sz9+MpoViiqPP RupR7txdRhLWKXYUSpribxtcFo2Ag6FtLOHgBbGlJ33sWB8JlLgIq/K5VruJDAYI7cu9 s8wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=bCM3PXz0UMtCz+0m5/MSbqEpopgERIjAhCwoyxHjgFQ=; b=y7O0gpWdSxhcfCmuvkTbnIRVcsItmWTmst40StsfWxgcawnHCFbeT85u52wYbHCG6a IQVKaXfvI1j8QEC/t6THjZEUnC7gJIsCh5XFQRjumRmElfhiBJh3UuiQxGsxd2+2p7RM 37a2WgCqLRiqBHMmGdpwmZ7qfCLdGCjsgyec9GSwMOj1lZVh4T+sFObqFciHYXYCFAAo ElSAsMbNdweki7ElP1+JiFFe9VMB8tuiNUWZ23BY0Y8GsyZ0x6U9tTCGTQOuffEdKmY0 lDxglRoltOLBtpGXRIG8bUlRUPdsnwH2kOjQChBspV4JdWbjPcHaSctDrwYKLdw+hojh ixiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Jz6oAJgi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ar23si1400852ejc.736.2021.09.29.15.50.29; Wed, 29 Sep 2021 15:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Jz6oAJgi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346376AbhI2W3C (ORCPT + 99 others); Wed, 29 Sep 2021 18:29:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:44212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233018AbhI2W3B (ORCPT ); Wed, 29 Sep 2021 18:29:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7282461269; Wed, 29 Sep 2021 22:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632954439; bh=TiAVjeCvaMBmopk6bpwrU43wJ+DafuaJ7G6PBsfHy0E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Jz6oAJgibL7Zi8KnvG5mvLiNQWkmteIzSCvv39YAbDUvt4JYWxIHIdRNu4q59X+wT aHqyqFUOEWrLMgLMX7iTZibFx+4zrnwaUPj6uADTxk/gc8SIU+9pOUs3YdxOAteVt4 ze/5ZPUK4WQWixaNLvGv0i0GoEX2Q7nzCqZOODnTelY+ZYDQ/kYf7rdH4VouCAt7YK wmD47/35IsRCnLbgCZdeU2o+vDQ87hKi21V3lZqzZfQh35MGl/Hfymhmf0dgy4Zo9L ak5DTqwxohHLyC9XFewvEMqStkXAco5VueULwqnVc6qkV8zpKVRxTsvLKXU4gHUxgS AgIuaiaqyqKDg== Date: Wed, 29 Sep 2021 15:27:18 -0700 From: Mike Rapoport To: Nathan Chancellor Cc: Zhenguo Yao , mike.kravetz@oracle.com, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, corbet@lwn.net, akpm@linux-foundation.org, yaozhenguo@jd.com, willy@infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev Subject: Re: [PATCH v7] hugetlbfs: Extend the definition of hugepages parameter to support node allocation Message-ID: References: <20210927104149.46884-1-yaozhenguo1@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 29, 2021 at 12:24:06PM -0700, Nathan Chancellor wrote: > On Mon, Sep 27, 2021 at 06:41:49PM +0800, Zhenguo Yao wrote: > > We can specify the number of hugepages to allocate at boot. But the > > hugepages is balanced in all nodes at present. In some scenarios, > > we only need hugepages in one node. For example: DPDK needs hugepages > > which are in the same node as NIC. if DPDK needs four hugepages of 1G > > size in node1 and system has 16 numa nodes. We must reserve 64 hugepages > > in kernel cmdline. But, only four hugepages are used. The others should > > be free after boot. If the system memory is low(for example: 64G), it will > > be an impossible task. So, Extending hugepages parameter to support > > specifying hugepages at a specific node. > > For example add following parameter: > > > > hugepagesz=1G hugepages=0:1,1:3 > > > > It will allocate 1 hugepage in node0 and 3 hugepages in node1. > > > > Signed-off-by: Zhenguo Yao > > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > index 95dc7b83381f..ca00676a1bdd 100644 > > --- a/mm/hugetlb.c > > +++ b/mm/hugetlb.c > > @@ -66,6 +66,7 @@ static struct hstate * __initdata parsed_hstate; > > static unsigned long __initdata default_hstate_max_huge_pages; > > static bool __initdata parsed_valid_hugepagesz = true; > > static bool __initdata parsed_default_hugepagesz; > > +static unsigned int default_hugepages_in_node[MAX_NUMNODES] __initdata; > > > > /* > > * Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages, > > @@ -2868,33 +2869,41 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, > > return ERR_PTR(-ENOSPC); > > } > > > > -int alloc_bootmem_huge_page(struct hstate *h) > > +int alloc_bootmem_huge_page(struct hstate *h, int nid) > > __attribute__ ((weak, alias("__alloc_bootmem_huge_page"))); > > -int __alloc_bootmem_huge_page(struct hstate *h) > > +int __alloc_bootmem_huge_page(struct hstate *h, int nid) > > { > > struct huge_bootmem_page *m; > > int nr_nodes, node; > > > > + if (nid >= nr_online_nodes) > > + return 0; > > + /* do node specific alloc */ > > + if (nid != NUMA_NO_NODE) { > > + m = memblock_alloc_try_nid_raw(huge_page_size(h), huge_page_size(h), > > + 0, MEMBLOCK_ALLOC_ACCESSIBLE, nid); > > + if (m) > > + goto found; > > + else > > + return 0; > > + } > > + /* do all node balanced alloc */ > > for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { > > - void *addr; > > - > > - addr = memblock_alloc_try_nid_raw( > > + m = memblock_alloc_try_nid_raw( > > huge_page_size(h), huge_page_size(h), > > 0, MEMBLOCK_ALLOC_ACCESSIBLE, node); > > - if (addr) { > > - /* > > - * Use the beginning of the huge page to store the > > - * huge_bootmem_page struct (until gather_bootmem > > - * puts them into the mem_map). > > - */ > > - m = addr; > > + /* > > + * Use the beginning of the huge page to store the > > + * huge_bootmem_page struct (until gather_bootmem > > + * puts them into the mem_map). > > + */ > > + if (m) > > goto found; > > - } > > + else > > + return 0; > > } > > - return 0; > > > > found: > > - BUG_ON(!IS_ALIGNED(virt_to_phys(m), huge_page_size(h))); > > /* Put them into a private list first because mem_map is not up yet */ > > INIT_LIST_HEAD(&m->list); > > list_add(&m->list, &huge_boot_pages); > > This hunk causes a clang warning now: > > mm/hugetlb.c:2957:33: error: variable 'm' is used uninitialized whenever '&&' condition is false [-Werror,-Wsometimes-uninitialized] > for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > mm/hugetlb.c:1254:3: note: expanded from macro 'for_each_node_mask_to_alloc' > nr_nodes > 0 && \ > ^~~~~~~~~~~~ > mm/hugetlb.c:2974:18: note: uninitialized use occurs here > INIT_LIST_HEAD(&m->list); > ^ > mm/hugetlb.c:2957:33: note: remove the '&&' if its condition is always true > for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { > ^ > mm/hugetlb.c:2942:29: note: initialize the variable 'm' to silence this warning > struct huge_bootmem_page *m; > ^ > = NULL > 1 error generated. > > I am not sure if it is possible for nr_nodes to be 0 right out of the > gate so might be a false positive? With nr_nodes == 0 there will be no memory in the system :) -- Sincerely yours, Mike.