From patchwork Thu Nov 23 13:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13466230 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 B49F1C5AD4C for ; Thu, 23 Nov 2023 13:31:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 448148D0025; Thu, 23 Nov 2023 08:31:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F7218D0002; Thu, 23 Nov 2023 08:31:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 272788D0025; Thu, 23 Nov 2023 08:31:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 133008D0002 for ; Thu, 23 Nov 2023 08:31:13 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D26D540E16 for ; Thu, 23 Nov 2023 13:31:12 +0000 (UTC) X-FDA: 81489305184.07.99D0484 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by imf24.hostedemail.com (Postfix) with ESMTP id 11A6618002D for ; Thu, 23 Nov 2023 13:31:10 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=d5CHLX57; spf=pass (imf24.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.188 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=1700746271; 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=nGnKScZww5hZXWYTDAjHhsju7kmgmcYLYNYxHMYgc28=; b=nw/xnVsw1jfzZczJP7uSq6e+ef64KSxL3p5QLILaqTXaJ9/GkRAprGCDTdjjmeaOd0szj5 e/54GXMilJadYm1B4gDXMdQdvEReRu1eU0gSKnJkFRfMYYf+q3Dck0N3sXdJbRqsEZ/9h4 y5rRvb9F4e4CKGd+MTL1jM0rPY5BUKM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700746271; a=rsa-sha256; cv=none; b=uTpf4ldROPHUq4ushPKug+vLutFyEhEj2RTUgK2ZU7SD5C0QQM/ImiUoDRzv5g5qnHy2YA A3Gy0ZJGLw+IbhBl9qTG1A+mdun46L3Ih+KQephV08bBVHtELNm/x2YUcp3rvmGtXdCtL9 8amzj6SdZBNfsFjTLeUNFkVuf7cd5NE= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=d5CHLX57; spf=pass (imf24.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.188 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=1700746269; 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=nGnKScZww5hZXWYTDAjHhsju7kmgmcYLYNYxHMYgc28=; b=d5CHLX57cCOGxJdVkM1Rcs5gK8JkZKtdzrPAWDsIIXnn4bLS2WT8PJZozgQuz0CNFwb0nc 0T867ikyskX4+1d3xr9U6o5B04QY6IGfw21Vn6rpkQHu8CmkuXfiaUXsViDqqNzM3Lwggu BarejmtOHYkPWa7BTb5kD5s+K+Zxa3w= From: Gang Li To: Mike Kravetz , Muchun Song , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Gang Li Subject: [RFC PATCH v1 2/4] hugetlb: split hugetlb_hstate_alloc_pages Date: Thu, 23 Nov 2023 21:30:34 +0800 Message-Id: <20231123133036.68540-3-gang.li@linux.dev> In-Reply-To: <20231123133036.68540-1-gang.li@linux.dev> References: <20231123133036.68540-1-gang.li@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: iss6qfzn4uu3o76egwcyyuawe7pu513x X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 11A6618002D X-Rspam-User: X-HE-Tag: 1700746270-487747 X-HE-Meta: U2FsdGVkX1+69cFtr/0FE5NPWGVPj1f8FOhEsZsv/BZ0Fa5T34g7VpEnbUxafaQURXnHpItc+WaMKCoZtg+qsHQEUOu0T940h7W0KE5ikjDmXW5p8D3bsdJo+BeGDt84mBzE/vUjSK6GhvIoMpMzoY0iXVU7IFg4wpOLRTqJWBCsTiXvqRTUu3GDWdH4ROawWnqEM+JZr0m5juljuhafvxx/lcypj2knw/jpAAqxtCiQkqMkuIuKuWpdlwBPbXdj3cORgpDXlN8lBggrAbRJicuiKFbsgCeYd76H099zc8z8ypj93LK+dq6ObgpI376l4sbOy7fL2StrvKCZoaVglQ+4Vq0iFGdso96vwqI5Wjm38YEfRZE6N0XZmi/EkqnzXNPtat8RXjrSEuGYv40s9sTrWRhuoK0qzWnejcrzQVHfXLwZDiFZRRCgROF81Se/gbks+OmES5C3Gr/8nj4HJywX+jCBWqlcgElr+YFE6iYqc3Fc4UjYuUDBSzQL3JaflgdtK3DaJNVvPU5Y9RoFH6W5dYdbkLFuYftynMZLfwyHZj29GTuDGZRtzJeqLLQD8B8zqqaue7aWQP+874SLVy3b890fO1HV/E+yfY7CxT+XZXnM9FLUXPop6+tcDiazd4gGS4gY25dIu/cAxL9fdAmDUdYpYxa9E9PkT9rWziOlhoaPgdSkz/Dohs8ZP4TZWLibQnhRG5mmmp0KSkPHRT2U5q1/Fzx5qSRVqbFU2B+agrlDl4P1QeB9mSnuPrm01biHGGJxXm+qwH+5VCPRwk+QyRySoOf5TtQzWLY6Y03vyF1WzuHP+pxvKg7WmbwvhxkkTqv3lC8d6BA16TX01wRPjWgudao+p8MOYkRmQGKiKbLxTtv5CxhMp9r1SMWwQWrI0Zf+dKRFjaO2f5kZadrQ+o3DQD7TuXCUJXETfko/alaZqvLDxrnygYAWGOvc2x8vog8ETTknMAqyueL EwUeAlwo AqQE4rs/y0ReDuQMkOd/z0Sut5+kGFpyuFiMNIQHjsNW0cQRSxcXWYXJ+lxw1VZvJNfIeH0ytDKWi/fo3INIftl3MrZkseaNI+EcTOp5xHqt3DjX4Q7q5b9KFyKAAhxoeFNZeMSApZpVF/Lpn4mBKIh9WDnGW699hjK1xEUxfzl5oVr/LFUC7m3HJ9g== 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: From: Gang Li Split hugetlb_hstate_alloc_pages into gigantic and non-gigantic. These 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 7af2ee08ad1b..7f9ff0855dd0 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) +{ + 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. @@ -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)) { - /* - * 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)