On Fri, May 24, 2024 at 7:40 AM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > The patch titled > Subject: mm: drop the 'anon_' prefix for swap-out mTHP counters > has been added to the -mm mm-unstable branch. Its filename is > mm-drop-the-anon_-prefix-for-swap-out-mthp-counters.patch Hi Andrew, Baolin is aiming to implement this rename for version 6.10. If not, we'll encounter ABI compatibility issues between versions 6.10 and 6.11 and beyond. Therefore, I assume it should be included in the mm-hotfix-unstable branch rather than the mm-unstable branch? Or am I mistaken? Does the mm-unstable branch also have a pathway to be included in version 6.10? > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-drop-the-anon_-prefix-for-swap-out-mthp-counters.patch > > This patch will later appear in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > 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: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> > Subject: mm: drop the 'anon_' prefix for swap-out mTHP counters > Date: Thu, 23 May 2024 10:36:39 +0800 > > The mTHP swap related counters: 'anon_swpout' and 'anon_swpout_fallback' > are confusing with an 'anon_' prefix, since the shmem can swap out > non-anonymous pages. So drop the 'anon_' prefix to keep consistent with > the old swap counter names. > > Link: https://lkml.kernel.org/r/7a8989c13299920d7589007a30065c3e2c19f0e0.1716431702.git.baolin.wang@xxxxxxxxxxxxxxxxx > Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> > Suggested-by: "Huang, Ying" <ying.huang@xxxxxxxxx> > Acked-by: Barry Song <baohua@xxxxxxxxxx> > Cc: David Hildenbrand <david@xxxxxxxxxx> > Cc: Lance Yang <ioworker0@xxxxxxxxx> > Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> > Cc: Ryan Roberts <ryan.roberts@xxxxxxx> > Cc: Zi Yan <ziy@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > Documentation/admin-guide/mm/transhuge.rst | 4 ++-- > include/linux/huge_mm.h | 4 ++-- > mm/huge_memory.c | 8 ++++---- > mm/page_io.c | 2 +- > mm/vmscan.c | 2 +- > 5 files changed, 10 insertions(+), 10 deletions(-) > > --- a/Documentation/admin-guide/mm/transhuge.rst~mm-drop-the-anon_-prefix-for-swap-out-mthp-counters > +++ a/Documentation/admin-guide/mm/transhuge.rst > @@ -467,11 +467,11 @@ anon_fault_fallback_charge > instead falls back to using huge pages with lower orders or > small pages even though the allocation was successful. > > -anon_swpout > +swpout > is incremented every time a huge page is swapped out in one > piece without splitting. > > -anon_swpout_fallback > +swpout_fallback > is incremented if a huge page has to be split before swapout. > Usually because failed to allocate some continuous swap space > for the huge page. > --- a/include/linux/huge_mm.h~mm-drop-the-anon_-prefix-for-swap-out-mthp-counters > +++ a/include/linux/huge_mm.h > @@ -269,8 +269,8 @@ enum mthp_stat_item { > MTHP_STAT_ANON_FAULT_ALLOC, > MTHP_STAT_ANON_FAULT_FALLBACK, > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > - MTHP_STAT_ANON_SWPOUT, > - MTHP_STAT_ANON_SWPOUT_FALLBACK, > + MTHP_STAT_SWPOUT, > + MTHP_STAT_SWPOUT_FALLBACK, > __MTHP_STAT_COUNT > }; > > --- a/mm/huge_memory.c~mm-drop-the-anon_-prefix-for-swap-out-mthp-counters > +++ a/mm/huge_memory.c > @@ -558,15 +558,15 @@ static struct kobj_attribute _name##_att > DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); > -DEFINE_MTHP_STAT_ATTR(anon_swpout, MTHP_STAT_ANON_SWPOUT); > -DEFINE_MTHP_STAT_ATTR(anon_swpout_fallback, MTHP_STAT_ANON_SWPOUT_FALLBACK); > +DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT); > +DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); > > static struct attribute *stats_attrs[] = { > &anon_fault_alloc_attr.attr, > &anon_fault_fallback_attr.attr, > &anon_fault_fallback_charge_attr.attr, > - &anon_swpout_attr.attr, > - &anon_swpout_fallback_attr.attr, > + &swpout_attr.attr, > + &swpout_fallback_attr.attr, > NULL, > }; > > --- a/mm/page_io.c~mm-drop-the-anon_-prefix-for-swap-out-mthp-counters > +++ a/mm/page_io.c > @@ -217,7 +217,7 @@ static inline void count_swpout_vm_event > count_memcg_folio_events(folio, THP_SWPOUT, 1); > count_vm_event(THP_SWPOUT); > } > - count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPOUT); > + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); > #endif > count_vm_events(PSWPOUT, folio_nr_pages(folio)); > } > --- a/mm/vmscan.c~mm-drop-the-anon_-prefix-for-swap-out-mthp-counters > +++ a/mm/vmscan.c > @@ -1230,7 +1230,7 @@ retry: > THP_SWPOUT_FALLBACK, 1); > count_vm_event(THP_SWPOUT_FALLBACK); > } > - count_mthp_stat(order, MTHP_STAT_ANON_SWPOUT_FALLBACK); > + count_mthp_stat(order, MTHP_STAT_SWPOUT_FALLBACK); > #endif > if (!add_to_swap(folio)) > goto activate_locked_split; > _ > > Patches currently in -mm which might be from baolin.wang@xxxxxxxxxxxxxxxxx are > > mm-drop-the-anon_-prefix-for-swap-out-mthp-counters.patch > Thanks Barry
