Re: [PATCH v2 10/16] mm: replace pmd_to_swp_entry() with softleaf_from_pmd()

[SeongJae Park <sj@kernel.org>]

On Sat,  8 Nov 2025 17:08:24 +0000 Lorenzo Stoakes <lorenzo.stoakes@oracle.com> wrote:

> Introduce softleaf_from_pmd() to do the equivalent operation for PMDs that
> softleaf_from_pte() fulfils, and cascade changes through code base
> accordingly, introducing helpers as necessary.
> 
> We are then able to eliminate pmd_to_swp_entry(), is_pmd_migration_entry(),
> is_pmd_device_private_entry() and is_pmd_non_present_folio_entry().
> 
> This further establishes the use of leaf operations throughout the code
> base and further establishes the foundations for eliminating is_swap_pmd().
> 
> No functional change intended.
> 
> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> ---
>  fs/proc/task_mmu.c      |  27 +++--
>  include/linux/leafops.h | 220 ++++++++++++++++++++++++++++++++++++++++
>  include/linux/migrate.h |   2 +-
>  include/linux/swapops.h | 100 ------------------
>  mm/damon/ops-common.c   |   6 +-
>  mm/filemap.c            |   6 +-
>  mm/hmm.c                |  16 +--
>  mm/huge_memory.c        |  98 +++++++++---------
>  mm/khugepaged.c         |   4 +-
>  mm/madvise.c            |   2 +-
>  mm/memory.c             |   4 +-
>  mm/mempolicy.c          |   4 +-
>  mm/migrate.c            |  20 ++--
>  mm/migrate_device.c     |  14 +--
>  mm/page_table_check.c   |  16 +--
>  mm/page_vma_mapped.c    |  15 +--
>  mm/pagewalk.c           |   8 +-
>  mm/rmap.c               |   4 +-
>  18 files changed, 343 insertions(+), 223 deletions(-)
[...]

> diff --git a/mm/damon/ops-common.c b/mm/damon/ops-common.c
> index 971df8a16ba4..a218d9922234 100644
> --- a/mm/damon/ops-common.c
> +++ b/mm/damon/ops-common.c
> @@ -11,7 +11,7 @@
>  #include <linux/pagemap.h>
>  #include <linux/rmap.h>
>  #include <linux/swap.h>
> -#include <linux/swapops.h>
> +#include <linux/leafops.h>
>  
>  #include "../internal.h"
>  #include "ops-common.h"
> @@ -51,7 +51,7 @@ void damon_ptep_mkold(pte_t *pte, struct vm_area_struct *vma, unsigned long addr
>  	if (likely(pte_present(pteval)))
>  		pfn = pte_pfn(pteval);
>  	else
> -		pfn = swp_offset_pfn(pte_to_swp_entry(pteval));
> +		pfn = softleaf_to_pfn(softleaf_from_pte(pteval));
>  
>  	folio = damon_get_folio(pfn);
>  	if (!folio)
> @@ -83,7 +83,7 @@ void damon_pmdp_mkold(pmd_t *pmd, struct vm_area_struct *vma, unsigned long addr
>  	if (likely(pmd_present(pmdval)))
>  		pfn = pmd_pfn(pmdval);
>  	else
> -		pfn = swp_offset_pfn(pmd_to_swp_entry(pmdval));
> +		pfn = softleaf_to_pfn(softleaf_from_pmd(pmdval));
>  
>  	folio = damon_get_folio(pfn);
>  	if (!folio)

I'll try to take a time to review the whole series.  But, for now, for this
DAMON part change,

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

[...]