mm: add per-order mTHP swpin counters
Subsystems (5)
PATCH v3 1/1 mm: add per-order mTHP swpin counters
From: Barry Song <[email protected]>
This helps profile the sizes of folios being swapped in. Currently, only mTHP swap-out is being counted.
The new interface can be found at:
/sys/kernel/mm/transparent_hugepage/hugepages-<size>/stats/swpin For example,
$ cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin 12809 $ cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin 4763
---
-v3: minor refine changelog per Huang, Ying. thanks!
Documentation/admin-guide/mm/transhuge.rst | 4 ++++ include/linux/huge_mm.h | 1 + mm/huge_memory.c | 3 +++ mm/page_io.c | 3 +++ 4 files changed, 11 insertions(+)
Documentation/admin-guide/mm/transhuge.rst +4 -0
@@ -534,6 +534,10 @@ zswpout is incremented every time a huge page is swapped out to zswap in one piece without splitting. +swpin + is incremented every time a huge page is swapped in from a non-zswap + swap device in one piece. + swpout is incremented every time a huge page is swapped out to a non-zswap swap device in one piece without splitting.
include/linux/huge_mm.h +1 -0
@@ -120,6 +120,7 @@ enum mthp_stat_item {MTHP_STAT_ANON_FAULT_FALLBACK ,MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE ,MTHP_STAT_ZSWPOUT , +MTHP_STAT_SWPIN ,MTHP_STAT_SWPOUT ,MTHP_STAT_SWPOUT_FALLBACK , MTHP_STAT_SHMEM_ALLOC,
mm/huge_memory.c +3 -0
@@ -616,6 +616,7 @@ 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 (zswpout,MTHP_STAT_ZSWPOUT ); +DEFINE_MTHP_STAT_ATTR (swpin,MTHP_STAT_SWPIN );DEFINE_MTHP_STAT_ATTR (swpout,MTHP_STAT_SWPOUT );DEFINE_MTHP_STAT_ATTR (swpout_fallback,MTHP_STAT_SWPOUT_FALLBACK );#ifdef CONFIG_SHMEM
@@ -635,6 +636,7 @@ static struct attribute *anon_stats_attrs[] = { &anon_fault_fallback_charge_attr.attr, #ifndef CONFIG_SHMEM &zswpout_attr.attr, + &swpin_attr.attr, &swpout_attr.attr, &swpout_fallback_attr.attr, #endif
@@ -666,6 +668,7 @@ static struct attribute_group file_stats_attr_grp = {static struct attribute *any_stats_attrs[] = { #ifdef CONFIG_SHMEM &zswpout_attr.attr, + &swpin_attr.attr, &swpout_attr.attr, &swpout_fallback_attr.attr, #endif
mm/page_io.c +3 -0
@@ -487,6 +487,7 @@ static void sio_read_complete(struct kiocb *iocb, long ret)for (p =0 ; p < sio->pages; p++) {struct folio *folio =page_folio (sio->bvec[p].bv_page); +count_mthp_stat (folio_order (folio),MTHP_STAT_SWPIN );count_memcg_folio_events (folio,PSWPIN ,folio_nr_pages (folio));folio_mark_uptodate (folio);folio_unlock (folio);
@@ -573,6 +574,7 @@ static void swap_read_folio_bdev_sync(struct folio *folio,* attempt to access it in the page fault retry time check. */ get_task_struct (current); +count_mthp_stat (folio_order (folio),MTHP_STAT_SWPIN );count_memcg_folio_events (folio,PSWPIN ,folio_nr_pages (folio));count_vm_events (PSWPIN ,folio_nr_pages (folio));submit_bio_wait (&bio);
@@ -589,6 +591,7 @@ static void swap_read_folio_bdev_async(struct folio *folio, bio->bi_iter.bi_sector =swap_folio_sector (folio); bio->bi_end_io = end_swap_bio_read;bio_add_folio_nofail (bio, folio,folio_size (folio),0 ); +count_mthp_stat (folio_order (folio),MTHP_STAT_SWPIN );count_memcg_folio_events (folio,PSWPIN ,folio_nr_pages (folio));count_vm_events (PSWPIN ,folio_nr_pages (folio));submit_bio (bio);
Signature · 1 line
2.39.3 (Apple Git-146)
Quoted 36 lines · Barry Song
From: Barry Song <[email protected]>
This helps profile the sizes of folios being swapped in. Currently, only mTHP swap-out is being counted.
The new interface can be found at:
/sys/kernel/mm/transparent_hugepage/hugepages-<size>/stats/swpin For example,$ cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin 12809 $ cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin 4763Signed-off-by Barry Song <[email protected]>Reviewed-by Baolin Wang <[email protected]>Cc Chris Li <[email protected]>Cc Yosry Ahmed <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Kairui Song <[email protected]>Cc Ryan Roberts <[email protected]>Cc Kanchana P Sridhar <[email protected]>Cc Usama Arif <[email protected]>---
-v3: minor refine changelog per Huang, Ying. thanks!Documentation/admin-guide/mm/transhuge.rst | 4 ++++ include/linux/huge_mm.h | 1 + mm/huge_memory.c | 3 +++ mm/page_io.c | 3 +++ 4 files changed, 11 insertions(+)Documentation/admin-guide/mm/transhuge.rst +0
-0
Documentation/admin-guide/mm/transhuge.rst zswpout · line 543
Quoted 10 lines
Documentation/admin-guide/mm/transhuge.rst +4
-0@@ -534,6 +534,10 @@ zswpout is incremented every time a huge page is swapped out to zswap in one piece without splitting. +swpin + is incremented every time a huge page is swapped in from a non-zswap + swap device in one piece. + swpout is incremented every time a huge page is swapped out to a non-zswap swap device in one piece without splitting.
In Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage, I found
"
What: /sys/kernel/mm/transparent_hugepage/
Date: April 2024
Contact: Linux memory management mailing list <[email protected]>
Description:
/sys/kernel/mm/transparent_hugepage/ contains a number of files and subdirectories,
- defrag
- enabled
- hpage_pmd_size
- khugepaged
- shmem_enabled
- use_zero_page
- subdirectories of the form hugepages-<size>kB, where <size> is the page size of the hugepages supported by the kernel/CPU combination.
See Documentation/admin-guide/mm/transhuge.rst for details.
"
So, Documentation/admin-guide/mm/transhuge.rst will be used as ABI document?
[snip]
--
Best Regards,
Huang, Ying
Quoted 71 lines · Ying
Quoted 36 lines · Barry Song
From: Barry Song <[email protected]>
This helps profile the sizes of folios being swapped in. Currently, only mTHP swap-out is being counted.
The new interface can be found at:
/sys/kernel/mm/transparent_hugepage/hugepages-<size>/stats/swpin For example,$ cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin 12809 $ cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin 4763Signed-off-by Barry Song <[email protected]>Reviewed-by Baolin Wang <[email protected]>Cc Chris Li <[email protected]>Cc Yosry Ahmed <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Kairui Song <[email protected]>Cc Ryan Roberts <[email protected]>Cc Kanchana P Sridhar <[email protected]>Cc Usama Arif <[email protected]>---
-v3: minor refine changelog per Huang, Ying. thanks!Documentation/admin-guide/mm/transhuge.rst | 4 ++++ include/linux/huge_mm.h | 1 + mm/huge_memory.c | 3 +++ mm/page_io.c | 3 +++ 4 files changed, 11 insertions(+)Documentation/admin-guide/mm/transhuge.rst +0
-0Documentation/admin-guide/mm/transhuge.rst zswpout · line 543
Quoted 10 lines
Documentation/admin-guide/mm/transhuge.rst +4
-0@@ -534,6 +534,10 @@ zswpout is incremented every time a huge page is swapped out to zswap in one piece without splitting. +swpin + is incremented every time a huge page is swapped in from a non-zswap + swap device in one piece. + swpout is incremented every time a huge page is swapped out to a non-zswap swap device in one piece without splitting.In
Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage, I found"
What: /sys/kernel/mm/transparent_hugepage/ Date: April 2024 Contact: Linux memory management mailing list <[email protected]>Description:
/sys/kernel/mm/transparent_hugepage/contains a number of files and subdirectories,- defrag
- enabled
-hpage_pmd_size
- khugepaged
-shmem_enabled
-use_zero_page
- subdirectories of the form hugepages-<size>kB, where <size> is the page size of the hugepages supported by the kernel/CPU combination.
Quoted 5 lines
See
Documentation/admin-guide/mm/transhuge.rstfor details.
"So,
Documentation/admin-guide/mm/transhuge.rstwill be used as ABI document?
Yes. this follows:
sysfs-kernel-mm-hugepages: SeeDocumentation/admin-guide/mm/hugetlbpage.rst for details.
sysfs-kernel-mm-ksm: See Documentation/mm/ksm.rst for more
information.
sysfs-kernel-mm-transparent-hugepage: SeeDocumentation/admin-guide/mm/transhuge.rst for details.
Quoted 6 lines
[snip]
--
Best Regards,
Huang, Ying
Thanks
barry
Huang, Ying
Acked-byQuoted 78 lines · Barry Song
Quoted 71 lines · Ying
Quoted 36 lines · Barry Song
From: Barry Song <[email protected]>
This helps profile the sizes of folios being swapped in. Currently, only mTHP swap-out is being counted.
The new interface can be found at:
/sys/kernel/mm/transparent_hugepage/hugepages-<size>/stats/swpin For example,$ cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin 12809 $ cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin 4763Signed-off-by Barry Song <[email protected]>Reviewed-by Baolin Wang <[email protected]>Cc Chris Li <[email protected]>Cc Yosry Ahmed <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Kairui Song <[email protected]>Cc Ryan Roberts <[email protected]>Cc Kanchana P Sridhar <[email protected]>Cc Usama Arif <[email protected]>---
-v3: minor refine changelog per Huang, Ying. thanks!Documentation/admin-guide/mm/transhuge.rst | 4 ++++ include/linux/huge_mm.h | 1 + mm/huge_memory.c | 3 +++ mm/page_io.c | 3 +++ 4 files changed, 11 insertions(+)Documentation/admin-guide/mm/transhuge.rst +0
-0Documentation/admin-guide/mm/transhuge.rst zswpout · line 543
Quoted 10 lines
Documentation/admin-guide/mm/transhuge.rst +4
-0@@ -534,6 +534,10 @@ zswpout is incremented every time a huge page is swapped out to zswap in one piece without splitting. +swpin + is incremented every time a huge page is swapped in from a non-zswap + swap device in one piece. + swpout is incremented every time a huge page is swapped out to a non-zswap swap device in one piece without splitting.In
Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage, I found"
What: /sys/kernel/mm/transparent_hugepage/ Date: April 2024 Contact: Linux memory management mailing list <[email protected]>Description:
/sys/kernel/mm/transparent_hugepage/contains a number of files and subdirectories,- defrag
- enabled
-hpage_pmd_size
- khugepaged
-shmem_enabled
-use_zero_page
- subdirectories of the form hugepages-<size>kB, where <size> is the page size of the hugepages supported by the kernel/CPU combination.Quoted 5 lines
See
Documentation/admin-guide/mm/transhuge.rstfor details.
"So,
Documentation/admin-guide/mm/transhuge.rstwill be used as ABI document?
Quoted 9 lines
Yes. this follows:
sysfs-kernel-mm-hugepages: See
Documentation/admin-guide/mm/hugetlbpage.rstfor details.
sysfs-kernel-mm-ksm: SeeDocumentation/mm/ksm.rstfor more
information.
sysfs-kernel-mm-transparent-hugepage: SeeDocumentation/admin-guide/mm/transhuge.rstfor details.
Got it! Thanks! Feel free to add
in the future versions.
--
Best Regards,
Huang, Ying