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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCD89C4332F for ; Wed, 29 Sep 2021 22:27:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 480D26142A for ; Wed, 29 Sep 2021 22:27:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 480D26142A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 5F44A940062; Wed, 29 Sep 2021 18:27:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A2D494003A; Wed, 29 Sep 2021 18:27:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 49183940062; Wed, 29 Sep 2021 18:27:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0158.hostedemail.com [216.40.44.158]) by kanga.kvack.org (Postfix) with ESMTP id 37ACC94003A for ; Wed, 29 Sep 2021 18:27:21 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F0614182EE034 for ; Wed, 29 Sep 2021 22:27:20 +0000 (UTC) X-FDA: 78642048240.38.9D88C9E Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf07.hostedemail.com (Postfix) with ESMTP id 93FDF10001DF for ; Wed, 29 Sep 2021 22:27:20 +0000 (UTC) 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: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 93FDF10001DF X-Stat-Signature: bw5zckugm947qoategfbpow7wbwfwtsu Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Jz6oAJgi; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of rppt@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=rppt@kernel.org X-HE-Tag: 1632954440-934080 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 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.