From patchwork Thu Nov 23 13:30:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13466229 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 28622C61DF7 for ; Thu, 23 Nov 2023 13:31:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B7918D0024; Thu, 23 Nov 2023 08:31:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6686E8D0002; Thu, 23 Nov 2023 08:31:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 509E68D0024; Thu, 23 Nov 2023 08:31:10 -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 406DB8D0002 for ; Thu, 23 Nov 2023 08:31:10 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 04718401D9 for ; Thu, 23 Nov 2023 13:31:09 +0000 (UTC) X-FDA: 81489305100.03.45A90AD Received: from out-187.mta0.migadu.com (out-187.mta0.migadu.com [91.218.175.187]) by imf27.hostedemail.com (Postfix) with ESMTP id 344E24002F for ; Thu, 23 Nov 2023 13:31:07 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PvITNhCa; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.187 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=1700746268; 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=rZ0xmMUhKXlLEkuqOXd+S2Kz2QguNe+dVlDKaJye92A=; b=IaXd9hMYsGZlTSrgnoX3I/XaBMgoNi4vkwCGNzERxHV3vY58IuLXtpEREy+JbBYdleNwLJ fpJiJG2izaVWakvx5IMej2ojkuy7H4fziSUPLzOcsm9gHeUK+7Q/aqH2WgyMMcjBO/x5yc GD/nKhuoeoIo4JZI+YbXjx3zgS2LFFA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700746268; a=rsa-sha256; cv=none; b=4SKSOs60IvYMfxujprCe0tQi0zASXFco2GQO+RTIOIZgqyZf1Co9Vv3OGGfA4zKhucQEA6 c0sxmK3Tbrf0CYpjA6I5LD3Z2ejODGQsJBTrcHpd+nyrPKZVjzKt4i9/w+t1/N3mXgvw6X 0c6ARWbSHn4nVJcg45fLEc87bMD+nUY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PvITNhCa; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.187 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=1700746266; 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=rZ0xmMUhKXlLEkuqOXd+S2Kz2QguNe+dVlDKaJye92A=; b=PvITNhCauLhoxZoDafpy0vQRZZqHvieig+ygz0sJ0KwQBDvhV9RPQ7WPfQpMHtWDAup4Yw MSno402iwprJTutoIIV7sPIPvxuHCpkEExhh6mVM441U9SnVOxB2WXeqSKZJ89qeRTXCh6 7CujJmPaqH11kwtg96cXGzPn5Hr9Caw= 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 1/4] hugetlb: code clean for hugetlb_hstate_alloc_pages Date: Thu, 23 Nov 2023 21:30:33 +0800 Message-Id: <20231123133036.68540-2-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-Rspamd-Queue-Id: 344E24002F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: mfu4o4ymubrqmscd9pfgp5xb9spee88z X-HE-Tag: 1700746267-756840 X-HE-Meta: U2FsdGVkX18YkpsUKUuveh4X6KjM0NiAcSmkVk84M/OPvZZ9Qqfms9awHLXbG5PwDYTpekMt9UT4V06kYhMweAI6cFP38OblipEe7iZdlPtAcIWUnDw4OpcqAQcEgagNvF2dMtQHUUg6cPLa3GBEQpoA9wMgS5RiRJu7tpqWROVltnC1tF2kDIM/6mTXWEWYfJS32MjLXJM7eQtEuVk0OJDkiE2BlKycBD5AW15x1fxw6ek9OdLi+TMKjoio9WhUN+3W9F+vSdS7600miBBJNsLAD9myrcpuZCNlbWSs8S3zHaN5JCCTd2VjWPOTrC7/n+uyCkimFTJgrHJ2GmAhFpv/kVVmzBdBOE5SYMqlNCDsGrIKl+cRgOy7Tq3ZAKkQNZr25iQT3Cs4ZLBSFB5oVsob5fXQEhhHKXiZ9SfprhR2XrEcxTjE63XrBShbM0wxHOEBMUYx1AiNXDsiGHpnMzGG1sZLg/TglPlYsV3LUWeucTYDXIBxo1EUZjumvvELsqWXj4iJMsd9iJ/U1ogQaMkIBzk8kQkNKw54rxp/nuUZvDbOh8b2hcmtPfW0nj4hOdv1XrvacYFrFw9V6NKAEBDBiTFfRqKdQ1wqTOzdNB6Jfq3uUefdwJuVdwwZR1NXisW+L9m5XofmjVnpPgzre/M3KfWtKWIvn0M62H9vOhg53+LU8hWsvUIuLgbP/CBcpxhczTz/Mi3ddRO88HrB7WiL9JgeujdIhMqpsHuYmcobWY7BXDgrUyDUl+K+r8OuNAiVp+qM65KOAIBpTKicrr2g+4oNUpb+lIDw0nhLUo/QS/DLdzdWvyoIMeVq5tKWS2Y7SnvnSJKSWVEpmRIM7NwyD6qQSHvsMxaAiwxMKbnklRJKJHjxVAIAHPSTxXeQhVJ79SeCJiRQfAfPY09zegUFGSNhJaiZHDCZmGAE3qNrVAm5FjlRrvVLmILAkUYJd7u8tmNUmjVM3g1v5xf ic8N24kb Bx3hxzNx1EbpRjWyB7jPowL5C5YBCDboxNaCiz1nUqWnDAB54p/ap44JmwqQDZx6gf858E3SLK2n4VAD5wNuUKYrASU7gMtSrHdYIG8HaXBty2TjFsrldVD6UB6E7Y01XjdZ5AFd8tFnc8ycU+CFIEM6EDNO0fBfET5G9GQiOLGQBq7Vpf44kg1dVqw== 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 This patch focus on cleaning up the code related to per node allocation and error reporting in the hugetlb alloc: - hugetlb_hstate_alloc_pages_node_specific() to handle iterates through each online node and performs allocation if necessary. - hugetlb_hstate_alloc_pages_report() report error during allocation. And the value of h->max_huge_pages is updated accordingly. This patch has no functional changes. Signed-off-by: Gang Li --- mm/hugetlb.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c466551e2fd9..7af2ee08ad1b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3482,6 +3482,33 @@ static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid) h->max_huge_pages_node[nid] = i; } +static bool __init hugetlb_hstate_alloc_pages_node_specific(struct hstate *h) +{ + int i; + bool node_specific_alloc = false; + + for_each_online_node(i) { + if (h->max_huge_pages_node[i] > 0) { + hugetlb_hstate_alloc_pages_onenode(h, i); + node_specific_alloc = true; + } + } + + return node_specific_alloc; +} + +static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, struct hstate *h) +{ + if (allocated < h->max_huge_pages) { + char buf[32]; + + string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32); + pr_warn("HugeTLB: allocating %lu of page size %s failed. Only allocated %lu hugepages.\n", + h->max_huge_pages, buf, allocated); + h->max_huge_pages = allocated; + } +} + /* * NOTE: this routine is called in different contexts for gigantic and * non-gigantic pages. @@ -3499,7 +3526,6 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) struct folio *folio; LIST_HEAD(folio_list); nodemask_t *node_alloc_noretry; - bool node_specific_alloc = false; /* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic(h) && hugetlb_cma_size) { @@ -3508,14 +3534,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) } /* do node specific alloc */ - for_each_online_node(i) { - if (h->max_huge_pages_node[i] > 0) { - hugetlb_hstate_alloc_pages_onenode(h, i); - node_specific_alloc = true; - } - } - - if (node_specific_alloc) + if (hugetlb_hstate_alloc_pages_node_specific(h)) return; /* below will do all node balanced alloc */ @@ -3558,14 +3577,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) /* list will be empty if hstate_is_gigantic */ prep_and_add_allocated_folios(h, &folio_list); - if (i < h->max_huge_pages) { - char buf[32]; - - string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32); - pr_warn("HugeTLB: allocating %lu of page size %s failed. Only allocated %lu hugepages.\n", - h->max_huge_pages, buf, i); - h->max_huge_pages = i; - } + hugetlb_hstate_alloc_pages_report(i, h); kfree(node_alloc_noretry); } 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) From patchwork Thu Nov 23 13:30:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13466231 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 8F738C61DF7 for ; Thu, 23 Nov 2023 13:31:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2993B8D004C; Thu, 23 Nov 2023 08:31:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 249DB8D0002; Thu, 23 Nov 2023 08:31:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 111678D004C; Thu, 23 Nov 2023 08:31:16 -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 F17F58D0002 for ; Thu, 23 Nov 2023 08:31:15 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C62AA40DE8 for ; Thu, 23 Nov 2023 13:31:15 +0000 (UTC) X-FDA: 81489305310.16.BC96556 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) by imf28.hostedemail.com (Postfix) with ESMTP id 08252C0008 for ; Thu, 23 Nov 2023 13:31:13 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Ztzwn0HQ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.179 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700746274; 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=ZmVKGX3xWVsiaI1L9mmzJOcNAtj7qPzayoGRggtSBII=; b=7eJx+pm6n2Si5mIE2jMNfPuZ38/K8q0ewAD/ZyawDqrLNbbW8CC8284HYqVM9bKzAPNL3L 3glGZLHDV6ghVnOnJjsjkJyz4t6A06MNA3JV96PSAFEjgEiyllXZktGjGNJtQJOq+OrVwD lhMXj0IzjV7NaBSmGjbsVI1QBlYvF/E= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Ztzwn0HQ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.179 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700746274; a=rsa-sha256; cv=none; b=RYP6Mc/k5ap5Mq3cKwKIjGc7Tl+KOZUnAJfEh78QsHOey9oVOc3Sg8zLx0Cv8npO3G9BQt 3MLk7pMe+ElcAQ3qkvDjVeuEJjZCsiSGuJhUVGF3TQyiYqzjHh+HGyLQ2qODBb6Ne9Y1QE CS5hbRTNgDIsTxHkRscgA+iPNnnACCE= 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=1700746272; 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=ZmVKGX3xWVsiaI1L9mmzJOcNAtj7qPzayoGRggtSBII=; b=Ztzwn0HQtIgdF3nrfOjRTmuus6uH05VuvO5saXWr5t12Q51VOnt0v0Tdqe3fTgV29LfEAj ZlpS/GGfT1xwjVdXl9k5LFCEe038RDKIRwdprffhWUuffvY73PgEemYmViGVybE5iBDRMn 6grrj48RxSO/qOyc0/yPWH8AYNiUtwQ= 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 3/4] hugetlb: add timing to hugetlb allocations on boot Date: Thu, 23 Nov 2023 21:30:35 +0800 Message-Id: <20231123133036.68540-4-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-Rspamd-Queue-Id: 08252C0008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tfouxnygrwe6z95uktnszq199huh3joh X-HE-Tag: 1700746273-658464 X-HE-Meta: U2FsdGVkX1/MRfs0I9IL73JkFmY6oMcdCNFq20e81ce1Vianu0kmafpL3FjQ2xJCsRO590Ypeg+55iJvbjl59WkpQewLNkzp1ApkV3I+pRxxrMCvTAaKhoXg0D8vAe6BamRHBJ+RZEdQ1LnLmNBw3KTUMYQ34Mh6AEk6Rj+M5vR/fYLFqsiR3PapSXnrHBJX4APjAenXa2JhPtm8xG1DUnOQTbNtrixITXXPcm2Sq7qdRomGzG4aqAwKfFP80n+Z/Xv2lBwYi++7ph8SKA2HKutAo71PS7XoG1oQ2SxVzckIsn6WlVff8mNPO2mviK7E2bSTUxN0bDkHTrPvaUf+hvhNoJfQYMGy3GkKQk3192TTWpQmk//ovg2gZ5hCSuoC9DBiPU+g3bZ44qMJIYu7WL4G3gSsaVl+hiiHrq7dCQ6b2VHakyA5R4gxDONyO4wmewAxKrvMGKIBebqxIlcqrC7E+xF5VJYLuonrnYh3HW0v8uUhgXBzLQ8Na01d5B5TiTEAjkkgg/MdY3pIx93zmeb4+t3qiyloGVrrBfZGVUaBkbM9TczdwK+OsqMUqjIOKIWRguqo7diisXEwM60IwC+lWwloU73XEqLqurZHJAFZOGds3SzTRAy9sC9NrHzpQZuHn47ccNyLKEWpxV6DxnHo36ba6+FVVOG3YnV337QAuodjINuLeff81hOKoUupRtDwvGn2qHjjDpDCheU5+F2CVcuehV+i0/Y67YDut5YW6P03R38HJKD/MnXK/eBATvgxvZOSyDSTLQBCEQsoMotbB0rwk28WAyU/DTKr0dMyQWtSCKAt/8OY570dopaPCovlpNGDh7zfq48XuMOWFwWPhcN6vvYDFdCRRl+XjfbnNfA929e/H2ojnnlRczOfDyquBke+C5EzHr8ZnsPFFYisDnCZYEjiVrQTarJ/o2ozCjnf3bDGt8Xyqb9Owl17Tp5WlKOZjHu9/FrQ07q XGeU5rL7 jAyvbbn0Ac43+pfGa8eRZKU7ZlljH72aaZNNf8pRBNoz9awxCcdji5GFQuFSPeRJwy241IGSTeUlgRPZZFH8hxG4bt9sv/TKej0UUNlzpJjwGJUEG3+R4lsRWn/NIOZ04xzYC 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 Add timing to hugetlb allocations for further optimization. Signed-off-by: Gang Li --- mm/hugetlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7f9ff0855dd0..ac8558724cc2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3563,7 +3563,7 @@ static unsigned long __init hugetlb_hstate_alloc_pages_non_gigantic(struct hstat */ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { - unsigned long allocated; + unsigned long allocated, start; /* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic(h) && hugetlb_cma_size) { @@ -3576,11 +3576,13 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; /* below will do all node balanced alloc */ + start = jiffies; if (!hstate_is_gigantic(h)) { allocated = hugetlb_hstate_alloc_pages_non_gigantic(h); } else { allocated = hugetlb_hstate_alloc_pages_gigantic(h); } + pr_info("HugeTLB: Allocation takes %u ms\n", jiffies_to_msecs(jiffies - start)); hugetlb_hstate_alloc_pages_report(allocated, h); } From patchwork Thu Nov 23 13:30:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13466232 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 94572C5AD4C for ; Thu, 23 Nov 2023 13:31:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C0368D004D; Thu, 23 Nov 2023 08:31:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26FC08D0002; Thu, 23 Nov 2023 08:31:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 160688D004D; Thu, 23 Nov 2023 08:31:19 -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 03A658D0002 for ; Thu, 23 Nov 2023 08:31:19 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D02FCB6773 for ; Thu, 23 Nov 2023 13:31:18 +0000 (UTC) X-FDA: 81489305436.22.66C5E67 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) by imf11.hostedemail.com (Postfix) with ESMTP id 03F4140013 for ; Thu, 23 Nov 2023 13:31:16 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Y71JssED; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.171 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700746277; 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=SVmsj9TN/aj38n19fqlW2b7zQkW3VvgWG56LLSCGces=; b=aibPNC0JJkR1oFGMYxwTh3YXIMgQQlhujSrti6JU5o8f9S0Ha+IZN5+fvN8dJu6K19AkMb Bg/Z+x6v+edOMAsqAHaglHiaTMj6pFBC4/6gHmX6G1uQM6FYp/vVlCbOeaLSj94/i/OsQ6 EPmWfP6ShD2bgDTeFZkwwjH1Yff73KA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Y71JssED; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.171 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700746277; a=rsa-sha256; cv=none; b=6R6f95njLj7hFXnX5iTI8uSdI6e14EV1GaUpCi3+oEde4jUubTCFYUJbd9fcamBHViaqB6 OTDtE/doZDk+CE0gD6/to7RJNa5kjnkaQWruowBjGQURQ6JSqePA+vkVGLJcM6acytGAJy CTAAAIXqN1lXxqFXBb/XXL0gavT3nXQ= 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=1700746275; 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=SVmsj9TN/aj38n19fqlW2b7zQkW3VvgWG56LLSCGces=; b=Y71JssEDzrYWYNV34cyzjaSirgHK0BrpKRWoKYtD+NlDt+B0BHOaS3CWA9Uyhz5yKbgj6g PimBt6l7h2P4kLFfkV0n8MPPjcmR9a/NNorQu2gY5FzktxNGVTBcPtxXi8OV6XSHGDx82i xNn/ddoatbelzCFAmHSUzrB3UJs23Jc= 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 4/4] hugetlb: parallelize hugetlb page allocation Date: Thu, 23 Nov 2023 21:30:36 +0800 Message-Id: <20231123133036.68540-5-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 03F4140013 X-Stat-Signature: akr1qpkd9gzfmgmqya78x4gjhieu5qhk X-HE-Tag: 1700746276-324600 X-HE-Meta: U2FsdGVkX1/8n8CnPiKihg7WmYotZGdBeC47sE5uK//+MinuaPN6M9a+uvYQt1dOAfYtvpkQhGHk9uJw53JHybE6bghS1cFf9h09X9WbqCSLjOtpwQgaT+DymMqodVGWGPiFRKQ8fTTLqjmDkorweZlrpqJPr5hXpG/B6USZWKbA3QtUx27jLCxNy667hhjWLE/ZSNH20sf7+6FdufMx+U1IJzh7e5ALNPAkZljPMs68cQXFGcgWPqZ804lCNOAMVMQsIJxnjnWYsS4YTfxZ+74IyLS2817fB+HokJfkzlk7saN0lfFiv9La5pdKAYmE8aIYwDfKni4yvhHFYv5vKTSaBfObyCHDbzTdCg/eEUTMJzGtxk/N3N+LV81bE1LS8FvlHCD0VfKHSJLXV7S6OjEDf9GLnfK+EreRnDhgSEc/Oo6tvgmkXmqJutXzeAlBIIsy4l0NyeoRbtzR/pYXRhLAw0xZR7vOFHqRw1oLKSkSuLECPBvBZCFvKwMOCZbNznnIzVXiPq2Kcsupmjqrv8hQebIIo6rfb/Smua9+9Xn2U2NtPsi/9d4/r9rxtfWRmIkPXO2SSz4rOu56m7dfRdWSbawiiQfH3Dgz2kTjpKW/j6ZdHawjN9p5LuEhWwbDn2DepmjaDWrUXASmCdxgJLyvSTjxrJZXSXz4IkrWpAG/DtsTLPhH1yYrpz5xN9QCVXVW7xZRXfUOp3EdaMsuMEOIh7mi6Ab7D7n3wde81xnZGZXncuSKrfB6fLtqlMrlxJdSANMIyiPepFUil9UrtrnXfcondo1y0YH05kDTXKYLSNSheiD8HCmcAHf/8SO7cgHUyo6NOgiDHmv6aEe3D0OYfe4qvyID/v2vYsr7TRv5BXxUrC380UqYKU+vuAXHysuRUN3UGzhgaROFVtIp74q1lU+hTxZxuHtLnYniH5U9IwkUWASMFyV3dQ0Fl9ksM49ZYth0htg4TeEV7kq XhniqLXC WHH1oj3oZQbXh1Z4bHXLOVloJZZ+fpV+1JswX2vnxNSjF1j0wpuqC2wi5367jDZjlJoZ9BXVrMSSwxASf2k26Q5go3+QCIgvnbWjzx4zs94eEvSg/4MvCBAiB+BIK7R+SeiQO 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 By distributing the allocation across threads, large hugetlb configurations can allocate pages faster, improving boot speed. Signed-off-by: Gang Li --- mm/hugetlb.c | 89 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ac8558724cc2..df3fbe95989e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3509,6 +3509,55 @@ static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, st } } +struct hugetlb_work { + struct work_struct work; + struct hstate *h; + int num; + int nid; +}; + +static atomic_t hugetlb_hstate_alloc_n_undone __initdata; +static __initdata DECLARE_COMPLETION(hugetlb_hstate_alloc_comp); + +static void __init hugetlb_alloc_node(struct work_struct *w) +{ + struct hugetlb_work *hw = container_of(w, struct hugetlb_work, work); + struct hstate *h = hw->h; + int i, num = hw->num; + nodemask_t node_alloc_noretry; + unsigned long flags; + + /* Bit mask controlling how hard we retry per-node allocations.*/ + nodes_clear(node_alloc_noretry); + + for (i = 0; i < num; ++i) { + struct folio *folio = alloc_pool_huge_folio(h, &node_states[N_MEMORY], + &node_alloc_noretry); + if (!folio) + break; + spin_lock_irqsave(&hugetlb_lock, flags); + __prep_account_new_huge_page(h, folio_nid(folio)); + enqueue_hugetlb_folio(h, folio); + spin_unlock_irqrestore(&hugetlb_lock, flags); + cond_resched(); + } + + if (atomic_dec_and_test(&hugetlb_hstate_alloc_n_undone)) + complete(&hugetlb_hstate_alloc_comp); +} + +static void __init hugetlb_vmemmap_optimize_node(struct work_struct *w) +{ + struct hugetlb_work *hw = container_of(w, struct hugetlb_work, work); + struct hstate *h = hw->h; + int nid = hw->nid; + + hugetlb_vmemmap_optimize_folios(h, &h->hugepage_freelists[nid]); + + if (atomic_dec_and_test(&hugetlb_hstate_alloc_n_undone)) + complete(&hugetlb_hstate_alloc_comp); +} + static unsigned long __init hugetlb_hstate_alloc_pages_gigantic(struct hstate *h) { unsigned long i; @@ -3528,26 +3577,36 @@ static unsigned long __init hugetlb_hstate_alloc_pages_gigantic(struct hstate *h 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; + int nid; + struct hugetlb_work *works; - /* Bit mask controlling how hard we retry per-node allocations.*/ - nodes_clear(node_alloc_noretry); + works = kcalloc(num_node_state(N_MEMORY), sizeof(*works), GFP_KERNEL); + if (works == NULL) { + pr_warn("HugeTLB: allocating struct hugetlb_work failed.\n"); + return 0; + } - 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(); + atomic_set(&hugetlb_hstate_alloc_n_undone, num_node_state(N_MEMORY)); + for_each_node_state(nid, N_MEMORY) { + works[nid].h = h; + works[nid].num = h->max_huge_pages/num_node_state(N_MEMORY); + if (nid == 0) + works[nid].num += h->max_huge_pages % num_node_state(N_MEMORY); + INIT_WORK(&works[nid].work, hugetlb_alloc_node); + queue_work_node(nid, system_unbound_wq, &works[nid].work); } + wait_for_completion(&hugetlb_hstate_alloc_comp); - prep_and_add_allocated_folios(h, &folio_list); + atomic_set(&hugetlb_hstate_alloc_n_undone, num_node_state(N_MEMORY)); + for_each_node_state(nid, N_MEMORY) { + works[nid].nid = nid; + INIT_WORK(&works[nid].work, hugetlb_vmemmap_optimize_node); + queue_work_node(nid, system_unbound_wq, &works[nid].work); + } + wait_for_completion(&hugetlb_hstate_alloc_comp); - return i; + kfree(works); + return h->nr_huge_pages; } /*