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 7E269C4707B for ; Thu, 18 Jan 2024 12:39:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 089D16B0087; Thu, 18 Jan 2024 07:39:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 039A86B0088; Thu, 18 Jan 2024 07:39:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCDDE6B0089; Thu, 18 Jan 2024 07:39:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C7EB26B0087 for ; Thu, 18 Jan 2024 07:39:28 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A81D71A0C5E for ; Thu, 18 Jan 2024 12:39:28 +0000 (UTC) X-FDA: 81692387616.10.23E90CA Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) by imf07.hostedemail.com (Postfix) with ESMTP id EC79040011 for ; Thu, 18 Jan 2024 12:39:26 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ld/KqK0Y"; spf=pass (imf07.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=gang.li@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705581567; a=rsa-sha256; cv=none; b=1k3qohOd/pHj7oKyy+EA0UoKb/uQe7k9EXdmYniA9piX7uyBFjiGiSUseWD3FlWWyO8TMy 46pQOq8nxwtUXEzhWyYEG2+WWw8OOlA2e2S2kCR8ckHxv6j7eD+xuAdNrhPTBD3G/IuRnq 7ND4TFMYfwRsI7K05/yRYWpRTYfpSXI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ld/KqK0Y"; spf=pass (imf07.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.181 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=1705581567; 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=exgQQskroYsjKda3OrjICjnI9J6CYuerAViQBeWOcMM=; b=FSsm8PO4K/5p9mSv8Ws0ZvOEnrj3+/daQNwYaUcD5BjOAywaLg8ApInY2/57VFukhpkBmb dBtE5daWlExiYGnFbNZVa2TAHOtiD+lhOGBnZPMUKj+VbbXNQh5ySiy+log/H+iNZmMgS6 f/ZC+52eIMRArMb8hgPAQg+4E9d/PME= 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=1705581565; 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=exgQQskroYsjKda3OrjICjnI9J6CYuerAViQBeWOcMM=; b=ld/KqK0Y/Y1LeAn4Qe2WZTyW0NNi8VHKXK3BJy4hanIhJD9xMJcew8Ixgtb3eA8ERmqBdm R6owPfumyPNVF2jVKQgXfW5pFSDWHi8zv1dVKrAEAuDYAznW6a5/5K8zzpwJdwf/TCPvaW gqxmTHiFCvdVIZt/Zobafc1g1WxuGi4= From: Gang Li To: David Hildenbrand , David Rientjes , Mike Kravetz , Muchun Song , Andrew Morton , Tim Chen Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [PATCH v4 2/7] hugetlb: split hugetlb_hstate_alloc_pages Date: Thu, 18 Jan 2024 20:39:06 +0800 Message-Id: <20240118123911.88833-3-gang.li@linux.dev> In-Reply-To: <20240118123911.88833-1-gang.li@linux.dev> References: <20240118123911.88833-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: EC79040011 X-Stat-Signature: p8x9npkzud8qz35p7swt7ycioe1buxwe X-Rspam-User: X-HE-Tag: 1705581566-516645 X-HE-Meta: U2FsdGVkX1/FSC1Wtceol3NzucZ3DVQbQQwjMW9l4voFcnDDxhbwDG7NKYsG09P2LkXWsZKfddg4N/AYkCyPTZ4/WKUTjBgzzfAKrLlFD2zDub47dR2bVvFnIwlEm+ZEiUZrgi/ueeI3KvMHWBODW5fpwDIx52DG2t9dZLei6BFkqns/34qtYkkRcrVDVljqNbZOUucRfeIBiv6aNrbE0KuuA+lhNpfRDhegEHx0tNKxl/kEjh5YImhXHzowJtfYKAWXWCxzhs7KH+2ChRtEQ44cytIyDObLx6z6AY1OCGAeIIhH3JOPvsyva8v7PEqVsWGJDO3Ihmdp7KKaWoMHVqWa//SZtRutIlkDBgo1SZgV/hjIHzB+wRypdc2k7ea1GU/E3J24e3QCbHUqluGmfzDdx2mCp0IvSiS5hFPDOddYZ6WPxoaZJwkPVvIlYky4mWF2B5CQ8Q0txA51oRtkfoc2KYT0ese+QEHdRbg3MI3v+CKwvVkD9yCOmR1ATWLvUJgRTGp8desFzXHhLoaLWI6EEpDnxkBba076tMdDs0GKL5qDJ1/l4q8bM0c/kjPhgLNIBuhlv6+gNl5MU2OLfa5WHbc2aAjv5h30tk/2XnZaFLWixLvqKwna2cccGOt2aQbkTCkpF6yO2EauzoIIECoobJ0rLDC2OHGGvCOy4yOYsWhqiqPHMS8+xX6QYPPcW3cfNqXhR6TQTLMnO5AM8IZveIiugDAwcHE2mBzmNUYGm1gWUqIITD4C6hmSdeROU+PyyfvppE1PovXEn26/ZaNGFI7YujGL7G5BGKwBoTJiX0RFwcclPcTl2tGHRjtyvxkHKGlE6R630CNtqcbDOij+5hDF/0Z9wlHTJxvX03XYqAlmDiqK9etczEnWnY27R9nVU4kskq/EOUle/OPrcOeDWQ/tKTeIQgrFy8PTT/0Es3iB6BZGn+V9mrZaP75JOQln7NsvxSjsQ8lLWUz dCKB7a9X RmuYiX2mJeq6Bc1M+6VlFg3v/DAG1ylBvAa2djTOwmcGHSB0x/aZ2zNeswD+ZRRVbYiQTPnKLjTdMpHLsL8IDppHqas7s0H6fmfVhPseNAhEin8gP7A0Nc/7s7o1P2EjJxkDN/aGFGcUdDQHgolC/odRCau0uzRuIpmp95seynR9FgzU= 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 Tested-by: David Rientjes Reviewed-by: Tim Chen --- mm/hugetlb.c | 87 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b8e4a6adefd6..98ae108e1fac 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3509,6 +3509,43 @@ static void __init hugetlb_hstate_alloc_pages_errcheck(unsigned long allocated, } } +static unsigned long __init hugetlb_gigantic_pages_alloc_boot(struct hstate *h) +{ + unsigned long i; + + for (i = 0; i < h->max_huge_pages; ++i) { + if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) + break; + cond_resched(); + } + + return i; +} + +static unsigned long __init hugetlb_pages_alloc_boot(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. @@ -3522,10 +3559,7 @@ static void __init hugetlb_hstate_alloc_pages_errcheck(unsigned long allocated, */ 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) { @@ -3538,47 +3572,12 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; /* 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); - } 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(); - } - - /* list will be empty if hstate_is_gigantic */ - prep_and_add_allocated_folios(h, &folio_list); + if (hstate_is_gigantic(h)) + allocated = hugetlb_gigantic_pages_alloc_boot(h); + else + allocated = hugetlb_pages_alloc_boot(h); - hugetlb_hstate_alloc_pages_errcheck(i, h); - kfree(node_alloc_noretry); + hugetlb_hstate_alloc_pages_errcheck(allocated, h); } static void __init hugetlb_init_hstates(void) -- 2.20.1