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 62E4DC10F04 for ; Fri, 8 Dec 2023 02:53:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B094F6B0088; Thu, 7 Dec 2023 21:53:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A6CA06B008A; Thu, 7 Dec 2023 21:53:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E5236B008C; Thu, 7 Dec 2023 21:53:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 76A6E6B0088 for ; Thu, 7 Dec 2023 21:53:13 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 40DEC160400 for ; Fri, 8 Dec 2023 02:53:13 +0000 (UTC) X-FDA: 81542129466.27.B35B81C Received: from out-176.mta0.migadu.com (out-176.mta0.migadu.com [91.218.175.176]) by imf15.hostedemail.com (Postfix) with ESMTP id 93537A000C for ; Fri, 8 Dec 2023 02:53:11 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IHnb3dgP; spf=pass (imf15.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.176 as permitted sender) smtp.mailfrom=gang.li@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702003991; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=n5rlcvDOEWSjvMRr90AdsF4YIrGIogPwB5/wbnheBkQ=; b=xlzbH1K3CsEO4ChYUDdlqXBPRbvcUilVAw4hdgbRh2ADOFUEzpWdSV4jwSlhs7d7V1oA/B eWpSrI5KtVQvGn3y/qEXD89RanDmFuzg4Zu76cCpsqTZnuExiBocnA9EWmnN0VcXkeJ+Kw 4R5+Fm7t7y6jlJoIJwcdnpsi7KebGqg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702003991; a=rsa-sha256; cv=none; b=vyZbKV0e7dYPpR03vG8jM6bsNrUmCoT+ds1i06BqIYTUqBBeHS8JAYRmcJV6WR8/auPdVJ NZDoVL9vz1ToW9lQBZgBZ/lYwIFaMS+7CrB7H4fotGq3M5qxaGGNdJ5b+Au7LCBRCJIaiP 6Qqf9WQMvyK/jBMGbsHQdlTNQCfiso8= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IHnb3dgP; spf=pass (imf15.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.176 as permitted sender) smtp.mailfrom=gang.li@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1702003990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n5rlcvDOEWSjvMRr90AdsF4YIrGIogPwB5/wbnheBkQ=; b=IHnb3dgPdv0XvvyaI7QPgxVi6IP+FjK3KVXTcR25SvOJ6PmLr1x9emJ+YfIcImJVapgyzg uJKyXe9nXu/y0CFNFbZWwF2f89s3kEfY8JD/9hR223k4PKPEJhAu3rW0LY4r//U8QAMS8M e2PUBAGxjgBmp5nM2aTp82P5yZ+s6bI= From: Gang Li To: David Hildenbrand , David Rientjes , Mike Kravetz , Muchun Song , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [RFC PATCH v2 2/5] hugetlb: split hugetlb_hstate_alloc_pages Date: Fri, 8 Dec 2023 10:52:37 +0800 Message-Id: <20231208025240.4744-3-gang.li@linux.dev> In-Reply-To: <20231208025240.4744-1-gang.li@linux.dev> References: <20231208025240.4744-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 93537A000C X-Rspam-User: X-Stat-Signature: u77rjrtxnjdz891dhkdojnwcr9wsned8 X-Rspamd-Server: rspam03 X-HE-Tag: 1702003991-162540 X-HE-Meta: U2FsdGVkX18MhE3Lg0pR8K6gBZUG7U+FTuqhXhRrl3K6T+05zZRJsiAlf271cOfpjt6Xg0ZLK+4eMZ2Hw+gncEx1uOFTD6RXL01/98CobgON9jNToJbH1NuyLlZBNfFQKtKNBm/yTkX2X/Ft+CliZEvkCOru+Za502Q8NyKsd5GL6MrSX6FoutssxElL1RjauKcEEMo0afhVePfWxxeJhALHnSX6ChaNapZSq8apLNQHzH/ArJd6Q8vz5jVuxoRI2IWlhvoL8wCaTRissukglsPDmrgrBSn9kP681PzrKYuQfky6ndq4W4y5jeyCWaHmPXrP/ZYIK1afwN+Sm+/xQIDlf5E3JncUiBmJFYIAsvVPkb1+G7Z3c6P68vmpasykKXzw6ZdqiskZqHfGM9JMjRoc8MnF16DVCBbrtrtRVwcDq0Q0E83lIa77v08w87Z1OCVxm2INQFRbn4l4S8BW1hVb2G/EZZuqrKk3ljIquNCyvVMa7vKR06vb8TPotjXw7Ml3YktyNJ+jZGdKgUK/eq58G/qhAemBNv0PkB7+VA3zZYzJrP2X8Yxv859xWS2G48cy0mB2etFNR28xtOJyvT4u98AARmk9oIPu9KsaW9jjHQ3y2pj2JpnGllKEFeM7oRHLxdqCly0V68WkKM6lffV7nyfmn6Y5or1pKLjy4+Tr9yMDS2RuAYwUGDrAmBWNh7CBELY3D67m+6p30SGHyokGW5Rb0tYUQhkSBy659IFkzbK87oJH8lhd4JJHsSTncP6P8rufgv8FBEJRm+bz9GR9KkUlfVXdHKwQ/P32oCUzTdqMpT/y1ZscB9NeD6+zKvwmno9R59FSYcOTBOdc7tevuvh7J9+FlYiOAEryUjPiOTagJcgbh7HBulzVv96SsObAkpmYbY1L9esfbfwMA/iWXFITmPzJCVeKndND6RhNsMAubstiHiMaCbTowDMrmIISYXH232U6dt9hYxa /Nk4f+kt EBHZ+DxnaNBQCjRlpWwX/BAvCpY4d//nyFSUw8l1LTIcTHd10wTDBZ1MNDWgCJWTMLqYkrgdyM5KN6YSAN66tZ69u3CVwtYzaKXPFG/aVbvEPRp7GUg4Tjv4eIjlMYAxe6PZU 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: 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 252d6866a0af8..8de1653fc4c4f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3502,6 +3502,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) +{ + 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) +{ + 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. @@ -3515,10 +3556,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) { @@ -3532,46 +3570,12 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) /* below will do all node balanced alloc */ if (!hstate_is_gigantic(h)) { - /* - * 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) -- 2.30.2