From patchwork Thu Feb 6 18:50:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13963565 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 42D06C0219B for ; Thu, 6 Feb 2025 18:52:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 350E8280011; Thu, 6 Feb 2025 13:51:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D5D4280002; Thu, 6 Feb 2025 13:51:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 08DE8280011; Thu, 6 Feb 2025 13:51:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D9E48280002 for ; Thu, 6 Feb 2025 13:51:48 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 99DF2B2650 for ; Thu, 6 Feb 2025 18:51:48 +0000 (UTC) X-FDA: 83090413896.18.9054576 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf06.hostedemail.com (Postfix) with ESMTP id 6D2DD180007 for ; Thu, 6 Feb 2025 18:51:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gm8nmc3A; spf=pass (imf06.hostedemail.com: domain of 3wQSlZwQKCKIHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3wQSlZwQKCKIHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738867906; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1RY4Sckn7GWnsNuNzDlgUqe5LNqypC0myFrtZsSR9cE=; b=vFRJSwcRRiqkg+6mRAW4KfUcguwKCFTzqSiWV+lxxGekebeW34W691/peekhXELRWaSSA9 cwB8qAHG61EQet3kdYZD7ecvDXDRB7t79ul7v2mXp1zai7vlAbLyBc3IGXQUazmKUO1HtO K+/hUOY2+NbBpeauWgEx41pz+j8xIHQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gm8nmc3A; spf=pass (imf06.hostedemail.com: domain of 3wQSlZwQKCKIHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3wQSlZwQKCKIHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738867906; a=rsa-sha256; cv=none; b=6d3793WLaBgmEsPsfIkTpzeT9gsz2ccjPmyhj/BoMVTMXwGN83ZqrnLYQPJiDe8KxFI4iL xWSyKHW8iVa4bIfbFO2c6ypTuSvmvOb+uh6A1hwNU7iIWo2HaF3nu3nnaOATwNoijlYJpf dAVKA1Lqf2yixvoufLQG8R6KjvaUoYI= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fa166cf693so1877754a91.1 for ; Thu, 06 Feb 2025 10:51:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738867905; x=1739472705; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1RY4Sckn7GWnsNuNzDlgUqe5LNqypC0myFrtZsSR9cE=; b=gm8nmc3AizK+7xoNt7vWXTgASiOf2OEPxjch8g4OqfKT3lhedYGXJ+IUFaep8lpsih FMB3h5bIT+ljj/k5f33obNomnBXCY3c3POQWXahB3NJKzeplHLhE0IDSGVdhbQQXxKO7 FYE5spBaWRYodZnArnZOgeL0uYLnjMV1ljT3arqJiZo3yLFqAeXC5pcNCxaFanbrlK/8 yhioGTdT1g5Jj/PK5aVwL8sF+GZ4N12uc+gKS3/FHZKHGyJr8Qb2g7ODIrGsOKlLSCw4 r6RQBMsT8dBv8LpXlTnczzXRTsLo17Puc+QLU5b7P3MTSApOLorSU2cGccNVCUQ4FFHf 2D9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738867905; x=1739472705; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1RY4Sckn7GWnsNuNzDlgUqe5LNqypC0myFrtZsSR9cE=; b=WkUXtZccjSDxmYz/ISlKyUTQdX5pkYa+Urmy42vIRjD1y125Aa53wDdjDTGy8tWV2L 90nzBJJcj30M0pDW2JzarFNETx3wRdvvVihm+og8Vn17GCCp0DyUBbLgPRI3O1y1b79U Nyf8RLeltjYLcVeG/Q2tq1o9xKo6dRNwGWSNH3vZ3u1cx1kQPO2XcU2aY+jHD+pH4BfX ZiKiI7g9OSKhiKX5XHIVpzQctwadQ0eLT9NoTGj4vdivErArBqgd7VurKJzHJKWkiuix k3B7XgZK17RULRICRtK9VRlB/WGl28m+KJy9qp01C6Jd/TRBxSWQCnH/ZZb52FVO3zgd arTw== X-Forwarded-Encrypted: i=1; AJvYcCWCSpydsqfIHKQdFf8LQQFC/eQ38esfM+uX7UrC7nBkTCXLSAXfV85cXKLbiea2h1ZSHT8jbe7rRw==@kvack.org X-Gm-Message-State: AOJu0YxHt1iMz6y0v57zTg+EhrLrN22dovTzJ5OEQLW6OJAR5xlk7QnG jGTReYHtqlooqAbgFpbxkcYTGBCR7Hrpsi4J/yHFYVbsFzXhdAZrDsgPZxR/ccDFX25piQ== X-Google-Smtp-Source: AGHT+IGv5wn5p5nXx7RKxFjYk6wjYFPCzyPzBbZhXtDcOU21vQXSokgZmbD3Gr14JvKdrzDwy2bARR7t X-Received: from pgev18.prod.google.com ([2002:a63:ac12:0:b0:abb:a12f:81a8]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9985:b0:1eb:7da4:305e with SMTP id adf61e73a8af0-1ee03b70cbcmr733791637.39.1738867905422; Thu, 06 Feb 2025 10:51:45 -0800 (PST) Date: Thu, 6 Feb 2025 18:50:58 +0000 In-Reply-To: <20250206185109.1210657-1-fvdl@google.com> Mime-Version: 1.0 References: <20250206185109.1210657-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250206185109.1210657-19-fvdl@google.com> Subject: [PATCH v3 18/28] mm/hugetlb: add pre-HVO framework From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6D2DD180007 X-Stat-Signature: n5x9989pkq7asdymgofn1c33odkh7x6u X-Rspam-User: X-HE-Tag: 1738867906-628166 X-HE-Meta: U2FsdGVkX1+qun+6DUWBYM0StrURBeWF0ypp0531kqaQRuC6JgjK7AwNdSmVkIZSvwHJo7zEXg/o6uevmzuOIXrOE7jYVzLubxiKa2IS4XfdD1D5dA0inVpMxRakm9TmT35QULVekpohchnx54Tez+8dihNe4FRYNfa6tkygpqTQmSh4UOe+RZPb8+GOSlExLJvF3+TaWH36HjspPaUlNMZWj7eQUkLFpoNnogy6mwFpAoUQ5asE7dgHICbvjWfHaL9pFTZvc+YztvVJe9O93oODA/mPy09cWP3xWQWkKkHsHYG0wN6mIJeUM048wtLNTerVKflWygFK4skKvqnenoG+Mziy4utS2SsmN7aNJOfwFrZDckds8oTDzZ4pCp7wBVuTzN6rk1hD8Wp3KODXMU5xeLdGap5MYC3Dr5sm9G6y/xY0gIuxQABDnEAI+iPHvyOcc8x6jpNhVTOUFoE93lENjVoTaE3ZgVr+rRMft6YQiOTOs55sVOY2rmpQUn2RBVf/meEf3jAR8pdyAeNWVwFPZkAaBxvHw8f6AV8TfxM8LmsXwXHM2bSWOE77Xcuv/eXjm2DJ941bl0oQUDfn1q2/4bm5SGsqI2IHs11YzT+z3v8bV2rClezBZbfSzM4WdQ03kCvLHAP0suNW2H5ayqV4WG1Xgthqx94xBzWFObq6I1GteSLqTQyBiW41T3lXfyX/RWjOtEue6XTfhVgz8wBCKpijBx7yE7T82DbObTsO2L78bwKYf0yLY9wB1wCd6k8p+OhQkMTzGWAnOfjrB4nxjZGpttrh7s4951sl921UIx5s82U89GkE06BgdsqO5LPF0e8uBecDOiJFaw98bdtjIezaxGQUIO5GpAdwZP3aUfj8AA9CDOX+XCa8GMSM4rzc+CnEM4C5NC+mtbB5hy6mcUV/7Pz/lgk+n0/01KzXP/Hi3yBpMDXF8xzTtdrUaMd90VY9q0HgYhlUzHO 0o4zP03A mWue5EiKIs84ytNW6PECB3KJgo5Z9+J0W8DncR6GkhCoIunlDj9gbB25fo0q7Lcz5VGv3xsF/moIg7iDVBfRV14SX8+/tKzuvDFKSaMkCkPm+tptfjWqVdri5kse02dcri3szNWVH1a9KbYgbZn7f9GAPgpp9YjDwh8/RrgqGiDM8ODAnHfeTROJ8wTPgB9u4QA7KqpIKxrAqrm2B2XyShOb2DfpD+Y3U6egWAh4hGG3ZGzcEuRef4OEsrXcUCTvAzSe3aynFztoNkPkLddoRFEOElIJ4uOODHSKShKMfF2KPs1ExOZh1vzGMaOfn5k3aXHX7nbC4prdidGhXMpDF+SyYNJvbAp33imIcPQwNlThiSp+97A88miCIS2L4y4lAynNwob/GAl8+2Hb5O6jpE746aqMy1d2aNlWQv+bGQiPvgq4PKcmRUH6iOKFWzjbGdo6DS/T6YE9CMeEYKLOSunPQ6+9qMUxjrVPEZHoR1gbxCvRDCTgFC1PRMbxPsI2FD8A0kWndd+DE4wlVplVffCKfXg== 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: Define flags for pre-HVOed bootmem hugetlb pages, and act on them. The most important flag is the HVO flag, signalling that a bootmem allocated gigantic page has already been HVO-ed. If this flag is seen by the hugetlb bootmem gather code, the page is marked as HVO optimized. The HVO code will then not try to optimize it again. Instead, it will just map the tail page mirror pages read-only, completing the HVO steps. No functional change, as nothing sets the flags yet. Signed-off-by: Frank van der Linden --- arch/powerpc/mm/hugetlbpage.c | 1 + include/linux/hugetlb.h | 4 +++ mm/hugetlb.c | 24 ++++++++++++++++- mm/hugetlb_vmemmap.c | 50 +++++++++++++++++++++++++++++++++-- mm/hugetlb_vmemmap.h | 15 +++++++++++ 5 files changed, 91 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 6b043180220a..d3c1b749dcfc 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -113,6 +113,7 @@ static int __init pseries_alloc_bootmem_huge_page(struct hstate *hstate) gpage_freearray[nr_gpages] = 0; list_add(&m->list, &huge_boot_pages[0]); m->hstate = hstate; + m->flags = 0; return 1; } diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 5061279e5f73..10a7ce2b95e1 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -681,8 +681,12 @@ struct hstate { struct huge_bootmem_page { struct list_head list; struct hstate *hstate; + unsigned long flags; }; +#define HUGE_BOOTMEM_HVO 0x0001 +#define HUGE_BOOTMEM_ZONES_VALID 0x0002 + int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list); int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn); struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 52ee5514a1f2..7e0810c217ce 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3219,6 +3219,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) INIT_LIST_HEAD(&m->list); list_add(&m->list, &huge_boot_pages[node]); m->hstate = h; + m->flags = 0; return 1; } @@ -3286,7 +3287,7 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, struct folio *folio, *tmp_f; /* Send list for bulk vmemmap optimization processing */ - hugetlb_vmemmap_optimize_folios(h, folio_list); + hugetlb_vmemmap_optimize_bootmem_folios(h, folio_list); list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { if (!folio_test_hugetlb_vmemmap_optimized(folio)) { @@ -3315,6 +3316,13 @@ static bool __init hugetlb_bootmem_page_zones_valid(int nid, unsigned long start_pfn; bool valid; + if (m->flags & HUGE_BOOTMEM_ZONES_VALID) { + /* + * Already validated, skip check. + */ + return true; + } + start_pfn = virt_to_phys(m) >> PAGE_SHIFT; valid = !pfn_range_intersects_zones(nid, start_pfn, @@ -3347,6 +3355,11 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, } } +static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) +{ + return (m->flags & HUGE_BOOTMEM_HVO); +} + /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3387,6 +3400,15 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) hugetlb_folio_init_vmemmap(folio, h, HUGETLB_VMEMMAP_RESERVE_PAGES); init_new_hugetlb_folio(h, folio); + + if (hugetlb_bootmem_page_prehvo(m)) + /* + * If pre-HVO was done, just set the + * flag, the HVO code will then skip + * this folio. + */ + folio_set_hugetlb_vmemmap_optimized(folio); + list_add(&folio->lru, &folio_list); /* diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 5b484758f813..be6b33ecbc8e 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -649,14 +649,39 @@ static int hugetlb_vmemmap_split_folio(const struct hstate *h, struct folio *fol return vmemmap_remap_split(vmemmap_start, vmemmap_end, vmemmap_reuse); } -void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list) +static void __hugetlb_vmemmap_optimize_folios(struct hstate *h, + struct list_head *folio_list, + bool boot) { struct folio *folio; + int nr_to_optimize; LIST_HEAD(vmemmap_pages); unsigned long flags = VMEMMAP_REMAP_NO_TLB_FLUSH | VMEMMAP_SYNCHRONIZE_RCU; + nr_to_optimize = 0; list_for_each_entry(folio, folio_list, lru) { - int ret = hugetlb_vmemmap_split_folio(h, folio); + int ret; + unsigned long spfn, epfn; + + if (boot && folio_test_hugetlb_vmemmap_optimized(folio)) { + /* + * Already optimized by pre-HVO, just map the + * mirrored tail page structs RO. + */ + spfn = (unsigned long)&folio->page; + epfn = spfn + pages_per_huge_page(h); + vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio), + HUGETLB_VMEMMAP_RESERVE_SIZE); + register_page_bootmem_memmap(pfn_to_section_nr(spfn), + &folio->page, + HUGETLB_VMEMMAP_RESERVE_SIZE); + static_branch_inc(&hugetlb_optimize_vmemmap_key); + continue; + } + + nr_to_optimize++; + + ret = hugetlb_vmemmap_split_folio(h, folio); /* * Spliting the PMD requires allocating a page, thus lets fail @@ -668,6 +693,16 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_l break; } + if (!nr_to_optimize) + /* + * All pre-HVO folios, nothing left to do. It's ok if + * there is a mix of pre-HVO and not yet HVO-ed folios + * here, as __hugetlb_vmemmap_optimize_folio() will + * skip any folios that already have the optimized flag + * set, see vmemmap_should_optimize_folio(). + */ + goto out; + flush_tlb_all(); list_for_each_entry(folio, folio_list, lru) { @@ -693,10 +728,21 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_l } } +out: flush_tlb_all(); free_vmemmap_page_list(&vmemmap_pages); } +void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list) +{ + __hugetlb_vmemmap_optimize_folios(h, folio_list, false); +} + +void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head *folio_list) +{ + __hugetlb_vmemmap_optimize_folios(h, folio_list, true); +} + static const struct ctl_table hugetlb_vmemmap_sysctls[] = { { .procname = "hugetlb_optimize_vmemmap", diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 2fcae92d3359..a6354a27e63f 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -24,6 +24,8 @@ long hugetlb_vmemmap_restore_folios(const struct hstate *h, struct list_head *non_hvo_folios); void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio); void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list); +void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head *folio_list); + static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h) { @@ -64,6 +66,19 @@ static inline void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list { } +static inline void hugetlb_vmemmap_init_early(int nid) +{ +} + +static inline void hugetlb_vmemmap_init_late(int nid) +{ +} + +static inline void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, + struct list_head *folio_list) +{ +} + static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct hstate *h) { return 0;