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 776A3C47DDF for ; Fri, 26 Jan 2024 15:25:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E99DD6B009C; Fri, 26 Jan 2024 10:25:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E4AA06B009D; Fri, 26 Jan 2024 10:25:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D12076B009E; Fri, 26 Jan 2024 10:25:49 -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 C2C226B009C for ; Fri, 26 Jan 2024 10:25:49 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A9F92A249C for ; Fri, 26 Jan 2024 15:25:49 +0000 (UTC) X-FDA: 81721837218.24.3D184FF Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) by imf29.hostedemail.com (Postfix) with ESMTP id 2930612002C for ; Fri, 26 Jan 2024 15:25:47 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dYyUEugy; spf=pass (imf29.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.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=1706282748; 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=0iArgVEROeDskUb/co444WxwcA+iCGyxYPbAZNymH1g=; b=pz4RXzLdyiWkGHqXrdT3fX3jpGy9u5VMaoMfRVymqkn4JpiJi9YiAejLbEVPJ0Z/P5g4hR pVD27FKOpxUNk818a24hTLYQd8mNMgMbLrw+nGwX9MneOwayKMVHnfesjXsv3BZNZow/iC LEagIs2S3aqwGAJvUT9qM36mmbFVFIA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706282748; a=rsa-sha256; cv=none; b=pOcZNTO5qlAjpaRWVUEEdANs4yd2asv/s8wzfRAA+NlVRlb4Ln+SOT+LnCJOWMlCQrymcK pi/PBGpC/2rhXMrelmXnPEUOAuEytC1eOgRXQrLrwsGbmcscDB/ptguSIx51lVpLZMnM/f 6qbByQyap2wj4flnG+sxNjlfQBv56PQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dYyUEugy; spf=pass (imf29.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.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=1706282746; 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=0iArgVEROeDskUb/co444WxwcA+iCGyxYPbAZNymH1g=; b=dYyUEugy+xtDscuDVSmLIJChMKlpJo7hUQlBy8G4LmvOhGPDib/TUY2KXKt7cRInLKAa1I b1QrLCFOaKrSbCu0c2Y3x47nwNUIIzTHzZvBCbhCbYQlzL25YqVImvkO36hN0p1LqAbwUF 8bvuvbI8HTBoL2mr29vGEt4GJQlLJPQ= From: Gang Li To: David Hildenbrand , David Rientjes , Mike Kravetz , Muchun Song , Andrew Morton , Tim Chen Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [PATCH v5 7/7] hugetlb: parallelize 1G hugetlb initialization Date: Fri, 26 Jan 2024 23:24:11 +0800 Message-Id: <20240126152411.1238072-8-gang.li@linux.dev> In-Reply-To: <20240126152411.1238072-1-gang.li@linux.dev> References: <20240126152411.1238072-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: p95sqduyqwhgqjuguxmrk561tfd5ydap X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2930612002C X-Rspam-User: X-HE-Tag: 1706282747-284635 X-HE-Meta: U2FsdGVkX1/aKlKnYRPNaTwfk+krui9oIpeB+jDgghAuqDGD18iLgXm3fSBgPrjfnQahDeUZ2CYRr3+dOBsmxbEy9rRweknyoLgunZaSQh3FIfuQpwBSmKJ0as3MPZwBV6sJ+U2ICs30Ztip9PyMKkG7/CV9FSNbqxA1KdKSZQ7oTJyYyAmKqVIjGfPQkZ5FlvS9nX5Otn8qTUq6zuJNDnDnbLL8+YwRitt6hN9NtHqiaQLRN+MccgYinuGrUlQvp9Uv+qSarN9P86sdknrBihVnCX/HnGpNEiTJPF77txxqvBHQdb3ZuZweE4SPna0NMV76VJbT9gSyJ80v6K/Q9GUWb5dTq3CRPdq5E+vyJZKx9PRv1XapIvxxldhSyTcUCxxciUe6JnSIo5wAk1PDt1OEUoOJh1XR9PxDHVprq5wpv9veg7EjDlwNTGXbPWtu39PT7KuRdbkiVrrsIYk//mSZmp8RtaO0NNLdhULm28am/NHumgyNyMHUxwVvH24Glzk8Ejpv/0UifnNkz69JawddtabYutlZVaFax4929JKr/8OHafnBoYqgJVn0Qy3xJBZrP6NmR/tQ2fY0gAhfyFi8nTAs0se3BXwnBlCQXZeeBNb5SfEkM8x0grlayYHS+6pyXxyWyuRPvKi7YEYmUvXeENFytlvR1QNr5swPJ7yxW76t084uEnf5wvqSzOFq1/RenBnj9vD0A+LXU0IW7+4G62Xd+ExPV1LrVJgzjugIEXUPiFmZiCAryI+rbRySrE0b2g2z3QM2KWpsj9VCj3uwadN4areWwdYr9vq/UMdXjqpbVT7//zaw+wyC7rYDUW4CP87CDJjAh6bD7dTU7Q== 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`. Here are some test results: test case no patch(ms) patched(ms) saved ------------------- -------------- ------------- -------- 256c2T(4 node) 1G 4745 2024 57.34% 128c1T(2 node) 1G 3358 1712 49.02% 12T 1G 77000 18300 76.23% Signed-off-by: Gang Li Tested-by: David Rientjes --- arch/powerpc/mm/hugetlbpage.c | 2 +- include/linux/hugetlb.h | 2 +- mm/hugetlb.c | 44 ++++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 0a540b37aab62..a1651d5471862 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -226,7 +226,7 @@ static int __init pseries_alloc_bootmem_huge_page(struct hstate *hstate) return 0; m = phys_to_virt(gpage_freearray[--nr_gpages]); gpage_freearray[nr_gpages] = 0; - list_add(&m->list, &huge_boot_pages); + list_add(&m->list, &huge_boot_pages[0]); m->hstate = hstate; return 1; } diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index c1ee640d87b11..77b30a8c6076b 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 385840397bce5..eee0c456f6571 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 = NULL; /* initialize for clang */ - int nr_nodes, node; + int nr_nodes, node = nid; /* do node specific alloc */ if (nid != 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 = 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_node(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; @@ -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 = { + .thread_fn = gather_bootmem_prealloc_node, + .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; @@ -3600,6 +3618,7 @@ static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h) static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long allocated; + static bool initialied __initdata; /* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic(h) && hugetlb_cma_size) { @@ -3607,6 +3626,15 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; } + /* hugetlb_hstate_alloc_pages will be called many times, initialize huge_boot_pages once */ + if (!initialied) { + int i = 0; + + for (i = 0; i < MAX_NUMNODES; i++) + INIT_LIST_HEAD(&huge_boot_pages[i]); + initialied = true; + } + /* do node specific alloc */ if (hugetlb_hstate_alloc_pages_specific_nodes(h)) return; -- 2.20.1