From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F38BC46CD2 for ; Thu, 25 Jan 2024 02:49:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC1C56B0074; Wed, 24 Jan 2024 21:49:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A71346B007D; Wed, 24 Jan 2024 21:49:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 963C96B007E; Wed, 24 Jan 2024 21:49:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 826776B0074 for ; Wed, 24 Jan 2024 21:49:31 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1E52FC0BB3 for ; Thu, 25 Jan 2024 02:49:31 +0000 (UTC) X-FDA: 81716302542.01.61D137A Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf27.hostedemail.com (Postfix) with ESMTP id 5805340016 for ; Thu, 25 Jan 2024 02:49:28 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KS+yS4LU; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706150968; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VwsarYtc65ZqJXc3lE3aa+W1phHFbIgO40X0wtYLRo0=; b=xeb6pZAmoewTuNuBR+A06XsobDlnyUP0MwgXXtFpA/TYbm0/3IEAUvBJQAdgycTgR5RAPL uVt1pmRA3RLT9QyHjNi65PSH7jt5mcOgR2NkAqoJhA19FR9/XzjCJsP0IIaB//FWmWmI15 wfAn3NRzEBQV3NU2NjP7D7Zepwn+Y60= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KS+yS4LU; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706150968; a=rsa-sha256; cv=none; b=gaMZ273AZjOsRNZwQ2AdgqRa3XfzZcjQZAnT58yEtq1IwxqDp1pz3v2ZIAiChWK9ww17ae yWWPt/XS00BWmPGXAho7m+2XLwht9YoOj5REb2lwuecQ6MqY2XIg3wyx3U7B29XnaDbG54 8ND97BB3IiP/A1QYlMZuH/Yek4/ZA88= Content-Type: text/plain; charset=us-ascii DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706150966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VwsarYtc65ZqJXc3lE3aa+W1phHFbIgO40X0wtYLRo0=; b=KS+yS4LUqFCySJno7hRFFp99pES4d6VNrKzI075A0N39NatmyhGGz4OSqkMR3SC3zmtFUS YBEAZImygyNrTym6CwOYWq5xMbYQJQYSKvmKyoKfr2WmwsHcFUJQ47KkCE/Hr/KooGQR9F +9n3PoyLFWVUxSS8RTOJOldAjdp6sSo= Mime-Version: 1.0 Subject: Re: [PATCH v4 7/7] hugetlb: parallelize 1G hugetlb initialization X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: Date: Thu, 25 Jan 2024 10:48:48 +0800 Cc: Linux-MM , LKML , ligang.bdlg@bytedance.com, David Hildenbrand , David Rientjes , Mike Kravetz , Andrew Morton , Tim Chen Content-Transfer-Encoding: quoted-printable Message-Id: <15E775EC-8E4B-4145-8931-067DF60E55F1@linux.dev> References: <20240118123911.88833-1-gang.li@linux.dev> <20240118123911.88833-8-gang.li@linux.dev> To: Gang Li X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5805340016 X-Stat-Signature: 5647n9wdndsabus6bisorzsqyd9pb8fg X-Rspam-User: X-HE-Tag: 1706150968-456638 X-HE-Meta: U2FsdGVkX18jvIc3uEoTb8Dldg6Ce+RNzHKqHUPF3eqYBgUrwccOcO1i3ublpfhEiRPPvK5eTfjxVC/rOZEiu4XY9cWRXjyeeAV+SoSvzvESh42d+IhGm7fmJuNrDhX3W5O0v8sK+r1thQB10pxP2cC8HhtBynrsn5BevRvsATffK6nrp8DtlDQJf79ZcJi1Q6I54sGdMIPYPvzess7roqTrlaZD4olvkO7pgjImJk9ky888iqtGjPMDTdo3pT5X34fXUKh21ELxoBSY1ClDW8gE81AztI27L8ejr9eigXAux154TPyqEynTJQcvgDBxrOq+uJ3qJDxShz6Q448WZNelpThVtR0F+Xqq8qZ6ntFO5esiyzhXyXR+D7DLPZsHM4/yH81xq6VY9+wNERLQnozkx9osAJXHuLkDzYsSWaOwAIHNGjyrC0BVgyNwE3sGzlObyqph97zMDS+z+R/2OvPrrSPoxTgAgsJCD6228m90qWpaGH0hhSV9aWr9QYSjNNtOH1FJmsd4DpxHYuMby6KqhNG5ApjnoSvY6yFXe5U/5gT3r+oBh6fvsdohw9bAuIFbhQ74HN2CQ6JyrO9U7Y/Xof14BfyuFr0OnKDeAsl7sdiF1zcl0lisPGKdu7v9rAjnEC0IbSUvlY25Q1aEJpJIhBND5OohxeJa9Y/2er19pDDLAItENTdQet6X18CC2hxStuQuvlckc68l4zhg3P6R8CHiAm6u/WjK19ekcYb7w5ZrkfCGVDPyLKVVXCqyDguNfs3FeVVKUNJ0W+spBLnDXta0u55Ar/iK/kSVPlwR9OhNf4nTSfwEd8sQgd4+RvOKwL+2ySFUT8NWL+W8BjZAD1yHVZetb/BJqUVRwIYXzkSVzly+OK5J88iBGW+eGzmZUpWw1LS1s1nOTA9SFX32ccydLNS+/rUlbn/AM6IhaeB8XzaT94ox2JmiVtliuZxUDiMs0dzV9k+2E5t a2DD57pB Q7f0vBazsOOlZ6Lm1RbDpRTD0NpzHvQjCJ5jI7K9fqjYgl8uVP6YZIckZynCnfBW72dSjgA5msRrVzeWshrO8AoYKo1HLUuiEBWzZpMV/y2zuG1aUpDEtTqOUbTQVdSU0ZXxGP/PkMsN8DZE= 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: > On Jan 24, 2024, at 18:52, Gang Li wrote: >=20 > On 2024/1/24 17:23, Muchun Song wrote: >> On 2024/1/18 20:39, Gang Li wrote: >>> Optimizing the initialization speed of 1G huge pages through >>> parallelization. >>>=20 >>> 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`. >>>=20 >>> Here are some test results: >>> test no patch(ms) patched(ms) saved >>> ------------------- -------------- ------------- -------- >>> 256c2t(4 node) 1G 4745 2024 57.34% >> What does "256c2t" mean? >=20 > A machine with 256 core and 2T memory. A little confusing. I thought 256c2 is a number in hexadecimal. The unit of memory should be capital T. We should add a simple explanation about this. >=20 >>> 128c1t(2 node) 1G 3358 1712 49.02% >>> 12t 1G 77000 18300 76.23% I am curious how many NUMA nodes does this system have? I suspect it should not be one. >>>=20 >>> Signed-off-by: Gang Li >>> Tested-by: David Rientjes >>> --- >>> include/linux/hugetlb.h | 2 +- >>> mm/hugetlb.c | 42 = +++++++++++++++++++++++++++++++++-------- >>> 2 files changed, 35 insertions(+), 9 deletions(-) >>>=20 >>> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h >>> index c1ee640d87b1..77b30a8c6076 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 9b348ba418f5..2f4b77630ada 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; >>> @@ -3301,7 +3301,7 @@ int alloc_bootmem_huge_page(struct hstate *h, = int nid) >>> int __alloc_bootmem_huge_page(struct hstate *h, int nid) >>> { >>> struct huge_bootmem_page *m =3D NULL; /* initialize for clang = */ >>> - int nr_nodes, node; >>> + int nr_nodes, node =3D nid; >> Why not use nid directly in the following list_add()? >=20 > `node` may be changed in `for_each_node_mask_to_alloc`. Got it. >=20 >>> /* do node specific alloc */ >>> if (nid !=3D NUMA_NO_NODE) { >>> @@ -3339,7 +3339,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 =3D h; >>> return 1; >>> } >>> @@ -3390,8 +3390,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)) { >>> /* >>> @@ -3404,23 +3402,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_PAGE_ORDER) = pages. >>> */ >>> -static void __init gather_bootmem_prealloc(void) >>> +static void __init __gather_bootmem_prealloc(unsigned long start, = unsigned long end, void *arg) >> This function name could be gather_bootmem_prealloc_node. >=20 > LGTM. >=20 >>> + >>> { >>> + int nid =3D start; >>> LIST_HEAD(folio_list); >>> struct huge_bootmem_page *m; >>> struct hstate *h =3D NULL, *prev_h =3D NULL; >>> - list_for_each_entry(m, &huge_boot_pages, list) { >>> + list_for_each_entry(m, &huge_boot_pages[nid], list) { >>> struct page *page =3D virt_to_page(m); >>> struct folio *folio =3D (void *)page; >>> @@ -3453,6 +3455,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 =3D { >>> + .thread_fn =3D __gather_bootmem_prealloc, >>> + .fn_arg =3D NULL, >>> + .start =3D 0, >>> + .size =3D num_node_state(N_MEMORY), >>> + .align =3D 1, >>> + .min_chunk =3D 1, >>> + .max_threads =3D num_node_state(N_MEMORY), >>> + .numa_aware =3D true, >>> + }; >>> + >>> + padata_do_multithreaded(&job); >>> +} >>> + >>> static void __init hugetlb_hstate_alloc_pages_onenode(struct = hstate *h, int nid) >>> { >>> unsigned long i; >>> @@ -3602,6 +3620,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*/ >> s/init/initialize/g >> And you miss a black right before "*/". >=20 > OK >=20 >>> + if (huge_boot_pages[0].next =3D=3D NULL) { >> It it not intuitive. I'd like to use a 'initialied' variable >=20 > Would it make the code look a bit redundant? What is redundant? >=20 >> to indicate whether it has been initialized. BTW, it can be >> marked as __initdata. >>=20 >=20 > OK