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 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 Content-Transfer-Encoding: 8bit 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; -- 2.30.2