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 4A47FC47074 for ; Tue, 2 Jan 2024 13:13:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5D556B019A; Tue, 2 Jan 2024 08:13:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D09846B0248; Tue, 2 Jan 2024 08:13:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA9016B019C; Tue, 2 Jan 2024 08:13:49 -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 A667B6B0199 for ; Tue, 2 Jan 2024 08:13:49 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7CE21807DB for ; Tue, 2 Jan 2024 13:13:49 +0000 (UTC) X-FDA: 81634413378.25.1BD1B01 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) by imf26.hostedemail.com (Postfix) with ESMTP id ABEDE140006 for ; Tue, 2 Jan 2024 13:13:47 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="wooXcU/d"; spf=pass (imf26.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.180 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=1704201227; 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=PV0S7W1YGzJ0pEPZj279MYSeM1ClpTdHk3joXGH5wj8=; b=sO4Z3ZvqCH5i6l7Q2+v4iove7yqDyMtUDrNdSKSla3QSEfrA5X5AgdiAaiU7AGSjFahrjL 5n0Jw6oOEYq9K7bwo/zEpW/gjdfEJMLfC5xDIgxzDoRB/1kerValBmZwf75wzRkOntZ+o0 MN2tJI1ld+Vt7WpRsmXYkgyv0XiinKo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704201227; a=rsa-sha256; cv=none; b=EqMGIdmu5/ZnOxFVJC5luI/5xvOPE+mOE2723eo5v0uxaqmOWzRcX7GkFyOoIgWc6EaR1t sSdWvnicuikVf3j4KEZJbb2TkU0mMmNuOnKMbWkGXjmuNZufKd2S2tWfH2KQt0xzVqVSO8 fE/xjx3ZK+dtYR5dY5uGUC3qS6etYeI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="wooXcU/d"; spf=pass (imf26.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.180 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=1704201226; 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=PV0S7W1YGzJ0pEPZj279MYSeM1ClpTdHk3joXGH5wj8=; b=wooXcU/dpB/9amxwWmyP5fx/4g8+s4Wt1e1ITrrRQgXh2eG2jtsfU0P9ici3t88EkmQfCM MJRecVKTfFX3pTTZU6TfsN5mYo5/0+ARbG4H+KzX5EFaHgXHY+NU17YkBHCK8+K0nyvYdy VrYNkQIKDDwuAPmaCwH0QTwGhcuFBOI= 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 v3 7/7] hugetlb: parallelize 1G hugetlb initialization Date: Tue, 2 Jan 2024 21:12:49 +0800 Message-Id: <20240102131249.76622-8-gang.li@linux.dev> In-Reply-To: <20240102131249.76622-1-gang.li@linux.dev> References: <20240102131249.76622-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: ABEDE140006 X-Rspam-User: X-Stat-Signature: gbufbg177rjqgp11jbq3dwch1gwbxewr X-Rspamd-Server: rspam03 X-HE-Tag: 1704201227-821873 X-HE-Meta: U2FsdGVkX1/u5zfrnSGQ8RVJDMP/pCSbBnJKQzybh5qAgvDwW6eHaIZE8gZ+MjXMU/CNlSIlLrEnf1EfLz49uUkNbxnfT06F27ffcdYWxR7SSDVZUMkUwvdLYycw5hCuSIvg8DBLX5zKac1qnzrFo2pyF8E7WLZvUUANyMQOoqyTyD1xN19ymB2JH2s2XbF/QX8T9aSW1G6lqubuEexhgLEa8YVnBN+1gFF8uPcJd9lBaxfurOUWZZ0KTiou3k7YIGGpWqtFATzXhImGoDmVKnNH8/wZpKmHexCfJ8oHKpLWcP7kq3AK5OdaDNqk9kNMkktg3F7ZpsOxr75E+Jccl6UZ+u6jnBMeuNi6qHbmFpUKVbxOh7dZdAr05/lXkuo803w5oWgtMQ5LX9vf+CfhlV5QhNoaNlKnPHGuI12SEDNL/TysB86qd0YbfngDe7RC4PLwb7z4ESeCQ0EwtyWcHixNXJHv+w/I/7hlex5A0vhWIt827NXz+fpDzECviVoG2tP7F5SFF0LSeE9qAlMIyl2XnC16EB6YRWS9C6Yyhr8U0ivIMeNY5Af+sKeoZwMR3QPUte1norvvx7Ijli6bWElZybB4jy2w2nDZmzLD0cyP5pnJp3dV0QDxvjkI3sgTTJqyxqyoj6ic3NTTjbtr1SunF8hFKz3oxtvkGJ0GYD/VqRFHMhbcslnwlTva9nO4B4Z2YxcwEhQdjUlvU4yAhT1D+snD/IsRlFHPVCM93ahLreWPxU2in1mkgFWVLnx9tma69F2BCn+2LE/TIMjwvtk7I1VdsI6Sl2QdMzIECXvIFcmdcoxyWFVjYdRrTvkRbu35dLcbNYIKficGfGzT8f++maqWZ4G2ol+WdfI2dSlzszJ4FbLthTjlAEY4/sDj1ULyzZ20lRL2NTRQoDis4SQhQrijakcCfsojQ/ALEftIJw3ZcL/QOP6SpSUy1Agdx9dP1ZXrti/Mkx/9j7Z 3TVWh+0k 1cRTrab6J5TfvKBsIXoLra7jahF2TZrw8GXymDLDq8m2fQDvsag9X6WJWWiYsCaXQCB3FPBZJwu4heHs= 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 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 --- 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 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 d1629df5f399f..e5a55707f8814 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; @@ -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(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, + .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; @@ -3606,6 +3624,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; -- 2.20.1