From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from va-1-113.ptr.blmpb.com (va-1-113.ptr.blmpb.com [209.127.230.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 174FA2EEE71 for ; Mon, 3 Aug 2026 07:11:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.127.230.113 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785741063; cv=none; b=VdS+eME3inD5vKj8CdbTslzKNOue0KRpBJAJSyS1gSNheFgPpkWuYYa6g5dYN+jm9l8ZjAevzigmDpL3SRmSSM4amumCL7x1kobBlpuLhHG7lP5d2rYkaToiQ9dm2bgZdJ6mlqScF39nFiMaSwpQf7EiSUe6ik/pbadubttiNAY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785741063; c=relaxed/simple; bh=DevAn1r9WS6pPdFWehOAQ0KmRVHSptKuRZyUe2bUpqI=; h=Mime-Version:Content-Type:Message-Id:In-Reply-To:Subject:Cc:From: Date:References:To; b=ViEXBUQ/xHtqgF/t98/klI8kUyyuQLB2B29lU/KjBnCXq3u2KDFROCIYGtq9ZxQmY8ue8gvxbnbMiyMjJb/Hejz8TJQIvKN5JVCIMTiXHpN3Jo2nIq8A/KJcr7qJHiM5MR7u0UdeKlR3JWWVbd5CivxfkDzZ1i2n8tSRRQI65i4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=i2WSxqIR; arc=none smtp.client-ip=209.127.230.113 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="i2WSxqIR" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=2212171451; d=bytedance.com; t=1785741050; h=from:subject: mime-version:from:date:message-id:subject:to:cc:reply-to:content-type: mime-version:in-reply-to:message-id; bh=z2FZl2/YzaMjC0aIAZHsTKk9OBnNm9ulSHwBzV0fwO8=; b=i2WSxqIRdqGvplhwpLJaUV0EdGUhtOYx5M1jbRWaKgzQITPgEok2kL4W25Ez8Gpmsu7lrs OdiJ21y/bXiumW6E7ZeGka2vpJswKLVzo7/S7SGqQbFvsCGiFu6gxAFPVU3YRr9aLKpJ2L eidedDOFrgQ64d8tNcfN/Lsp3H9ZWID5hWF0DP3qsb02VLTGbyl6DijPps6ieIgtXE7Q99 tOOkBMnvwcpBQJbZtghMUQVHgOnQr2nIHNf2TqH19mcaHPwg0+sgzAKgbrx9/7ISxJIbjn NsrkLfZBPpw4tEOBJWtTJIxZditRigSXJ6uNGNOuyirUPvrHKxDh2BFVAt5wTg== X-Original-From: Li Zhe X-Lms-Return-Path: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Mailer: git-send-email 2.45.2 Message-Id: <20260803070929.86075-3-lizhe.67@bytedance.com> In-Reply-To: <20260803070929.86075-1-lizhe.67@bytedance.com> Content-Transfer-Encoding: 7bit Subject: [PATCH v9 2/8] mm: factor zone-device page init helpers out of __init_zone_device_page Cc: , , , , , From: "Li Zhe" Date: Mon, 3 Aug 2026 15:09:23 +0800 References: <20260803070929.86075-1-lizhe.67@bytedance.com> To: , , , , , , , , , , , 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_requires_refcount_reset(), 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. Signed-off-by: Li Zhe Reviewed-by: Mike Rapoport (Microsoft) --- mm/mm_init.c | 56 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 95808ab5cfdb..a70acb7431a6 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1005,11 +1005,37 @@ 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 memmap_init_zone_device() must initialize the page + * refcount to 0. MEMORY_DEVICE_GENERIC pages regain a refcount of 1 in + * the free path, while the remaining ZONE_DEVICE types start from 0 here + * and raise the count again when the allocator or driver hands the page + * out. + */ +static inline bool pagemap_requires_refcount_reset(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 true; + case MEMORY_DEVICE_GENERIC: + return false; + } + + return false; +} + +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); /* @@ -1028,23 +1054,15 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, */ 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_requires_refcount_reset(pgmap)) set_page_count(page, 0); - break; - - case MEMORY_DEVICE_GENERIC: - break; - } } /* @@ -1090,7 +1108,7 @@ static void __ref memmap_init_compound(struct page *head, 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); } @@ -1126,7 +1144,7 @@ void __ref memmap_init_zone_device(struct zone *zone, 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(); -- 2.20.1