From patchwork Thu Nov 23 13:30: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: 13466232 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 94572C5AD4C for ; Thu, 23 Nov 2023 13:31:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C0368D004D; Thu, 23 Nov 2023 08:31:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26FC08D0002; Thu, 23 Nov 2023 08:31:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 160688D004D; Thu, 23 Nov 2023 08:31:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 03A658D0002 for ; Thu, 23 Nov 2023 08:31:19 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D02FCB6773 for ; Thu, 23 Nov 2023 13:31:18 +0000 (UTC) X-FDA: 81489305436.22.66C5E67 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) by imf11.hostedemail.com (Postfix) with ESMTP id 03F4140013 for ; Thu, 23 Nov 2023 13:31:16 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Y71JssED; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.171 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=1700746277; 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=SVmsj9TN/aj38n19fqlW2b7zQkW3VvgWG56LLSCGces=; b=aibPNC0JJkR1oFGMYxwTh3YXIMgQQlhujSrti6JU5o8f9S0Ha+IZN5+fvN8dJu6K19AkMb Bg/Z+x6v+edOMAsqAHaglHiaTMj6pFBC4/6gHmX6G1uQM6FYp/vVlCbOeaLSj94/i/OsQ6 EPmWfP6ShD2bgDTeFZkwwjH1Yff73KA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Y71JssED; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.171 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700746277; a=rsa-sha256; cv=none; b=6R6f95njLj7hFXnX5iTI8uSdI6e14EV1GaUpCi3+oEde4jUubTCFYUJbd9fcamBHViaqB6 OTDtE/doZDk+CE0gD6/to7RJNa5kjnkaQWruowBjGQURQ6JSqePA+vkVGLJcM6acytGAJy CTAAAIXqN1lXxqFXBb/XXL0gavT3nXQ= 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=1700746275; 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=SVmsj9TN/aj38n19fqlW2b7zQkW3VvgWG56LLSCGces=; b=Y71JssEDzrYWYNV34cyzjaSirgHK0BrpKRWoKYtD+NlDt+B0BHOaS3CWA9Uyhz5yKbgj6g PimBt6l7h2P4kLFfkV0n8MPPjcmR9a/NNorQu2gY5FzktxNGVTBcPtxXi8OV6XSHGDx82i xNn/ddoatbelzCFAmHSUzrB3UJs23Jc= From: Gang Li To: Mike Kravetz , Muchun Song , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Gang Li Subject: [RFC PATCH v1 4/4] hugetlb: parallelize hugetlb page allocation Date: Thu, 23 Nov 2023 21:30:36 +0800 Message-Id: <20231123133036.68540-5-gang.li@linux.dev> In-Reply-To: <20231123133036.68540-1-gang.li@linux.dev> References: <20231123133036.68540-1-gang.li@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 03F4140013 X-Stat-Signature: akr1qpkd9gzfmgmqya78x4gjhieu5qhk X-HE-Tag: 1700746276-324600 X-HE-Meta: U2FsdGVkX1/8n8CnPiKihg7WmYotZGdBeC47sE5uK//+MinuaPN6M9a+uvYQt1dOAfYtvpkQhGHk9uJw53JHybE6bghS1cFf9h09X9WbqCSLjOtpwQgaT+DymMqodVGWGPiFRKQ8fTTLqjmDkorweZlrpqJPr5hXpG/B6USZWKbA3QtUx27jLCxNy667hhjWLE/ZSNH20sf7+6FdufMx+U1IJzh7e5ALNPAkZljPMs68cQXFGcgWPqZ804lCNOAMVMQsIJxnjnWYsS4YTfxZ+74IyLS2817fB+HokJfkzlk7saN0lfFiv9La5pdKAYmE8aIYwDfKni4yvhHFYv5vKTSaBfObyCHDbzTdCg/eEUTMJzGtxk/N3N+LV81bE1LS8FvlHCD0VfKHSJLXV7S6OjEDf9GLnfK+EreRnDhgSEc/Oo6tvgmkXmqJutXzeAlBIIsy4l0NyeoRbtzR/pYXRhLAw0xZR7vOFHqRw1oLKSkSuLECPBvBZCFvKwMOCZbNznnIzVXiPq2Kcsupmjqrv8hQebIIo6rfb/Smua9+9Xn2U2NtPsi/9d4/r9rxtfWRmIkPXO2SSz4rOu56m7dfRdWSbawiiQfH3Dgz2kTjpKW/j6ZdHawjN9p5LuEhWwbDn2DepmjaDWrUXASmCdxgJLyvSTjxrJZXSXz4IkrWpAG/DtsTLPhH1yYrpz5xN9QCVXVW7xZRXfUOp3EdaMsuMEOIh7mi6Ab7D7n3wde81xnZGZXncuSKrfB6fLtqlMrlxJdSANMIyiPepFUil9UrtrnXfcondo1y0YH05kDTXKYLSNSheiD8HCmcAHf/8SO7cgHUyo6NOgiDHmv6aEe3D0OYfe4qvyID/v2vYsr7TRv5BXxUrC380UqYKU+vuAXHysuRUN3UGzhgaROFVtIp74q1lU+hTxZxuHtLnYniH5U9IwkUWASMFyV3dQ0Fl9ksM49ZYth0htg4TeEV7kq XhniqLXC WHH1oj3oZQbXh1Z4bHXLOVloJZZ+fpV+1JswX2vnxNSjF1j0wpuqC2wi5367jDZjlJoZ9BXVrMSSwxASf2k26Q5go3+QCIgvnbWjzx4zs94eEvSg/4MvCBAiB+BIK7R+SeiQO 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: From: Gang Li By distributing the allocation across threads, large hugetlb configurations can allocate pages faster, improving boot speed. Signed-off-by: Gang Li --- mm/hugetlb.c | 89 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ac8558724cc2..df3fbe95989e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3509,6 +3509,55 @@ static void __init hugetlb_hstate_alloc_pages_report(unsigned long allocated, st } } +struct hugetlb_work { + struct work_struct work; + struct hstate *h; + int num; + int nid; +}; + +static atomic_t hugetlb_hstate_alloc_n_undone __initdata; +static __initdata DECLARE_COMPLETION(hugetlb_hstate_alloc_comp); + +static void __init hugetlb_alloc_node(struct work_struct *w) +{ + struct hugetlb_work *hw = container_of(w, struct hugetlb_work, work); + struct hstate *h = hw->h; + int i, num = hw->num; + 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(); + } + + if (atomic_dec_and_test(&hugetlb_hstate_alloc_n_undone)) + complete(&hugetlb_hstate_alloc_comp); +} + +static void __init hugetlb_vmemmap_optimize_node(struct work_struct *w) +{ + struct hugetlb_work *hw = container_of(w, struct hugetlb_work, work); + struct hstate *h = hw->h; + int nid = hw->nid; + + hugetlb_vmemmap_optimize_folios(h, &h->hugepage_freelists[nid]); + + if (atomic_dec_and_test(&hugetlb_hstate_alloc_n_undone)) + complete(&hugetlb_hstate_alloc_comp); +} + static unsigned long __init hugetlb_hstate_alloc_pages_gigantic(struct hstate *h) { unsigned long i; @@ -3528,26 +3577,36 @@ 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; + int nid; + struct hugetlb_work *works; - /* Bit mask controlling how hard we retry per-node allocations.*/ - nodes_clear(node_alloc_noretry); + works = kcalloc(num_node_state(N_MEMORY), sizeof(*works), GFP_KERNEL); + if (works == NULL) { + pr_warn("HugeTLB: allocating struct hugetlb_work failed.\n"); + return 0; + } - 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(); + atomic_set(&hugetlb_hstate_alloc_n_undone, num_node_state(N_MEMORY)); + for_each_node_state(nid, N_MEMORY) { + works[nid].h = h; + works[nid].num = h->max_huge_pages/num_node_state(N_MEMORY); + if (nid == 0) + works[nid].num += h->max_huge_pages % num_node_state(N_MEMORY); + INIT_WORK(&works[nid].work, hugetlb_alloc_node); + queue_work_node(nid, system_unbound_wq, &works[nid].work); } + wait_for_completion(&hugetlb_hstate_alloc_comp); - prep_and_add_allocated_folios(h, &folio_list); + atomic_set(&hugetlb_hstate_alloc_n_undone, num_node_state(N_MEMORY)); + for_each_node_state(nid, N_MEMORY) { + works[nid].nid = nid; + INIT_WORK(&works[nid].work, hugetlb_vmemmap_optimize_node); + queue_work_node(nid, system_unbound_wq, &works[nid].work); + } + wait_for_completion(&hugetlb_hstate_alloc_comp); - return i; + kfree(works); + return h->nr_huge_pages; } /*