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

In commit 246d3aa3e531 ("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: Kanchana P Sridhar <kanchana.p.sridhar@intel.com>
Reviewed-by: Nhat 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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_io.c b/mm/page_io.c
index be6cd314845a33de7caea9d66e58dadd5fabe55c..c69fab5060a1d13c5a8e2d624731e231abe267b5 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -289,8 +289,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));
 }

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8f25dd6cec54b5d0cb67c41e84b40207c66f6aaf..6a3c498383fa102388489d28bb988d922f7d6d9b 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1258,8 +1258,8 @@ retry:
                                                        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;
                                }