From patchwork Fri Dec 8 02:52: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: 13484693 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 23732C10F04 for ; Fri, 8 Dec 2023 02:53:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53A836B0083; Thu, 7 Dec 2023 21:53:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EBE86B0085; Thu, 7 Dec 2023 21:53:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 364C86B0087; Thu, 7 Dec 2023 21:53:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1F4346B0083 for ; Thu, 7 Dec 2023 21:53:10 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EBB55403A1 for ; Fri, 8 Dec 2023 02:53:09 +0000 (UTC) X-FDA: 81542129298.08.AF63E5D Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) by imf27.hostedemail.com (Postfix) with ESMTP id 416A84000B for ; Fri, 8 Dec 2023 02:53:08 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lfAm3Ag0; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.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=1702003988; 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=nScQm/fmNOjGhlLnCGYZOl5/YmPviWpS9XmgJR18QP0=; b=F4ZgcvOAev/1jJG3LdTbqfTlJl1irX7nBZ7uQWPTg1PyN1v69Fv98j5lYKMlUbPcuL/XWz fG1Uuolnw+d8rgx47S2rJCje/5ASGKH/LOE6Lu2HvjeisdRDPB4K/8ys+BbatGcAZ0H+DF fdbtINXe+jmRjZt9qzOarBtMNFvKy0o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702003988; a=rsa-sha256; cv=none; b=gJ+yPqyY0qQorBSFk0l7xsIdMbYIHfvFHQshdyOSU6MyBNQyWzTJBRC2zpynEmJGUL0WSN +VicwxkVAX0sNG31V9fU7zxDT1AILlTl7mcUsA0l7Sl7Lz36QvVm7Xo63eUNihM0r9AwAf Zp2tNXZsIM2KRg/csl5EPmZWURD3VoI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lfAm3Ag0; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.181 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=1702003986; 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=nScQm/fmNOjGhlLnCGYZOl5/YmPviWpS9XmgJR18QP0=; b=lfAm3Ag0u+nVvzsnpysTBQspAGEV7RQMWtcMnK+sgx5xG663oyDL2ImjlVJztS/qUUC2Bu ASnstCjN2e7RvnSs5QQnB61n9SzrCi2SL7VTkiqKPo9WPDD641CyExewkH4Cks64v1NnaA Y94xV0mU8qY+cPzuNp+xPfcAHW1VUQI= 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 1/5] hugetlb: code clean for hugetlb_hstate_alloc_pages Date: Fri, 8 Dec 2023 10:52:36 +0800 Message-Id: <20231208025240.4744-2-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 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 416A84000B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: gpynxt3qc5ofm37hw3gjjh6aqhnjgh87 X-HE-Tag: 1702003988-183342 X-HE-Meta: U2FsdGVkX19/iIu2QC8Gn6RnRWoyuk6uW7fdLNv44i+FIpXJrIPf5z+GoJSd6nXLUqGWto+zevm8qBxS2IbjB4IP5+mfs5s8e/A0727c+IWXR1XesiUhRHysZN6AqFE7mXQ22KmXySjN9fb11gCN+rPThzbv25KTGXK0OJwohxaHm4sKbBemFG2iJXBOurijDBPwRDRraCLdbCjq1ogkxPynmZKuzoNWdiXtmiZHIdS0Gn/BCCYTJwT0tYh/YTrP9YQQEGfwQFWS3ndYhIUyI/xeAkOsWimfNIhuy9rqZQVCMZSCRo74u64fEJkXMeMwqSGH984o95OivaasAyEwADvAYk4MInhnbcUcVB1zkjoa5qXQFPiKDq22sV45LDEtXfcmYjDIKoNU227QBOAKsi6gbtCGahTwxfkfnv6BcsDzKjf7/oDIVr+5sE+6czYWAbrZp+A23d5qFF9IIXvsAmzHJIlRCmipgbB5HDBIEtWNxrZDW18ZIdQYIC4xMnVBIHR+d6qj+WZ/+M51bIuEo+bhfYf5m5aLalo1VfO7Xz7hNNbKoOKwRky62LqnzvvdV0TQkkBBuo8azO+Ts/USrXdXEM9Sqxjyvg/QAHU4Af0+oHbNvY0PsHlanFeUzCEtwvGbHPa7PIdkMhZJz2t+9ZRxC7TB5MR6BfN+N4gMKBRZhYdA3YaJys4Vl9HU63xNy5eK19V4+XbZXUdEcW6M6cpoSlRJKr1Lns3iT3Ez9fIqKRnsAktxG6b0RU/S4LgdLsnUDjD+xCC1TwxpOPCAWK3yRoEktr5/VEcFuxt2Tnux2Y4mq57YvWiMV3c8awj4HZMeiN2NfkriAkGec4IWp6rcUut6hWiE8rCx6++SJPVL2BiYfeYBGoCLGJzCyssk5ixGLrebZ8vyYaLdKIIqGbmnOarDCjwIu5fjhfHPQq14xD1gUY2AKRQOvpILN4gUQs1PQhUHn76rR/8rCEE Mhu7Wqpl zUci6ZWcrPELpT7mk6NZx+HuLAmVVJihzPiQTmJoVsdzkQ7xOXdGe5ggZsSX7iJ/8PC+TRcRE7QEEEBIavqUIDz5l7U+F763Yg6z9osptX1OdgEddjZe+rmiKo8/S0/s3utPc 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: The readability of `hugetlb_hstate_alloc_pages` is poor. By cleaning the code, its readability can be improved, facilitating future modifications. This patch extracts two functions to reduce the complexity of `hugetlb_hstate_alloc_pages` and has no functional changes. - 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. 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 51f50bb3dc092..252d6866a0af8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3475,6 +3475,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. @@ -3492,7 +3519,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) { @@ -3501,14 +3527,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 */ @@ -3551,14 +3570,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 Fri Dec 8 02:52:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13484694 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 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) From patchwork Fri Dec 8 02:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13484695 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 713EEC10F07 for ; Fri, 8 Dec 2023 02:53:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C41776B008C; Thu, 7 Dec 2023 21:53:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC9B26B0092; Thu, 7 Dec 2023 21:53:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A425F6B0093; Thu, 7 Dec 2023 21:53:16 -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 8B0E76B008C for ; Thu, 7 Dec 2023 21:53:16 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6FF68C03EC for ; Fri, 8 Dec 2023 02:53:16 +0000 (UTC) X-FDA: 81542129592.08.4CCDD5E Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) by imf29.hostedemail.com (Postfix) with ESMTP id B304E120013 for ; Fri, 8 Dec 2023 02:53:14 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=esddMIrN; spf=pass (imf29.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.179 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=1702003994; 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=xBnw5RqwYO2IqY80uM+vPTSc8/TzM8Sh0FOmLemG2G4=; b=A4bRUAJgS0358hCfbrn9WQ/UMBou83MGs4b643+cGfeH0iMPxwlFkIahSCK3RfpjadAdMc UVWcfQb0mhFesqBoapIKDnlGqSeA2wXgjeJFF585+K2Y6XiQ3P6Z6+4dJW9/avmCfTdVBV UYPzS06fkP+5o4kCc708DmKqWm6iF0s= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=esddMIrN; spf=pass (imf29.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.179 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=1702003994; a=rsa-sha256; cv=none; b=JgycLlm8/SxoVjAtvixXoOUXbABpLaPhEo8cJjgY/xGs1HuUSEdGzz6NE1VD++ltae9Ja9 b2Ak7JZhkxT1D7xEwlzq4El1u2Bobh8j/teJfnPI7Xe0YXCpZUDkOROpffBf+3T8XqCRmM anqGLTD5uppoIhXe1OAWawy8Bag9Lfs= 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=1702003993; 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=xBnw5RqwYO2IqY80uM+vPTSc8/TzM8Sh0FOmLemG2G4=; b=esddMIrNubz11Tjk5hcSDYsiI76jCdFHcT7RuRX5vkHNO/tt71jh8T95AJcRJ0EkjT5FPP nyp6uRRHoc0E4ynoEJCj3cDTTNvgLfqjFHV2Cv3uc8gZ6cNzKUTvW7ji1pnYkE7HVckU18 dtXx/KCzGEPds0Qw2r7tjuJ+Dt6mSrc= 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 3/5] padata: dispatch works on different nodes Date: Fri, 8 Dec 2023 10:52:38 +0800 Message-Id: <20231208025240.4744-4-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 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: B304E120013 X-Rspam-User: X-Stat-Signature: pooijsswf1wdp9t1s7zwt8xk43jdxipp X-Rspamd-Server: rspam01 X-HE-Tag: 1702003994-42426 X-HE-Meta: U2FsdGVkX1+CISd7EUGLSS7n87FF95Wjgu05iJ/YIp+NlOvNjlntXK3ftmBI5uYauT3t2NqCs9wQbqG6cCndqSBWqtQrMMD5v96qhluWSlI5VX9fc/yZp5tT1MZ3y99sclVaEVNAiuWjHZo9dLxcm3jTEU4LFT3Bv1Ii8tCOx2D0qpzyDngYGfWr4S3ngy4qGZJAf/DJxBDmoWpHq2nSq/oN5UqAQq8h+ubTsDgzTU6+v8siE/eiiBv5NcG/4wbW0ymW9zICpWwszLrl6z8Bp6QE6IhwTWcfGvAxvZpe+PihwrTsHsDJHpO+C8EpjrEpUWj3rT1N9HrX6zxsnLcoUX3VPFG8S1HpXnLLLLJTgkk7d5Ox4vnSTM1aPrut7WGXHGolHN3NnxAG2XZ5oB8tmtHu7kAkukfg6Au4qR/We11+STnrEPJi76ZB41zj1Ujpm09b4IQzlzGnzTBeuKs1cZFH1SSFfsIN17mGE513ObxXR0pBywaKe1I3kY/IykYIBmlzTz38j8a+UJ6CCAPqyg7S37puP76XSyM9cKUqRx71O/iX7cAYGrljJ6zLfbKvrdbqEjaisC6wdMANs1lLlA3MoNv8NpExqvFw9Ki9jsNMEw3P1fr8ZpizsX6lMDddUl8ZKemvY1XMOI8ZgJmm4HRqgy8JceyH5dU038LBUbWCnVwUONt00m1ixCT3yAqPwNxFn6cv3uOw6FZqV3sXzbExlw7q7sXQAm3FkAyN7pWFiUuSPTDPDetjfDWD0/rKKQEycWNHniclFk1Bden9znU5kuMlV8N7/dMzUP5B78kXJ8XDKxIub1eVK2PFjK6f3NFSSrrFWNmqaaVNueNlo1PmNQ1AhEQs8fgr1/ogM8eHrsfmU4F2ubCxWge7twaAF6gznrpHpF43ZhoAwBaG1YI6iqrXJTn9AR8CXMbkXjpgXFfmOyRXrYM0yYAQMZ3nPHiHaxP29ZrkkNhfY3d isf2os5R Zc0rqVWBvcRLnHEkwp6mL5fYV+k0kSKHXLRFO2VfW7NlbiPwKlgOLtHL+l/UZ41SbnuHfI5LP9JppPm8= 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: When a group of tasks that access different nodes are scheduled on the same node, they may encounter bandwidth bottlenecks and access latency. Thus, numa_aware flag is introduced here, allowing tasks to be distributed across different nodes to fully utilize the advantage of multi-node systems. Signed-off-by: Gang Li --- include/linux/padata.h | 2 ++ kernel/padata.c | 8 ++++++-- mm/mm_init.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/padata.h b/include/linux/padata.h index 495b16b6b4d72..f6c58c30ed96a 100644 --- a/include/linux/padata.h +++ b/include/linux/padata.h @@ -137,6 +137,7 @@ struct padata_shell { * appropriate for one worker thread to do at once. * @max_threads: Max threads to use for the job, actual number may be less * depending on task size and minimum chunk size. + * @numa_aware: Dispatch jobs to different nodes. */ struct padata_mt_job { void (*thread_fn)(unsigned long start, unsigned long end, void *arg); @@ -146,6 +147,7 @@ struct padata_mt_job { unsigned long align; unsigned long min_chunk; int max_threads; + bool numa_aware; }; /** diff --git a/kernel/padata.c b/kernel/padata.c index 179fb1518070c..80f82c563e46a 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -485,7 +485,7 @@ void __init padata_do_multithreaded(struct padata_mt_job *job) struct padata_work my_work, *pw; struct padata_mt_job_state ps; LIST_HEAD(works); - int nworks; + int nworks, nid; if (job->size == 0) return; @@ -517,7 +517,11 @@ void __init padata_do_multithreaded(struct padata_mt_job *job) ps.chunk_size = roundup(ps.chunk_size, job->align); list_for_each_entry(pw, &works, pw_list) - queue_work(system_unbound_wq, &pw->pw_work); + if (job->numa_aware) + queue_work_node((++nid % num_node_state(N_MEMORY)), + system_unbound_wq, &pw->pw_work); + else + queue_work(system_unbound_wq, &pw->pw_work); /* Use the current thread, which saves starting a workqueue worker. */ padata_work_init(&my_work, padata_mt_helper, &ps, PADATA_WORK_ONSTACK); diff --git a/mm/mm_init.c b/mm/mm_init.c index 077bfe393b5e2..1226f0c81fcb3 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2234,6 +2234,7 @@ static int __init deferred_init_memmap(void *data) .align = PAGES_PER_SECTION, .min_chunk = PAGES_PER_SECTION, .max_threads = max_threads, + .numa_aware = false, }; padata_do_multithreaded(&job); From patchwork Fri Dec 8 02:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13484696 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 BF588C4167B for ; Fri, 8 Dec 2023 02:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5643D6B0093; Thu, 7 Dec 2023 21:53:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C5966B0098; Thu, 7 Dec 2023 21:53:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 365896B009B; Thu, 7 Dec 2023 21:53:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 196AE6B0093 for ; Thu, 7 Dec 2023 21:53:20 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0009F403E1 for ; Fri, 8 Dec 2023 02:53:19 +0000 (UTC) X-FDA: 81542129718.20.0C726A5 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) by imf04.hostedemail.com (Postfix) with ESMTP id 55A9440002 for ; Fri, 8 Dec 2023 02:53:18 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=chBueub5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.173 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=1702003998; 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=kGZs/UomIOv18ew/FrkoM04DuS4bMFxPVmfT4OFKf7o=; b=29O5BhKWUOsul6ZLx2jVrIVJ1tdLHvbNRIZIyZlRLc/HYTTnQT2K0tj8apw9kGPOc2Fluo q+9w55Bn3JxOPcybLS7xG9mrWxQpxMw4wvRSSujuSnyVNwGmpXO950OTxPmw6xPwtEkJ0v AJGsJbaSF4V+ZmDIB3U+5dpAYrO6t60= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=chBueub5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.173 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702003998; a=rsa-sha256; cv=none; b=CERbSWYR6pJ0opMl4C0Twbd3nsGCeJsRu4eUeZD4V8L8sx3DLS6fsupq5sqOCq+5AnBCbV g9p250rDvE1dACu+DIiD+fqNr3VanBGNTfF9h+qr2C9k/Cv6cn7ldipKWgcStqt8apjG6m kQIQHlUjISMQlmI5htwz4MoZX2J+B3A= 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=1702003997; 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=kGZs/UomIOv18ew/FrkoM04DuS4bMFxPVmfT4OFKf7o=; b=chBueub5MeUxcphaWjUQxqFROsevyxpVPZfmiPXveRFoaHIrVUEHPmnvrGUbaR4eTRBiWA f94Dvmb/dAYuSx8K1f3+h/VIZx1F4a/NHLYb+wLTgBl21NY0lhI2iPxvxgQs9MN7KjUjor XiwWvmtR111DRnYq7EyqfBimXVLu1UU= 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 4/5] hugetlb: parallelize 2M hugetlb allocation and initialization Date: Fri, 8 Dec 2023 10:52:39 +0800 Message-Id: <20231208025240.4744-5-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 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 55A9440002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hrgqx1xxpjtdtqnfbtjzixwdhm8s68dx X-HE-Tag: 1702003998-357542 X-HE-Meta: U2FsdGVkX18QRnk2gcrmTPwJnGAW0ypqGlj/D9NSQLQa840TNe7U1qHUsCwsx49Z2yWs6XwBJcVixyStyOx7MgMO+XsajsRD8Bb/QRbKMWlfGhKbgsvb3z+beecVsUNLXlFP7/nSGvIf6VcEjPEh7ZxYnR7IdBxn0DGpqC+/4CPvvXDtHshstUAKderdFtK2pdNyDG+1y2RlXCpH37ufFU8Wh83h17WTjHUSv6FCWqT5RXfAjt19HWe6fm64pAe5Jau3flLpuIoazk1bm+IND6P/fX0VmjmP75fwoHQ0BX1xdk/bNmqqEPgaFFWOGhamsjRwrooGu8YNnIddxqst7Y5OLc1HZM/Ro/4yMGYBPpgLIdjPMCCGFP8jZ2/UqMWfFZ9AFMBTXhqSj5v+bvvxvRW15W8qwhE/ymg88lKo/Bt6d139ieOGqheF/Pmf9eG8IYDvMDhRqNVRsEVptFxpczVzlROJ9LhNljEh64/JA4/fxolGqFXkzl9M9jbcNQPbNoUfVP5AYJ3nlapkd30Eh1H7QrpcrrO+Aajt9fTU7hjDPH01K4386snXJEvDbpIXVwJgLmMSMSnkEN1UQvGdPl9XuSyz/AtJesCipPwj1D3BZQZCkVj83LpjOCXka/hjWX1ZXE3V6TiSbhJ1XWXetMmVTeAhF8TwwnuQz5rTffqi9RdrYNWbF54d7d+2aPsQn+L0VWB5au/28+wgDT/seXBg6bVPI2o4g8GaPiwVHw9yGRjfBSvHqwzrymtXmel2ELUKXmFH9WtMFvcVby3hlLEFmDI46sY/1A5BPblh/t7okoaYkaLpb3RCPdF9DmJjAQmHdO59m3Z02aXYsYm9l1s3nBuyz2o0E3dYXDBB6UXmUiVYeBKEVH3lyEH0DXPZ+84sCLY8YtK45jzvH3lISCY9HeSIgBoEtnLPO52YZDdtxkfkNLVIdXt0UfLBJwiVgkOnxNPiPkjeFtdWgCC 6wc3Ppjw w+nyKOiKVVoeNtg56FmUkU61oJ98PitwqWA//qaLi1+bnXpupWGIbLwqgKJL0FnwnzYAEyzcX1WBep7E= 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: By distributing both the allocation and the initialization tasks across multiple threads, the initialization of 2M hugetlb will be faster, thereby improving the boot speed. This patch can achieve 60% improvement in performance. test no patch(ms) patched(ms) saved ------------------- -------------- ------------- -------- 256c2t(4 node) 2M 2624 956 63.57% 128c1t(2 node) 2M 1788 684 61.74% Signed-off-by: Gang Li --- mm/hugetlb.c | 71 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8de1653fc4c4f..033e359fdb86b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -3502,6 +3503,37 @@ static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, st } } +static void __init hugetlb_alloc_node(unsigned long start, unsigned long end, void *arg) +{ + struct hstate *h = (struct hstate *)arg; + int i, num = end - start; + 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(); + } +} + +static void __init hugetlb_vmemmap_optimize_node(unsigned long start, unsigned long end, void *arg) +{ + struct hstate *h = (struct hstate *)arg; + int nid = start; + + hugetlb_vmemmap_optimize_folios(h, &h->hugepage_freelists[nid]); +} + static unsigned long __init hugetlb_hstate_alloc_pages_gigantic(struct hstate *h) { unsigned long i; @@ -3521,26 +3553,27 @@ 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; - - /* 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); + struct padata_mt_job job = { + .fn_arg = h, + .align = 1, + .numa_aware = true, + }; - return i; + job.thread_fn = hugetlb_alloc_node, + job.start = 0, + job.size = h->max_huge_pages, + job.min_chunk = h->max_huge_pages / num_node_state(N_MEMORY) / 2, + job.max_threads = num_node_state(N_MEMORY) * 2, + padata_do_multithreaded(&job); + + job.thread_fn = hugetlb_vmemmap_optimize_node, + job.start = 0, + job.size = num_node_state(N_MEMORY), + job.min_chunk = 1, + job.max_threads = num_node_state(N_MEMORY), + padata_do_multithreaded(&job); + + return h->nr_huge_pages; } /* From patchwork Fri Dec 8 02:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 13484697 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 ACA8EC10DC3 for ; Fri, 8 Dec 2023 02:53:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 451CE6B009D; Thu, 7 Dec 2023 21:53:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 403216B00A0; Thu, 7 Dec 2023 21:53:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27AC16B00A1; Thu, 7 Dec 2023 21:53:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0F15D6B009D for ; Thu, 7 Dec 2023 21:53:25 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C69F8140409 for ; Fri, 8 Dec 2023 02:53:24 +0000 (UTC) X-FDA: 81542129928.25.9F924E3 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf21.hostedemail.com (Postfix) with ESMTP id 030D41C0009 for ; Fri, 8 Dec 2023 02:53:21 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NxMVWG21; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.170 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=1702004002; 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=JPiol85rH/HHWH3MtNGJ1vVzJRIHoY4UOz/xBdoQAl8=; b=0CYZCAUHTKjJuYy6qiYQIX/axnvOU8AzPl3vT6YrBlQRs0wLsvesvRTgyxgdcwCvVpuFbB r0a1/ZUZXJEm9h6CMEdBwV3xIeLIH8+2I2uINBeJugCQFGbNQmzbqaeuruuc2bHJ5KdDV+ /dFQarBTWzadXGc+PfWRO9ypXOvjf+Y= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NxMVWG21; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702004002; a=rsa-sha256; cv=none; b=6OU9ELMp9JShMne6t8l3UVcvKtJZIL0PyK+EPPioy8OpJQd09hTcrgxzueJfrG1QIUWiKO 1ilKBIS++YbIItmqRqnG6ON9znZOU3OHytE2HmHEMw0b0VYP1y4QWEH9k4JFuiuv6d/h6n uDckoOLEu4WeGIRSlK1fjLPsEayIlxA= 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=1702004000; 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=JPiol85rH/HHWH3MtNGJ1vVzJRIHoY4UOz/xBdoQAl8=; b=NxMVWG21gW8upSMu6W1+UqWPM1mu3TNNK7ySpDZBuJgxSJQJnlV784GJ4eVMKSUVd0+zvX 1DuMiRjvpJps0PvFoWiZGOezZxshmLOm4vijHRinD2+eRO6AOMJh3fsAb46TUi6BMzI3VH gXkzeo3fmyYW7grIYjzDRsnY4fGCZgc= 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 5/5] hugetlb: parallelize 1G hugetlb initialization Date: Fri, 8 Dec 2023 10:52:40 +0800 Message-Id: <20231208025240.4744-6-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 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 030D41C0009 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: o5cu53up86geeqgztb8nqicxhgsp6w69 X-HE-Tag: 1702004001-873042 X-HE-Meta: U2FsdGVkX1+cuwJaO9lUuKKHt0YAeghyNNiVWTzvHnm9LqaUV/nObIAJ/eMDC3IkZkrNk8QYzJizFN1PuJfg7Md4AYZSRNoup8uKSqWPYDXFhg8LhAEU5j0G/PeEQJw/VDLmQcjQPPePw6BSD2i9iUQMApfRHSj1JTcrbN9A9HgvbpIsxpkqt2MBbP9kvSXK/L04CaGjoV/cHlgau1DmETsSClUwtL6br6RuroTrZMQpFISCyqluQeg2oVoNPXZZuMnCf9qtFUgkxEksYYG9OAqlwWRnRp0XQjhG8Im/uBEk1Duw7A6y3cQ9qkcbbL7P5menqmrPH/y97/w9x+axVbkaQqR0L4YuVfeby7vnZAtGAVj+tLStKt8PFNSpR7AGrse3Xj43QTECi11hEoN5lo/GpGQ3nxjxmowT7t+kRueYIhuC4aA00zB2WhS4Lq8FNPSt/CZfotStzqg1QpJCIQcW2cf6sKWm3SEyIBEr2x3yyFOTx68R8oSHxQ527ey4EaH1aiiUE1/JsCBOzXIpEMsLK2EtJ3UzKlAQoFnK24w3G5H4HG1ilPSvwujovGhZoCU0jndtaHLoRXEl+dstP/45/8tjxULFazKowH0+zym1D4v0rY1UeIPWW/cm4OjXjnY8bPdIN9asXi3WK/G8rhyAz1E0iaVED4OQVbaQEL7KpTGeh/i2D5ZX/4hbjgg+pZWN6ig6rk6G5Re5R0wpGfCXVU8W3rTWzTe7msTKJorMtoiUgNOKQ+kbxCgkJR/YEgL0Zqj4oxnzZvHEGHzZY7WFN0aatVx+f1fnypa5y5bVSUeVxqMZIvZ54pP+Plkv1J185259ompmgG6cVGtoKSDCLD+tc8Vfl5KSmj6/m1isMZRmRK2jdhizn8J2rHWU6H1hk8DGUTzCY7b+1/lsa+mG6HzMZt7t8OtDJdaKdevE02cwYgKvOVEt963jO8myBDpuwE5QQktEad3TOwe Kw1oYfRi dN5BE/K0W57N3RDaNR316BrKkTngz80ptpeTNgvHhknmuSM57ITn6sr5KxcyfOeVYEQBzLVcDEAU+xoY= 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: Optimizing the initialization speed of 1G huge pages through parallelization. 1G hugetlbs are allocated from bootmem, a process that is already very fast and does not currently require optimization. Therefore, we focus on parallelizing only the initialization phase in `gather_bootmem_prealloc`. This patch can achieve 40%-50% improvement in performance. test no patch(ms) patched(ms) saved ------------------- -------------- ------------- -------- 256c2t(4 node) 1G 2679 1582 40.95% 128c1t(2 node) 1G 3160 1618 48.80% Signed-off-by: Gang Li --- include/linux/hugetlb.h | 2 +- mm/hugetlb.c | 40 +++++++++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index d3acecc5db4b3..ca94c43a63b84 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -178,7 +178,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma, struct address_space *hugetlb_page_mapping_lock_write(struct page *hpage); extern int sysctl_hugetlb_shm_group; -extern struct list_head huge_boot_pages; +extern struct list_head huge_boot_pages[MAX_NUMNODES]; /* arch callbacks */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 033e359fdb86b..eb33cb15dce61 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -69,7 +69,7 @@ static bool hugetlb_cma_folio(struct folio *folio, unsigned int order) #endif static unsigned long hugetlb_cma_size __initdata; -__initdata LIST_HEAD(huge_boot_pages); +__initdata struct list_head huge_boot_pages[MAX_NUMNODES]; /* for command line parsing */ static struct hstate * __initdata parsed_hstate; @@ -3331,7 +3331,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) huge_page_size(h) - PAGE_SIZE); /* Put them into a private list first because mem_map is not up yet */ INIT_LIST_HEAD(&m->list); - list_add(&m->list, &huge_boot_pages); + list_add(&m->list, &huge_boot_pages[node]); m->hstate = h; return 1; } @@ -3382,8 +3382,6 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, /* Send list for bulk vmemmap optimization processing */ hugetlb_vmemmap_optimize_folios(h, folio_list); - /* Add all new pool pages to free lists in one lock cycle */ - spin_lock_irqsave(&hugetlb_lock, flags); list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { if (!folio_test_hugetlb_vmemmap_optimized(folio)) { /* @@ -3396,23 +3394,27 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, HUGETLB_VMEMMAP_RESERVE_PAGES, pages_per_huge_page(h)); } + /* Subdivide locks to achieve better parallel performance */ + 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); } - spin_unlock_irqrestore(&hugetlb_lock, flags); } /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_ORDER) pages. */ -static void __init gather_bootmem_prealloc(void) +static void __init __gather_bootmem_prealloc(unsigned long start, unsigned long end, void *arg) + { + int nid = start; LIST_HEAD(folio_list); struct huge_bootmem_page *m; struct hstate *h = NULL, *prev_h = NULL; - list_for_each_entry(m, &huge_boot_pages, list) { + list_for_each_entry(m, &huge_boot_pages[nid], list) { struct page *page = virt_to_page(m); struct folio *folio = (void *)page; @@ -3445,6 +3447,22 @@ static void __init gather_bootmem_prealloc(void) prep_and_add_bootmem_folios(h, &folio_list); } +static void __init gather_bootmem_prealloc(void) +{ + struct padata_mt_job job = { + .thread_fn = __gather_bootmem_prealloc, + .fn_arg = NULL, + .start = 0, + .size = num_node_state(N_MEMORY), + .align = 1, + .min_chunk = 1, + .max_threads = num_node_state(N_MEMORY), + .numa_aware = true, + }; + + padata_do_multithreaded(&job); +} + static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid) { unsigned long i; @@ -3597,6 +3615,14 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; } + /* hugetlb_hstate_alloc_pages will be called many times, init huge_boot_pages once*/ + if (huge_boot_pages[0].next == NULL) { + int i = 0; + + for (i = 0; i < MAX_NUMNODES; i++) + INIT_LIST_HEAD(&huge_boot_pages[i]); + } + /* do node specific alloc */ if (hugetlb_hstate_alloc_pages_node_specific(h)) return;