From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7D9F318B96 for ; Thu, 2 Jul 2026 16:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783008231; cv=none; b=jM7ubLWBhDy844Lx2S8bFLolTbW45GovU8kEEimNzmbtTODvzetDC9yAuMcDtOgzAMhqPMF7Z+25E33BniZ3Znuly3vBcRTaNiKRScZyiGmH6wIA+BFU369tt/wFbxrD7sCeaaTT6RtuzoTWLOzAbh7qYH93b1EjYewsM23M88w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783008231; c=relaxed/simple; bh=uTllx4DOqEOddmqiqW7qBHzQolA8LvsHapTZ3rwg8cY=; h=Date:To:From:Subject:Message-Id; b=A7iscocP2IGKyUTktEch05ugC8mkqIb83pURlJl98UST/cG8RNVh8hnsjTFUAcSBhpgvT5I2dDe5s9sNkOi2RMHvZFMkrZGB3dUaGD4wucpqaDAbZ7Efn4ojrk3UkANEcyeKSywk8xvi/OxtsnhMK/vsKCssbnB03fRZFdEvfiA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=1GAQtRUX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="1GAQtRUX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0E571F00A3E; Thu, 2 Jul 2026 16:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1783008229; bh=0dVonKNdaJ21+qksgGS6C56yvILOZwrgmk7ewDasxFU=; h=Date:To:From:Subject; b=1GAQtRUXQk8gcjYKMMaNJiN2lDB3+KAtENIbvFtpV0J7bvIvwvX2tWNFuhetlRhc7 THroUJ3gWPpjMAODnTCITFpBsP2VW0mmVNfwCFYBzTRyghfSUv5gDljDgZlukx8SV3 TN6LppBcDYYYlbnKi388lUkc1k7NNlM8W5u6YAsk= Date: Thu, 02 Jul 2026 09:03:49 -0700 To: mm-commits@vger.kernel.org,lizhe.67@bytedance.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-factor-zone-device-page-init-helpers-out-of-__init_zone_device_page.patch removed from -mm tree Message-Id: <20260702160349.C0E571F00A3E@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm: factor zone-device page init helpers out of __init_zone_device_page has been removed from the -mm tree. Its filename was mm-factor-zone-device-page-init-helpers-out-of-__init_zone_device_page.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: "Li Zhe" Subject: mm: factor zone-device page init helpers out of __init_zone_device_page Date: Wed, 1 Jul 2026 17:05:47 +0800 memmap_init_zone_device() currently mixes refcount policy and core ZONE_DEVICE page setup in a single helper. Factor the refcount-reset predicate into pagemap_resets_refcount(), move the common page initialization into __zone_device_page_init(), and wrap the existing slow path in zone_device_page_init_slow(). This keeps the slow-path behaviour unchanged and gives later patches reusable helper boundaries. No functional change intended. Link: https://lore.kernel.org/20260701090553.62691-3-lizhe.67@bytedance.com Signed-off-by: Li Zhe Reviewed-by: Mike Rapoport (Microsoft) Cc: Alistair Popple Cc: Arnd Bergmann Cc: Balbir Singh Cc: "Borislav Petkov (AMD)" Cc: David Hildenbrand Cc: Ingo Molnar Cc: Kees Cook Signed-off-by: Andrew Morton --- mm/mm_init.c | 57 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 19 deletions(-) --- a/mm/mm_init.c~mm-factor-zone-device-page-init-helpers-out-of-__init_zone_device_page +++ a/mm/mm_init.c @@ -995,11 +995,38 @@ static void __init memmap_init(void) } #ifdef CONFIG_ZONE_DEVICE -static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, +/* + * Return true when the free path for this pagemap type restores the page + * refcount to 1, so memmap_init_zone_device() can keep the count set by + * __init_single_page(). Otherwise initialize the refcount to 0 and leave + * it to the allocator or pgmap callbacks to raise it when the page is + * handed out again. + */ +static inline bool pagemap_resets_refcount(const struct dev_pagemap *pgmap) +{ + /* + * MEMORY_DEVICE_GENERIC pages regain a refcount of 1 in the free + * path. The remaining ZONE_DEVICE types start from 0 here and raise + * the count again when the allocator or driver hands the page out. + */ + switch (pgmap->type) { + case MEMORY_DEVICE_FS_DAX: + case MEMORY_DEVICE_PRIVATE: + case MEMORY_DEVICE_COHERENT: + case MEMORY_DEVICE_PCI_P2PDMA: + return false; + case MEMORY_DEVICE_GENERIC: + return true; + default: + WARN_ONCE(1, "Unknown memory type!"); + return true; + } +} + +static void __ref __zone_device_page_init(struct page *page, unsigned long pfn, unsigned long zone_idx, int nid, struct dev_pagemap *pgmap) { - __init_single_page(page, pfn, zone_idx, nid); /* @@ -1018,23 +1045,15 @@ static void __ref __init_zone_device_pag */ page_folio(page)->pgmap = pgmap; page->zone_device_data = NULL; +} - /* - * MEMORY_DEVICE_GENERIC pages regain a refcount of 1 in the free - * path. The remaining ZONE_DEVICE types start from 0 here and raise - * the count again when the allocator or driver hands the page out. - */ - switch (pgmap->type) { - case MEMORY_DEVICE_FS_DAX: - case MEMORY_DEVICE_PRIVATE: - case MEMORY_DEVICE_COHERENT: - case MEMORY_DEVICE_PCI_P2PDMA: +static void __ref zone_device_page_init_slow(struct page *page, + unsigned long pfn, unsigned long zone_idx, int nid, + struct dev_pagemap *pgmap) +{ + __zone_device_page_init(page, pfn, zone_idx, nid, pgmap); + if (!pagemap_resets_refcount(pgmap)) set_page_count(page, 0); - break; - - case MEMORY_DEVICE_GENERIC: - break; - } } /* @@ -1080,7 +1099,7 @@ static void __ref memmap_init_compound(s for (pfn = head_pfn + 1; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + zone_device_page_init_slow(page, pfn, zone_idx, nid, pgmap); prep_compound_tail(page, head, order); set_page_count(page, 0); } @@ -1116,7 +1135,7 @@ void __ref memmap_init_zone_device(struc for (pfn = start_pfn; pfn < end_pfn; pfn += pfns_per_compound) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + zone_device_page_init_slow(page, pfn, zone_idx, nid, pgmap); if (IS_ALIGNED(pfn, PAGES_PER_SECTION)) cond_resched(); _ Patches currently in -mm which might be from lizhe.67@bytedance.com are mm-add-a-set_page_section_from_pfn-helper.patch mm-add-a-template-based-fast-path-for-zone-device-page-init.patch mm-extend-the-template-fast-path-to-zone-device-compound-tails.patch string-introduce-memcpy_nt-helpers.patch x86-string-extend-memcpy_flushcache-fixed-size-fastpaths.patch mm-use-memcpy_nt-in-zone-device-template-copies.patch