From patchwork Fri Feb 28 18:29:18 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: 13996916 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 21187C282D0 for ; Fri, 28 Feb 2025 18:30:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C666280013; Fri, 28 Feb 2025 13:30:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 573C5280001; Fri, 28 Feb 2025 13:30:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39EB5280013; Fri, 28 Feb 2025 13:30:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1948C280001 for ; Fri, 28 Feb 2025 13:30:20 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BA8FD1C8239 for ; Fri, 28 Feb 2025 18:30:19 +0000 (UTC) X-FDA: 83170193358.05.EAB290C Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf16.hostedemail.com (Postfix) with ESMTP id D116B180018 for ; Fri, 28 Feb 2025 18:30:17 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sf7+UT0J; spf=pass (imf16.hostedemail.com: domain of 3uADCZwQKCAcm2ksnvvnsl.jvtspu14-ttr2hjr.vyn@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3uADCZwQKCAcm2ksnvvnsl.jvtspu14-ttr2hjr.vyn@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=1740767417; 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=+u9YpCDfOddo7IoooZ06HWMpfAumbRB14bwYiVvX4Wo=; b=DZdTzNjiycwS0m7OlF5SY5fKqwLvQyZqjEWdholjnjXdjibMlQOFkpI5Ov/6rJeEKREhtc 2qZhjbPmmGrqgchCjivZr+QyfADpIJcmIrVk+knj+IMOzYj6Cc2hekgxerTyziIkGcmefJ Pun+5kUEDmrjet18cIKyjH8xrzI+mK0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sf7+UT0J; spf=pass (imf16.hostedemail.com: domain of 3uADCZwQKCAcm2ksnvvnsl.jvtspu14-ttr2hjr.vyn@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3uADCZwQKCAcm2ksnvvnsl.jvtspu14-ttr2hjr.vyn@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740767417; a=rsa-sha256; cv=none; b=R0vGBSfXBzjBpODSXdywbYFNbn7siXc2GdRYv9aaMSmgAQ5aZtvtqwSBzUBxuwNUS4bOdf uhIXOdQh4+Eadx0EztjrApy0pAihCVi4/sS+Rrq1HZiofu9ugq1/LvAd06ZI7yS5gVgl/Q PlUkDaHqTsGjwsztLHAB3YCondWRLTk= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-21f6cb3097bso65132505ad.3 for ; Fri, 28 Feb 2025 10:30:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740767417; x=1741372217; 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=+u9YpCDfOddo7IoooZ06HWMpfAumbRB14bwYiVvX4Wo=; b=sf7+UT0J75lV4KLBsnDtPAo5KgKFaAVoRPWfro1CR/nYM8y7ioecwrgom5Wh5dTfJU Wg7fcbDTNZ9Srhbtd1Sdrm8zLDC2gB20z2NQJblhB/XHEZ0xMH3udTx9Vnzlgy1+RT8z YoOqCYCSTmdudJVXc6NEfoLe3KL5f6/tHOfLYzk138NZX9C9DOvhEswLKtU2f8tJAPBV 1tXNawkX6iEJaETCqfXazMDUCm/B4RMlvJo4vAnOeNkSCszWwHoykN0vwDYMziqCaZi7 PGJHtGuNcTrzXWvuYnhW3s7acJOqOmuoq2f2L850gx2rGzU+/t7M/50IPcHGCi6JzD+M rxTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740767417; x=1741372217; 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=+u9YpCDfOddo7IoooZ06HWMpfAumbRB14bwYiVvX4Wo=; b=t5YHFGo42XZaEoCLljuB9Vxd9+R1QOnqFMqMCu04xqsfduTSm0kxpGan7Hz7ya3I3y yW7MYqZK5l8irhzbMbkExNSKgQdeVtXNORM/v29qGdZYBlILQjHNxiCAXi84NzTos5Xw MQLyoVDe2J1PJxcSnXi9Tw0katkvB4ZmnYh3LIrN6rFRAv0GQnRbCQBNJjg2k1Jxy9Sf sMyooB1otK0gojdlhT7h7NwmQicPf5Bh3TYyVjNLLkOXohyJJnoorIWpGx9Y4HAPztFh NxXcsvbszlYMLTnHfSQ6efT6uczBCPAa7vtiQCxxVT/KsOrKN5ZDxLXNRimBnWtL3B4V 1OEw== X-Forwarded-Encrypted: i=1; AJvYcCUorD+A7dO5Cr97SEZqbLFkJEklh5tjWdx/MdF+0x2PPM1D1dAh2hak+AiZTIKeQ+BeH07SAuT+CQ==@kvack.org X-Gm-Message-State: AOJu0YzGVxMqeARidXKMuqDer29ARxcX8q1vHV/v8mSDfPpeLkiyFy2B O/6WbqNZLRt1uq4st+QJIHExLJIxyFha5DoSrgAgzuC/n/u/B73Am5zWcRRcfL7bgE/5zg== X-Google-Smtp-Source: AGHT+IHTbxxgSRmI9JPbjqv6YVWrtnqd2U549w4/Q1RWPys+2AxjBGjQpLOqvUpKa1VvMDtiAePntETH X-Received: from pgc16.prod.google.com ([2002:a05:6a02:2f90:b0:aeb:ac4a:ebf6]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:788a:b0:1ee:d438:3fb4 with SMTP id adf61e73a8af0-1f2f4e0142emr6186292637.28.1740767416720; Fri, 28 Feb 2025 10:30:16 -0800 (PST) Date: Fri, 28 Feb 2025 18:29:18 +0000 In-Reply-To: <20250228182928.2645936-1-fvdl@google.com> Mime-Version: 1.0 References: <20250228182928.2645936-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228182928.2645936-18-fvdl@google.com> Subject: [PATCH v5 17/27] 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, ziy@nvidia.com, david@redhat.com, Frank van der Linden X-Stat-Signature: 568iuwho4oumu8dwf9fcnh69b374wxrg X-Rspamd-Queue-Id: D116B180018 X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1740767417-442455 X-HE-Meta: U2FsdGVkX1/GvHLgyRdZkBEKxj7vshBz6FiMgKgdqv0k2TtsJdSaK80KY+jkQAFaD49n0cCrGLYOhpY28hyJhPQg713WhK4ebw0QXxWsXk0EhhSesMgTCGq5mEIWwCNPyc3pmzG7ARN2HC0HCQRTO2/Qdk5PSTEdHt/IT7SRuOdwVJKfnn9gDtoEJ4VbCEYbo6soYPbJX+KrS+EbSTlbs/kdSI99FQs/D3TBsNrKS0Ub79mCESOo1nnSdz/B/qjMiMau2BM4pcr+xpyn7PGxWC0SiMwRwoUqiHGJL2+fx85xHup/Lu18Uak5U/FZthPk0wxzjZgBuxKE9rH8qsqG3njx+cwu0m6duidcq2MrOgGsE//nOyGo51CwNxIMbBrKqNlNWoO2P7WPA5Pn+V2hi6uvwPDfpux3OoNGD1tW7XOs1cmQq19hwVfrTm2hgRz6GcNQo7rgPNoUb/UBsaKPhweAEm6LDC5/W610fNj584hk1vKkshoScdX9X6ETVRt7p4ks1POBsWW0VoinmsEmJGUynZTSWfiEHm/fvv39RONPfFEUqWeceYfXm58mI/QN/6TCnZOaD7oheNdjP7wCZ40msLQh5wxakZL6VGNooT/ZzVilX1EayPTtFWI+mxKcNKcB1rm+S62egPw9MR6l4VMVGR6JcDyl1u0J5q2YJuLkUFEmzurx+Y/5MJBBV+pkZJ0fAQo4okwG+lffKj4Pxp4+ssEaR/cJqsfYS4thsy3WzW1nXNXXmb4ZAJvFeUTPQi80GYT9VK4LiAVbNxj3i9q7a0gTDnWQ+BYoWAldHN9m+wEDvZoBbMr3LatuIvhKtoqB+SWpqUa+GQfPRQqAjJzZQT49oHZ83Qljz771+fJd/HGffLvy7aXYCiYgDfdHOVPOrKo1h/hA8NzYAvrOxDeIfdOMO2SVgikRByz6NayWC874Rn5WgceSD2V3aS+6foU1nhwgSHaYMKSVea4 uegWsEMe t0RIJcKBy1kXjb7k6kSpkMutD3IQQdcHuw7qGf5waSBvyqC81QRdwxtmj0L6G4yBrXRnWM0b81ZcPB1bU1cKWB4mFMvdyRt0LgDF/56Ts81QFsEDe20jDQxPSiYY3hMTk2FjZhXKuuuqhc+zmhfxE3WUdQJ0VWflRlB0haovps67X6A4BNJK1ZGZJ1KpbDD9Q49s1g2HEjuJkjodBj8i61R0wJ22NfabhXibDRYKmtDYe4v8T+kXQzXoNKp9RpNbjJaLFILR9vDwpbOW7XuX/0WldnI4mi4UMYup2JfW6KW8wq89RBlxMNsiGkdfMyfdiSun2l2GGUJowrvwHiTFEu+rTCbsWbu51dlWkIhPlTlc9wmhb1kfXyTKBApsbNoWNSyTQrTPCGyD9XR+3WP4cbgY0RZqiD7CXhe420pf2Jp2JKzxkDRNz0sIONFY8N+FGRPOVCSOLINZzXi1VTtqisKxrTojovNXHzvVmPrJbDtsewE4M9fyJukKtCVBXPoWdrUtB308y7oRdV6Z3dCaQwi6O7g== 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 | 7 +++++ 5 files changed, 83 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 0f14a7736875..40c88c46b34f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3215,6 +3215,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; } @@ -3282,7 +3283,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)) { @@ -3311,6 +3312,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, @@ -3343,6 +3351,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. @@ -3383,6 +3396,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..71110a90275f 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,11 @@ static inline void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list { } +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;