Skip to content

Commit e9ea874

Browse files
yangyang20220519torvalds
authored andcommitted
mm/vmstat: add events for THP max_ptes_* exceeds
There are interfaces to adjust max_ptes_none, max_ptes_swap, max_ptes_shared values, see /sys/kernel/mm/transparent_hugepage/khugepaged/. But system administrator may not know which value is the best. So Add those events to support adjusting max_ptes_* to suitable values. For example, if default max_ptes_swap value causes too much failures, and system uses zram whose IO is fast, administrator could increase max_ptes_swap until THP_SCAN_EXCEED_SWAP_PTE not increase anymore. Link: https://lkml.kernel.org/r/20211225094036.574157-1-yang.yang29@zte.com.cn Signed-off-by: Yang Yang <yang.yang29@zte.com.cn> Cc: "Huang, Ying" <ying.huang@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Saravanan D <saravanand@fb.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent f77a286 commit e9ea874

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

include/linux/vm_event_item.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
9898
THP_SPLIT_PAGE_FAILED,
9999
THP_DEFERRED_SPLIT_PAGE,
100100
THP_SPLIT_PMD,
101+
THP_SCAN_EXCEED_NONE_PTE,
102+
THP_SCAN_EXCEED_SWAP_PTE,
103+
THP_SCAN_EXCEED_SHARED_PTE,
101104
#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
102105
THP_SPLIT_PUD,
103106
#endif

mm/khugepaged.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
618618
continue;
619619
} else {
620620
result = SCAN_EXCEED_NONE_PTE;
621+
count_vm_event(THP_SCAN_EXCEED_NONE_PTE);
621622
goto out;
622623
}
623624
}
@@ -636,6 +637,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
636637
if (page_mapcount(page) > 1 &&
637638
++shared > khugepaged_max_ptes_shared) {
638639
result = SCAN_EXCEED_SHARED_PTE;
640+
count_vm_event(THP_SCAN_EXCEED_SHARED_PTE);
639641
goto out;
640642
}
641643

@@ -1253,6 +1255,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
12531255
continue;
12541256
} else {
12551257
result = SCAN_EXCEED_SWAP_PTE;
1258+
count_vm_event(THP_SCAN_EXCEED_SWAP_PTE);
12561259
goto out_unmap;
12571260
}
12581261
}
@@ -1262,6 +1265,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
12621265
continue;
12631266
} else {
12641267
result = SCAN_EXCEED_NONE_PTE;
1268+
count_vm_event(THP_SCAN_EXCEED_NONE_PTE);
12651269
goto out_unmap;
12661270
}
12671271
}
@@ -1290,6 +1294,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
12901294
if (page_mapcount(page) > 1 &&
12911295
++shared > khugepaged_max_ptes_shared) {
12921296
result = SCAN_EXCEED_SHARED_PTE;
1297+
count_vm_event(THP_SCAN_EXCEED_SHARED_PTE);
12931298
goto out_unmap;
12941299
}
12951300

@@ -2000,6 +2005,7 @@ static void khugepaged_scan_file(struct mm_struct *mm,
20002005
if (xa_is_value(page)) {
20012006
if (++swap > khugepaged_max_ptes_swap) {
20022007
result = SCAN_EXCEED_SWAP_PTE;
2008+
count_vm_event(THP_SCAN_EXCEED_SWAP_PTE);
20032009
break;
20042010
}
20052011
continue;
@@ -2046,6 +2052,7 @@ static void khugepaged_scan_file(struct mm_struct *mm,
20462052
if (result == SCAN_SUCCEED) {
20472053
if (present < HPAGE_PMD_NR - khugepaged_max_ptes_none) {
20482054
result = SCAN_EXCEED_NONE_PTE;
2055+
count_vm_event(THP_SCAN_EXCEED_NONE_PTE);
20492056
} else {
20502057
node = khugepaged_find_target_node();
20512058
collapse_file(mm, file, start, hpage, node);

mm/vmstat.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,6 +1353,9 @@ const char * const vmstat_text[] = {
13531353
"thp_split_page_failed",
13541354
"thp_deferred_split_page",
13551355
"thp_split_pmd",
1356+
"thp_scan_exceed_none_pte",
1357+
"thp_scan_exceed_swap_pte",
1358+
"thp_scan_exceed_share_pte",
13561359
#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
13571360
"thp_split_pud",
13581361
#endif

0 commit comments

Comments
 (0)