Re: [PATCH 5/8] mm/swap: remove count_swpout_vm_event

[Baoquan He <baoquan.he@linux.dev>]

On 06/01/26 at 01:34pm, Christoph Hellwig wrote:
> There is only one caller left, so merge it into that.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  mm/page_io.c | 24 ++++++++++--------------
>  1 file changed, 10 insertions(+), 14 deletions(-)

Reviewed-by: Baoquan He <baoquan.he@linux.dev>

> 
> diff --git a/mm/page_io.c b/mm/page_io.c
> index 22c751fe03c0..0e2aabe635c8 100644
> --- a/mm/page_io.c
> +++ b/mm/page_io.c
> @@ -254,19 +254,6 @@ int swap_writeout(struct swap_io_ctx *ctx, struct folio *folio)
>  	return ret;
>  }
>  
> -static inline void count_swpout_vm_event(struct folio *folio)
> -{
> -#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> -	if (unlikely(folio_test_pmd_mappable(folio))) {
> -		count_memcg_folio_events(folio, THP_SWPOUT, 1);
> -		count_vm_event(THP_SWPOUT);
> -	}
> -#endif
> -	count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT);
> -	count_memcg_folio_events(folio, PSWPOUT, folio_nr_pages(folio));
> -	count_vm_events(PSWPOUT, folio_nr_pages(folio));
> -}
> -
>  #if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP)
>  static struct cgroup_subsys_state *folio_memcg_blkg_css(struct folio *folio)
>  {
> @@ -388,7 +375,16 @@ void __swap_writepage(struct swap_io_ctx *ctx, struct folio *folio)
>  {
>  	VM_BUG_ON_FOLIO(!folio_test_swapcache(folio), folio);
>  
> -	count_swpout_vm_event(folio);
> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> +	if (unlikely(folio_test_pmd_mappable(folio))) {
> +		count_memcg_folio_events(folio, THP_SWPOUT, 1);
> +		count_vm_event(THP_SWPOUT);
> +	}
> +#endif
> +	count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT);
> +	count_memcg_folio_events(folio, PSWPOUT, folio_nr_pages(folio));
> +	count_vm_events(PSWPOUT, folio_nr_pages(folio));
> +
>  	folio_start_writeback(folio);
>  	folio_unlock(folio);
>  	swap_add_page(ctx, folio, WRITE);
> -- 
> 2.53.0
>