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); }