From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3AE3232A813 for ; Mon, 1 Sep 2025 18:42:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756752152; cv=none; b=Em7GwLhmFO8958ZqLyCLXy7zes7tN4FX5YneQtTKiSw4XZIxWqN121oE8MptLIIVQim10RW/vrafBiJSJQu2/Z6HpY9cy/1qoGxE5gO3H8SN6E0YKCE0uC8Xu7EAIf7aQ9B2OiNeQIvx71JPediqBsC+M665q14UYIqbUdzJHiM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756752152; c=relaxed/simple; bh=VplYaziMZP5DRMdDvVwdcrPar8o0RWHHJ0R6e0nAm78=; h=Date:To:From:Subject:Message-Id; b=Wd+p5WZ6MrQ9pFmvgeJSdqczT2LI2u1w6wCnV1YdabIlLXlNbh2V8qaiqLp3mzepj7umQLMxKvDn/ZTWGw+89VwbCeexXyjSOPu6JBT0n6TMUAY2tW4cfwmJHKqwJaScxgDt2I5ao7YMOvc81GMQTfMUrHUDkAK9Ca95BhE60no= 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=mBUAt+w8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="mBUAt+w8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 034A1C4CEF0; Mon, 1 Sep 2025 18:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1756752152; bh=VplYaziMZP5DRMdDvVwdcrPar8o0RWHHJ0R6e0nAm78=; h=Date:To:From:Subject:From; b=mBUAt+w88zkk+6rOkFPboxHWJdR8zUlQ+vM7/o+VuAFsIwEPsTd4v3w4ytl4ff27q bueeZJZ/ZYEvBjJqSkUTzx7YnOlAfZA0/IWYnOpR/7ZSqC/pSOeS5Rz6A6EZvCSQVI OtVDX9RL6kLTCt8fwy3arvEiB4oVSpoNy8HTzRS4= Date: Mon, 01 Sep 2025 11:42:31 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,richard.weiyang@gmail.com,lorenzo.stoakes@oracle.com,david@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-simplify-folio_page-and-folio_page_idx.patch added to mm-new branch Message-Id: <20250901184232.034A1C4CEF0@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm: simplify folio_page() and folio_page_idx() has been added to the -mm mm-new branch. Its filename is mm-simplify-folio_page-and-folio_page_idx.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-simplify-folio_page-and-folio_page_idx.patch This patch will later appear in the mm-new branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Note, mm-new is a provisional staging ground for work-in-progress patches, and acceptance into mm-new is a notification for others take notice and to finish up reviews. Please do not hesitate to respond to review feedback and post updated versions to replace or incrementally fixup patches in mm-new. Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: David Hildenbrand Subject: mm: simplify folio_page() and folio_page_idx() Date: Mon, 1 Sep 2025 17:03:33 +0200 Now that a single folio/compound page can no longer span memory sections in problematic kernel configurations, we can stop using nth_page() in folio_page() and folio_page_idx(). While at it, turn both macros into static inline functions and add kernel doc for folio_page_idx(). Link: https://lkml.kernel.org/r/20250901150359.867252-13-david@redhat.com Signed-off-by: David Hildenbrand Reviewed-by: Zi Yan Reviewed-by: Wei Yang Reviewed-by: Lorenzo Stoakes Signed-off-by: Andrew Morton --- include/linux/mm.h | 16 ++++++++++++++-- include/linux/page-flags.h | 5 ++++- 2 files changed, 18 insertions(+), 3 deletions(-) --- a/include/linux/mm.h~mm-simplify-folio_page-and-folio_page_idx +++ a/include/linux/mm.h @@ -210,10 +210,8 @@ extern unsigned long sysctl_admin_reserv #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) -#define folio_page_idx(folio, p) (page_to_pfn(p) - folio_pfn(folio)) #else #define nth_page(page,n) ((page) + (n)) -#define folio_page_idx(folio, p) ((p) - &(folio)->page) #endif /* to align the pointer to the (next) page boundary */ @@ -225,6 +223,20 @@ extern unsigned long sysctl_admin_reserv /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) +/** + * folio_page_idx - Return the number of a page in a folio. + * @folio: The folio. + * @page: The folio page. + * + * This function expects that the page is actually part of the folio. + * The returned number is relative to the start of the folio. + */ +static inline unsigned long folio_page_idx(const struct folio *folio, + const struct page *page) +{ + return page - &folio->page; +} + static inline struct folio *lru_to_folio(struct list_head *head) { return list_entry((head)->prev, struct folio, lru); --- a/include/linux/page-flags.h~mm-simplify-folio_page-and-folio_page_idx +++ a/include/linux/page-flags.h @@ -316,7 +316,10 @@ static __always_inline unsigned long _co * check that the page number lies within @folio; the caller is presumed * to have a reference to the page. */ -#define folio_page(folio, n) nth_page(&(folio)->page, n) +static inline struct page *folio_page(struct folio *folio, unsigned long n) +{ + return &folio->page + n; +} static __always_inline int PageTail(const struct page *page) { _ Patches currently in -mm which might be from david@redhat.com are mm-migrate-remove-migratepage_unmap.patch mm-migrate-remove-migratepage_unmap-fix.patch treewide-remove-migratepage_success.patch mm-huge_memory-move-more-common-code-into-insert_pmd.patch mm-huge_memory-move-more-common-code-into-insert_pud.patch mm-huge_memory-support-huge-zero-folio-in-vmf_insert_folio_pmd.patch fs-dax-use-vmf_insert_folio_pmd-to-insert-the-huge-zero-folio.patch mm-huge_memory-mark-pmd-mappings-of-the-huge-zero-folio-special.patch powerpc-ptdump-rename-struct-pgtable_level-to-struct-ptdump_pglevel.patch mm-rmap-convert-enum-rmap_level-to-enum-pgtable_level.patch mm-memory-convert-print_bad_pte-to-print_bad_page_map.patch mm-memory-convert-print_bad_pte-to-print_bad_page_map-fix.patch mm-memory-factor-out-common-code-from-vm_normal_page_.patch mm-introduce-and-use-vm_normal_page_pud.patch mm-rename-vm_ops-find_special_page-to-vm_ops-find_normal_page.patch prctl-extend-pr_set_thp_disable-to-optionally-exclude-vm_hugepage.patch mm-huge_memory-convert-tva_flags-to-enum-tva_type.patch mm-huge_memory-respect-madv_collapse-with-pr_thp_disable_except_advised.patch mm-stop-making-sparsemem_vmemmap-user-selectable.patch arm64-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch s390-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch x86-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch wireguard-selftests-remove-config_sparsemem_vmemmap=y-from-qemu-kernel-config.patch mm-page_alloc-reject-unreasonable-folio-compound-page-sizes-in-alloc_contig_range_noprof.patch mm-memremap-reject-unreasonable-folio-compound-page-sizes-in-memremap_pages.patch mm-hugetlb-check-for-unreasonable-folio-sizes-when-registering-hstate.patch mm-mm_init-make-memmap_init_compound-look-more-like-prep_compound_page.patch mm-sanity-check-maximum-folio-size-in-folio_set_order.patch mm-limit-folio-compound-page-sizes-in-problematic-kernel-configs.patch mm-simplify-folio_page-and-folio_page_idx.patch mm-hugetlb-cleanup-hugetlb_folio_init_tail_vmemmap.patch mm-mm-percpu-km-drop-nth_page-usage-within-single-allocation.patch fs-hugetlbfs-remove-nth_page-usage-within-folio-in-adjust_range_hwpoison.patch fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison.patch mm-pagewalk-drop-nth_page-usage-within-folio-in-folio_walk_start.patch mm-gup-drop-nth_page-usage-within-folio-when-recording-subpages.patch mm-gup-remove-record_subpages.patch io_uring-zcrx-remove-nth_page-usage-within-folio.patch mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages.patch mm-cma-refuse-handing-out-non-contiguous-page-ranges.patch dma-remap-drop-nth_page-in-dma_common_contiguous_remap.patch scatterlist-disallow-non-contigous-page-ranges-in-a-single-sg-entry.patch ata-libata-sff-drop-nth_page-usage-within-sg-entry.patch drm-i915-gem-drop-nth_page-usage-within-sg-entry.patch mspro_block-drop-nth_page-usage-within-sg-entry.patch memstick-drop-nth_page-usage-within-sg-entry.patch mmc-drop-nth_page-usage-within-sg-entry.patch scsi-scsi_lib-drop-nth_page-usage-within-sg-entry.patch scsi-sg-drop-nth_page-usage-within-sg-entry.patch vfio-pci-drop-nth_page-usage-within-sg-entry.patch crypto-remove-nth_page-usage-within-sg-entry.patch mm-gup-drop-nth_page-usage-in-unpin_user_page_range_dirty_lock.patch kfence-drop-nth_page-usage.patch block-update-comment-of-struct-bio_vec-regarding-nth_page.patch mm-remove-nth_page.patch