Commit e26060d1 authored by Kanchana P Sridhar's avatar Kanchana P Sridhar Committed by Andrew Morton
Browse files

mm: swap: make some count_mthp_stat() call-sites be THP-agnostic. 

In commit 246d3aa3 ("mm: cleanup count_mthp_stat() definition"), Ryan
Roberts has pointed out the merits of mm code that does not require THP,
to be compile-able without requiring THP ifdefs.  As a step in that
direction, he has moved count_mthp_stat() to be always defined, resolving
to a no-op if THP is not defined.

Barry Song referred me to Ryan's commit when I was working on the "mm:
zswap swap-out of large folios" patch-series [1].

This patch propagates the benefits of the above change to page_io.c and
vmscan.c.  As a result, there is one less reason to have the ifdef THP in
these code sections.

[1]: https://patchwork.kernel.org/project/linux-mm/list/?series=894347

Link: https://lkml.kernel.org/r/20241002225822.9006-1-kanchana.p.sridhar@intel.com


Signed-off-by: default avatarKanchana P Sridhar <kanchana.p.sridhar@intel.com>
Reviewed-by: default avatarNhat Pham <nphamcs@gmail.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Wajdi Feghali <wajdi.k.feghali@intel.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Cc: Barry Song <21cnbao@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d7d65b10

mm/page_io.c

+1 −1
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ static inline void count_swpout_vm_event(struct folio *folio) 
		count_memcg_folio_events(folio, THP_SWPOUT, 1);

		count_vm_event(THP_SWPOUT);

	}

	count_mthp_stat(folio_order(folio), MTHP_STAT_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));

}

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,8 +1258,8 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, 
							THP_SWPOUT_FALLBACK, 1);

						count_vm_event(THP_SWPOUT_FALLBACK);

					}

					count_mthp_stat(order, MTHP_STAT_SWPOUT_FALLBACK);

#endif

					count_mthp_stat(order, MTHP_STAT_SWPOUT_FALLBACK);

					if (!add_to_swap(folio))

						goto activate_locked_split;

				}