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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 783FCC4706C for ; Tue, 16 Jan 2024 07:02:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFE886B0072; Tue, 16 Jan 2024 02:02:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BAE3F6B0074; Tue, 16 Jan 2024 02:02:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4F606B0075; Tue, 16 Jan 2024 02:02:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 91E326B0072 for ; Tue, 16 Jan 2024 02:02:51 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4D9D31C12F3 for ; Tue, 16 Jan 2024 07:02:51 +0000 (UTC) X-FDA: 81684281742.21.B914B49 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) by imf28.hostedemail.com (Postfix) with ESMTP id 44EFFC0014 for ; Tue, 16 Jan 2024 07:02:49 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CY3v5oPX; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of muchun.song@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705388569; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=txIZXYF3ib8b3sMorV8i+HMWWhDk4zrdCMBjUrUSGcU=; b=0jlvMdJfd0B2d6pP3ONFhFZK2GCWzXKgUKtPgNGvzx1wnXIQ0KoeqzPW2GyzF2mGsXbNcu tlElNdvBj4B6UDtfDrmhTNLVen3lyGPcFK/SiwcwZOvjHUupkY3r+XSC0i0oyWZ335Fnxm zAgpTpmra/TTktwM/1pDuHz9fO9XVTc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CY3v5oPX; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of muchun.song@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705388569; a=rsa-sha256; cv=none; b=rVbhVoN43UqN0hCJxtDUGXOOhjYcMy5of7xGrmmI+U11KyXANRYGPcAJW16oafFQrlViBE 50MUXSULITI0fmTbLUdZC0S95YGk4GOdorg1hM/FKkabte9WNqUa4ee4CAJy0geZY8nsD8 AzpDBt8cshSftihReSLepPB2xiungh0= Message-ID: <2ae5ec3f-4a96-4819-af65-5f04df0c2ebd@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705388567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=txIZXYF3ib8b3sMorV8i+HMWWhDk4zrdCMBjUrUSGcU=; b=CY3v5oPX0xoBC0az5ZLVLoe+HAbLsHFWvZK6etFK3WuzZWACmH4rJeBjk1R0x3Gmn6cbpw P9ctl84hv78h26yCYSMbAFvYHcIFLanU3X6e0fLa+liJoGBXoxSXRKMp1+sNDpAM2pk14R RQP+Iku3P5k+7HgWpokP3qotXilO5Kc= Date: Tue, 16 Jan 2024 15:02:39 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v3 2/7] hugetlb: split hugetlb_hstate_alloc_pages To: ligang.bdlg@bytedance.com, Gang Li Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , David Rientjes , Mike Kravetz , Andrew Morton , Tim Chen References: <20240102131249.76622-1-gang.li@linux.dev> <20240102131249.76622-3-gang.li@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20240102131249.76622-3-gang.li@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 44EFFC0014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4pq4s6f83dnwtzdkd43bm58wgi4n5puj X-HE-Tag: 1705388569-229689 X-HE-Meta: U2FsdGVkX19M+9X8KiAhpes1N9gOHTJRQ1M7aZZW5LEgtht6stToiClATQoI4/TANJWAK83B4YTGElNJcILZ1QPJP6PEMmJFRIwSJUW2np+PfnFNGzNby/4sCmHbAnM5qEewCAggo56wnnG0LS+s3a2zV3iugHPJ1iSHYbmJtGn/h3fwwbdRQqq4WSAFf8boXIJB8kF9RORaSj3Qv5dAPQPeNCtz4iOvP8gkEp9K/PkjqFOckYuXEmCDZ1rvegnqHLsYeWsYxQBu8ts/23EwdZPHFDGqJa3TLa8/RN6cSTXciwAy/ABH2QTBzyU+P+/3LI0O6h/KWjD5Ys2VSzC59Vou7eeTx7FJqJRjBjNl6DEbrjrBdM5ZFMa8LQbKza7UTHkuy5Rrwl9egau7ViDxsQX8SaB0jBNzo3QhvmcPtf1gqG7FgSD0ekxWdZiej5vLUS5UilY8xWjLXOSFvjqNBqVr8NM457gPzVbGmX5eOuwI4vEzo3ZwWHhN23FVH1IdJf3ocAs58i1TMFpdZhupTzcHUBnaDSPC9Om7/bxwt4JKdnpJ1BgZ0rug1xc5lboQYRLQwUUEHkA4ydqzwssuA9zICn0kBq5apSPv7kIDid7K1m+pScRF6tzeqBuwSClrhqOFVncJUaZ8zPuEc6IF4NigCTdpOrH69IU+hyMzmkIb6Mm6x0IkcJytUaEutIG/Qitka72SPRPCktwUlLbQUA9F5K33Dzp2t2Ch3KYHClrZGVOvmeO/ET3VfBuSldV1raD1FLYWx3CQbDHpKjuOTFXlF2XZSW02mlP3QM8lqZi9tXnSya8d93WKhVz6vLl0ugfzNdXmOwo7OVN4vgKlXO3HxUu0r1fBp0OsPen36NZDmZZlFdXyWnkaQ/bAutDLnXBf4RFJ+s1bgS7Jez51zVOrDpQn5ct49IXVrV8b5ds3iJvBzaYLCr4v7VIMJqgKMy2GCdb3U5n9rF6AqA6 3dhmvt+o 2mmygcBTgIBhIPCSun0zeekCQ3qFjUShmF2dMYaNOXzPKzQCyjF9aIBIKZfyPreEj7ysrKhfOso55UOO0Qnh/CGVeyHjEmcV3gbQsbVCQNDXrTidps8/Q28H+2pnE1C91PXtb 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: List-Subscribe: List-Unsubscribe: On 2024/1/2 21:12, Gang Li wrote: > 1G and 2M huge pages have different allocation and initialization logic, > which leads to subtle differences in parallelization. Therefore, it is > appropriate to split hugetlb_hstate_alloc_pages into gigantic and > non-gigantic. > > This patch has no functional changes. > > Signed-off-by: Gang Li > --- > mm/hugetlb.c | 86 +++++++++++++++++++++++++++------------------------- > 1 file changed, 45 insertions(+), 41 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2606135ec55e6..92448e747991d 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3509,6 +3509,47 @@ static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, st > } > } > > +static unsigned long __init hugetlb_hstate_alloc_pages_gigantic(struct hstate *h) The name is so long, how about hugetlb_gigantic_pages_alloc_boot? > +{ > + unsigned long i; > + > + for (i = 0; i < h->max_huge_pages; ++i) { > + /* > + * gigantic pages not added to list as they are not > + * added to pools now. > + */ > + if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) > + break; > + cond_resched(); > + } > + > + return i; > +} > + > +static unsigned long __init hugetlb_hstate_alloc_pages_non_gigantic(struct hstate *h) hugetlb_pages_alloc_boot? > +{ > + unsigned long i; > + struct folio *folio; > + LIST_HEAD(folio_list); > + nodemask_t node_alloc_noretry; > + > + /* Bit mask controlling how hard we retry per-node allocations.*/ > + nodes_clear(node_alloc_noretry); > + > + for (i = 0; i < h->max_huge_pages; ++i) { > + folio = alloc_pool_huge_folio(h, &node_states[N_MEMORY], > + &node_alloc_noretry); > + if (!folio) > + break; > + list_add(&folio->lru, &folio_list); > + cond_resched(); > + } > + > + prep_and_add_allocated_folios(h, &folio_list); > + > + return i; > +} > + > /* > * NOTE: this routine is called in different contexts for gigantic and > * non-gigantic pages. > @@ -3522,10 +3563,7 @@ static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, st > */ > static void __init hugetlb_hstate_alloc_pages(struct hstate *h) > { > - unsigned long i; > - struct folio *folio; > - LIST_HEAD(folio_list); > - nodemask_t *node_alloc_noretry; > + unsigned long allocated; > > /* skip gigantic hugepages allocation if hugetlb_cma enabled */ > if (hstate_is_gigantic(h) && hugetlb_cma_size) { > @@ -3539,46 +3577,12 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) > > /* below will do all node balanced alloc */ > if (!hstate_is_gigantic(h)) { It it unnecessary to reverse the condition. A little sime like following: if (hstate_is_gigantic(h))     /* gigantic pages */ else     /* normal pages */ > - /* > - * Bit mask controlling how hard we retry per-node allocations. > - * Ignore errors as lower level routines can deal with > - * node_alloc_noretry == NULL. If this kmalloc fails at boot > - * time, we are likely in bigger trouble. > - */ > - node_alloc_noretry = kmalloc(sizeof(*node_alloc_noretry), > - GFP_KERNEL); > + allocated = hugetlb_hstate_alloc_pages_non_gigantic(h); > } else { > - /* allocations done at boot time */ > - node_alloc_noretry = NULL; > - } > - > - /* bit mask controlling how hard we retry per-node allocations */ > - if (node_alloc_noretry) > - nodes_clear(*node_alloc_noretry); > - > - for (i = 0; i < h->max_huge_pages; ++i) { > - if (hstate_is_gigantic(h)) { > - /* > - * gigantic pages not added to list as they are not > - * added to pools now. > - */ > - if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) > - break; > - } else { > - folio = alloc_pool_huge_folio(h, &node_states[N_MEMORY], > - node_alloc_noretry); > - if (!folio) > - break; > - list_add(&folio->lru, &folio_list); > - } > - cond_resched(); > + allocated = hugetlb_hstate_alloc_pages_gigantic(h); > } > > - /* list will be empty if hstate_is_gigantic */ > - prep_and_add_allocated_folios(h, &folio_list); > - > - hugetlb_hstate_alloc_pages_report(i, h); > - kfree(node_alloc_noretry); > + hugetlb_hstate_alloc_pages_report(allocated, h); > } > > static void __init hugetlb_init_hstates(void)