Better split_huge_page_test result check
Subsystems (4)
Zi Yan
reviewerv2 cover Better split_huge_page_test result check
This patchset uses kpageflags to get after-split folio orders for a better split_huge_page_test result check[1]. The added gather_folio_orders() scans through a VPN range and collects the numbers of folios at different orders. check_folio_orders() compares the result of gather_folio_orders() to a given list of numbers of different orders.
This patchset also added new order and in folio offset to the split huge page debugfs's pr_debug()s;
Changelog
===
From V1[2]:
1. Dropped split_huge_pages_pid() for loop step change to avoid messing up with PTE-mapped THP handling. split_huge_page_test.c is changed to perform split at [addr, addr + pagesize) range to limit one folio_split() per folio.
2. Moved pr_debug changes in Patch 2 to Patch 1.
3. Moved KPF_* to vm_util.h and used PAGEMAP_PFN instead of local PFN_MASK.
4. Used pagemap_get_pfn() helper.
5. Used char *vaddr and size_t len as inputs to gather_folio_orders() and check_folio_orders() instead of vpn and nr_pages.
6. Removed variable length variables and used malloc instead.
[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/linux-mm/[email protected]/
Zi Yan (3):
mm/huge_memory: add new_order and offset to split_huge_pages*()
pr_debug.
selftests/mm: add check_folio_orders() helper. selftests/mm: check after-split folio orders in split_huge_page_test.
mm/huge_memory.c | 8 +- .../selftests/mm/split_huge_page_test.c | 102 ++++++++++---- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 4 files changed, 217 insertions(+), 33 deletions(-)
Signature · 1 line
2.47.2
Zi Yan
reviewerPATCH v2 1/3 mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
They are useful information for debugging split huge page tests.
--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/huge_memory.c +4 -4
@@ -4327,8 +4327,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, goto out; } -pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n" , - pid, vaddr_start, vaddr_end); +pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + pid, vaddr_start, vaddr_end, new_order, in_folio_offset);mmap_read_lock (mm);/*
@@ -4438,8 +4438,8 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,if (IS_ERR (candidate)) goto out; -pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx]\n" , - file_path, off_start, off_end); +pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + file_path, off_start, off_end, new_order, in_folio_offset); mapping = candidate->f_mapping; min_order =mapping_min_folio_order (mapping);
Signature · 1 line
2.47.2
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
Quoted 3 lines · Zi Yan
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
In reply to Zi YanQuoted 23 lines · Zi Yan
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +2
-2@@ -4327,8 +4327,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, goto out; } -pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n" , - pid, vaddr_start, vaddr_end); +pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + pid, vaddr_start, vaddr_end, new_order, in_folio_offset);mmap_read_lock (mm);/*
mm/huge_memory.c static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, · line 4443
Quoted 8 lines
mm/huge_memory.c +2
-2@@ -4438,8 +4438,8 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,if (IS_ERR (candidate)) goto out; -pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx]\n" , - file_path, off_start, off_end); +pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + file_path, off_start, off_end, new_order, in_folio_offset);
LGTM
Reviewed by : Donet Tom <[email protected]>
Quoted 2 lines
mm/huge_memory.c +0
-0mapping = candidate->f_mapping; min_order =mapping_min_folio_order (mapping);
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
In reply to Zi YanQuoted 4 lines
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>---
Yes. LGTM.
Best regards,
wang lian
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
In reply to Zi YanQuoted 4 lines · Zi Yan
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>---
LGTM.
Quoted 29 lines
mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +4
-4@@ -4327,8 +4327,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, goto out; } -pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n" , - pid, vaddr_start, vaddr_end); +pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + pid, vaddr_start, vaddr_end, new_order, in_folio_offset);mmap_read_lock (mm);/* @@ -4438,8 +4438,8 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,if (IS_ERR (candidate)) goto out; -pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx]\n" , - file_path, off_start, off_end); +pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + file_path, off_start, off_end, new_order, in_folio_offset); mapping = candidate->f_mapping; min_order =mapping_min_folio_order (mapping);
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
In reply to Zi YanQuoted 4 lines · Zi Yan
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>
LGTM.
Quoted 31 lines
--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +4
-5@@ -4327,8 +4327,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, goto out; } -pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n" , - pid, vaddr_start, vaddr_end); +pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + pid, vaddr_start, vaddr_end, new_order, in_folio_offset);mmap_read_lock (mm);/* @@ -4438,8 +4438,8 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,if (IS_ERR (candidate)) goto out; -pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx]\n" , - file_path, off_start, off_end); +pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + file_path, off_start, off_end, new_order, in_folio_offset); mapping = candidate->f_mapping; min_order =mapping_min_folio_order (mapping); --
Quoted 2 lines
2.47.2
Thanks
Barry
Re: [PATCH v2 1/3] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
In reply to Zi YanQuoted 23 lines · Zi Yan
They are useful information for debugging split huge page tests.
Signed-off-by Zi Yan <[email protected]>--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +2
-2@@ -4327,8 +4327,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, goto out; } -pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n" , - pid, vaddr_start, vaddr_end); +pr_debug ("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + pid, vaddr_start, vaddr_end, new_order, in_folio_offset);mmap_read_lock (mm);/*
mm/huge_memory.c static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, · line 4445
Quoted 10 lines
mm/huge_memory.c +2
-2@@ -4438,8 +4438,8 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start,if (IS_ERR (candidate)) goto out; -pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx]\n" , - file_path, off_start, off_end); +pr_debug ("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx], new_order: %u, in_folio_offset: %ld\n" , + file_path, off_start, off_end, new_order, in_folio_offset); mapping = candidate->f_mapping; min_order =mapping_min_folio_order (mapping);
Signature · 3 lines
Cheers, David / dhildenb
Zi Yan
reviewerPATCH v2 2/3 selftests/mm: add check_folio_orders() helper.
In reply to Zi YanThe helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
--- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)
tools/testing/selftests/mm/split_huge_page_test.c +1 -3
@@ -34,8 +34,6 @@ uint64_t pmd_pagesize;#define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d"#define PATH_FMT "%s,0x%lx,0x%lx,%d" -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22)#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages))int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file)
@@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)if (kpageflags_file) {pread (kpageflags_file, &page_flags,sizeof (page_flags), - (paddr &PFN_MASK ) *sizeof (page_flags)); +PAGEMAP_PFN (paddr) *sizeof (page_flags));return !!(page_flags &KPF_THP ); }
tools/testing/selftests/mm/vm_util.c +133 -0
139 lines not on this page · raw message
tools/testing/selftests/mm/vm_util.h +7 -0
@@ -18,6 +18,11 @@#define PM_SWAP BIT_ULL(62)#define PM_PRESENT BIT_ULL(63) +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + +/* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore must use
@@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd);unsigned long default_huge_page_size (void );int detect_hugetlb_page_sizes (size_t sizes[],int max); +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders);int uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);
Signature · 1 line
2.47.2
Re: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
Quoted 26 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>---
.../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +0
-2@@ -34,8 +34,6 @@ uint64_t pmd_pagesize;#define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d"#define PATH_FMT "%s,0x%lx,0x%lx,%d" -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22)#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages))int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file)
tools/testing/selftests/mm/split_huge_page_test.c int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file) · line 51
Quoted 6 lines
tools/testing/selftests/mm/split_huge_page_test.c +1
-1@@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)if (kpageflags_file) {pread (kpageflags_file, &page_flags,sizeof (page_flags), - (paddr &PFN_MASK ) *sizeof (page_flags)); +PAGEMAP_PFN (paddr) *sizeof (page_flags));
is_backed_by_thp() shares similar logic as get_page_flags(), I am thinking we can leverage get_page_flags() here.
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 343
Quoted 13 lines
tools/testing/selftests/mm/split_huge_page_test.c +0
-0return !!(page_flags &KPF_THP ); }tools/testing/selftests/mm/vm_util.c +3
-0@@ -338,6 +338,139 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max)return count; } +static int get_page_flags (char *vaddr,int pagemap_file,int kpageflags_file, +uint64_t *flags) +{
Nit.
In vm_util.c, we usually name the file descriptor as xxx_fd.
Quoted 12 lines
tools/testing/selftests/mm/vm_util.c +12
-0+unsigned long pfn; +size_t count; + + pfn =pagemap_get_pfn (pagemap_file, vaddr); +/* +* Treat non-present page as a page without any flag, so that +* gather_folio_orders() just record the current folio order. +*/ +if (pfn ==-1UL ) { + *flags =0 ; +return 0 ; + }
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 365
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+ + count =pread (kpageflags_file, flags,sizeof (*flags), + pfn *sizeof (*flags)); + +if (count !=sizeof (*flags)) +return -1 ; + +return 0 ; +} +
Maybe a simple document here would be helpful.
Quoted 37 lines
tools/testing/selftests/mm/vm_util.c +37
-0+static int gather_folio_orders (char *vaddr_start,size_t len, +int pagemap_file,int kpageflags_file, +int orders[],int nr_orders) +{ +uint64_t page_flags =0 ; +int cur_order =-1 ; +char *vaddr; + +if (!pagemap_file || !kpageflags_file) +return -1 ; +if (nr_orders <=0 ) +return -1 ; + +for (vaddr = vaddr_start; vaddr < vaddr_start + len; ) { +char *next_folio_vaddr; +int status; + +if (get_page_flags (vaddr, pagemap_file, kpageflags_file, &page_flags)) +return -1 ; + +/* all order-0 pages with possible false postive (non folio) */ +if (!(page_flags & (KPF_COMPOUND_HEAD |KPF_COMPOUND_TAIL ))) { + orders[0 ]++; + vaddr +=psize (); +continue ; + } + +/* skip non thp compound pages */ +if (!(page_flags &KPF_THP )) { + vaddr +=psize (); +continue ; + } + +/* vpn points to part of a THP at this point */ +if (page_flags &KPF_COMPOUND_HEAD ) + cur_order =1 ; +else {
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 412
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; +continue ; + } + + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + +if (next_folio_vaddr >= vaddr_start + len) +break ;
Would we skip order 1 folio at the last position?
For example, vaddr_start is 0x2000, len is 0x2000 and the folio at vaddr_start is an order 1 folio, whose size is exactly 0x2000.
Then we will get next_folio_vaddr == vaddr_start + len.
Could that happen?
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 420
Quoted 8 lines
tools/testing/selftests/mm/vm_util.c +8
-0+ +while (!(status =get_page_flags (next_folio_vaddr, pagemap_file, + kpageflags_file, + &page_flags))) { +/* next compound head page or order-0 page */ +if ((page_flags &KPF_COMPOUND_HEAD ) || + !(page_flags & (KPF_COMPOUND_HEAD | +KPF_COMPOUND_TAIL ))) {
Maybe we can put them into one line.
Quoted 5 lines
tools/testing/selftests/mm/vm_util.c +5
-0+if (cur_order < nr_orders) { + orders[cur_order]++; + cur_order =-1 ; + vaddr = next_folio_vaddr; + }
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 435
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+break ; + } + +/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; + + cur_order++; + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + }
The while loop share similar logic as the outer for loop. Is it possible reduce some duplication?
Quoted 8 lines
tools/testing/selftests/mm/vm_util.c +8
-0+ +if (status) +return status; + } +if (cur_order >0 && cur_order < nr_orders) + orders[cur_order]++; +return 0 ; +}
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 453
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+ +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders) +{ +int *vaddr_orders; +int status; +int i; + + vaddr_orders = (int *)malloc (sizeof (int ) * nr_orders); +
I took a look into thp_setting.h, where defines an array with NR_ORDERS element which is 20. Maybe we can leverage it here, since we don't expect the order to be larger.
Quoted 50 lines
tools/testing/selftests/mm/vm_util.c +20
-0+if (!vaddr_orders) +ksft_exit_fail_msg ("Cannot allocate memory for vaddr_orders" ); + +memset (vaddr_orders,0 ,sizeof (int ) * nr_orders); + status =gather_folio_orders (vaddr_start, len, pagemap_file, + kpageflags_file, vaddr_orders, nr_orders); +if (status) +return status; + + status =0 ; +for (i =0 ; i < nr_orders; i++) +if (vaddr_orders[i] != orders[i]) { +ksft_print_msg ("order %d: expected: %d got %d\n" , i, + orders[i], vaddr_orders[i]); + status =-1 ; + } + +return status; +} +/* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor,uint64_t *ioctls)tools/testing/selftests/mm/vm_util.h +7
-0@@ -18,6 +18,11 @@#define PM_SWAP BIT_ULL(62)#define PM_PRESENT BIT_ULL(63) +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + +/* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore must use @@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd);unsigned long default_huge_page_size (void );int detect_hugetlb_page_sizes (size_t sizes[],int max); +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders);int uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);Signature · 1 line
2.47.2
Signature · 2 lines
Wei Yang Help you, Help me
Zi Yan
reviewerRe: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
Quoted 28 lines · Wei Yang
Quoted 27 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>---
.../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +0
-2@@ -34,8 +34,6 @@ uint64_t pmd_pagesize;#define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d"#define PATH_FMT "%s,0x%lx,0x%lx,%d" -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22)#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages))int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file)@@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)
Quoted 8 lines
tools/testing/selftests/mm/split_huge_page_test.c int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file) · line 51
Quoted 5 lines
tools/testing/selftests/mm/split_huge_page_test.c +1
-1if (kpageflags_file) {pread (kpageflags_file, &page_flags,sizeof (page_flags), - (paddr &PFN_MASK ) *sizeof (page_flags)); +PAGEMAP_PFN (paddr) *sizeof (page_flags));
is_backed_by_thp()shares similar logic asget_page_flags(), I am thinking we can leverageget_page_flags()here.
I was lazy for this one. I will use check_folio_orders() in the next version.
Quoted 11 lines
Quoted 11 lines
tools/testing/selftests/mm/split_huge_page_test.c +0
-0return !!(page_flags &KPF_THP ); }tools/testing/selftests/mm/vm_util.c +0
-0@@ -338,6 +338,139 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max)return count; }
Quoted 7 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 343
Quoted 3 lines
tools/testing/selftests/mm/vm_util.c +3
-0+static int get_page_flags (char *vaddr,int pagemap_file,int kpageflags_file, +uint64_t *flags) +{Nit.
In
vm_util.c, we usually name the file descriptor asxxx_fd.
OK. I can rename them.
Quoted 17 lines
Quoted 17 lines
tools/testing/selftests/mm/vm_util.c +16
-0+unsigned long pfn; +size_t count; + + pfn =pagemap_get_pfn (pagemap_file, vaddr); +/* +* Treat non-present page as a page without any flag, so that +* gather_folio_orders() just record the current folio order. +*/ +if (pfn ==-1UL ) { + *flags =0 ; +return 0 ; + } + + count =pread (kpageflags_file, flags,sizeof (*flags), + pfn *sizeof (*flags)); +
Quoted 8 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 365
Quoted 6 lines
tools/testing/selftests/mm/vm_util.c +6
-0+if (count !=sizeof (*flags)) +return -1 ; + +return 0 ; +} +Maybe a simple document here would be helpful.
Will do.
Quoted 51 lines
Quoted 38 lines
tools/testing/selftests/mm/vm_util.c +37
-0+static int gather_folio_orders (char *vaddr_start,size_t len, +int pagemap_file,int kpageflags_file, +int orders[],int nr_orders) +{ +uint64_t page_flags =0 ; +int cur_order =-1 ; +char *vaddr; + +if (!pagemap_file || !kpageflags_file) +return -1 ; +if (nr_orders <=0 ) +return -1 ; + +for (vaddr = vaddr_start; vaddr < vaddr_start + len; ) { +char *next_folio_vaddr; +int status; + +if (get_page_flags (vaddr, pagemap_file, kpageflags_file, &page_flags)) +return -1 ; + +/* all order-0 pages with possible false postive (non folio) */ +if (!(page_flags & (KPF_COMPOUND_HEAD |KPF_COMPOUND_TAIL ))) { + orders[0 ]++; + vaddr +=psize (); +continue ; + } + +/* skip non thp compound pages */ +if (!(page_flags &KPF_THP )) { + vaddr +=psize (); +continue ; + } + +/* vpn points to part of a THP at this point */ +if (page_flags &KPF_COMPOUND_HEAD ) + cur_order =1 ; +else {tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 412
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; +continue ; + } + + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + +if (next_folio_vaddr >= vaddr_start + len) +break ;Would we skip order 1 folio at the last position?
Quoted 6 lines
For example,
vaddr_startis0x2000, len is0x2000and the folio atvaddr_startis an order 1 folio, whose size is exactly0x2000.Then we will get
next_folio_vaddr==vaddr_start+ len.Could that happen?
No. After the loop, there is code checking cur_order and updating orders[].
Quoted 11 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 420
Quoted 9 lines
tools/testing/selftests/mm/vm_util.c +8
-0+ +while (!(status =get_page_flags (next_folio_vaddr, pagemap_file, + kpageflags_file, + &page_flags))) { +/* next compound head page or order-0 page */ +if ((page_flags &KPF_COMPOUND_HEAD ) || + !(page_flags & (KPF_COMPOUND_HEAD | +KPF_COMPOUND_TAIL ))) {Maybe we can put them into one line.
Sure.
Quoted 11 lines
Quoted 11 lines
tools/testing/selftests/mm/vm_util.c +10
-0+if (cur_order < nr_orders) { + orders[cur_order]++; + cur_order =-1 ; + vaddr = next_folio_vaddr; + } +break ; + } + +/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL ))
Quoted 8 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 435
Quoted 5 lines
tools/testing/selftests/mm/vm_util.c +5
-0+return -1 ; + + cur_order++; + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + }The while loop share similar logic as the outer for loop. Is it possible reduce some duplication?
Outer loop is to filter order-0 and non head pages and while loop is to find current THP/mTHP orders. It would be messy to combine them. But feel free to provide ideas if you see a way.
Quoted 15 lines
Quoted 15 lines
tools/testing/selftests/mm/vm_util.c +14
-0+ +if (status) +return status; + } +if (cur_order >0 && cur_order < nr_orders) + orders[cur_order]++; +return 0 ; +} + +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders) +{ +int *vaddr_orders; +int status;
Quoted 9 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 453
Quoted 4 lines
tools/testing/selftests/mm/vm_util.c +4
-0+int i; + + vaddr_orders = (int *)malloc (sizeof (int ) * nr_orders); +I took a look into
thp_setting.h, where defines an array withNR_ORDERSelement which is 20. Maybe we can leverage it here, since we don't expect the order to be larger.
20 is too large for current use. We can revisit this when the function gets more users.
Quoted 46 lines
Quoted 46 lines
tools/testing/selftests/mm/vm_util.c +20
-0+if (!vaddr_orders) +ksft_exit_fail_msg ("Cannot allocate memory for vaddr_orders" ); + +memset (vaddr_orders,0 ,sizeof (int ) * nr_orders); + status =gather_folio_orders (vaddr_start, len, pagemap_file, + kpageflags_file, vaddr_orders, nr_orders); +if (status) +return status; + + status =0 ; +for (i =0 ; i < nr_orders; i++) +if (vaddr_orders[i] != orders[i]) { +ksft_print_msg ("order %d: expected: %d got %d\n" , i, + orders[i], vaddr_orders[i]); + status =-1 ; + } + +return status; +} +/* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor,uint64_t *ioctls)tools/testing/selftests/mm/vm_util.h +7
-0@@ -18,6 +18,11 @@#define PM_SWAP BIT_ULL(62)#define PM_PRESENT BIT_ULL(63) +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + +/* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore must use @@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd);unsigned long default_huge_page_size (void );int detect_hugetlb_page_sizes (size_t sizes[],int max); +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders);
Quoted 8 lines
Quoted 4 lines
tools/testing/selftests/mm/vm_util.h +0
-0int uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);Signature · 1 line
2.47.2Signature · 2 lines
Wei Yang Help you, Help me
Best Regards,
Yan, Zi
Re: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
On Mon, Aug 11, 2025 at 02:39:08PM -0400, Zi Yan wrote:
[...]
Quoted 50 lines
Quoted 50 lines
Quoted 37 lines
tools/testing/selftests/mm/vm_util.c +37
-0+static int gather_folio_orders (char *vaddr_start,size_t len, +int pagemap_file,int kpageflags_file, +int orders[],int nr_orders) +{ +uint64_t page_flags =0 ; +int cur_order =-1 ; +char *vaddr; + +if (!pagemap_file || !kpageflags_file) +return -1 ; +if (nr_orders <=0 ) +return -1 ; + +for (vaddr = vaddr_start; vaddr < vaddr_start + len; ) { +char *next_folio_vaddr; +int status; + +if (get_page_flags (vaddr, pagemap_file, kpageflags_file, &page_flags)) +return -1 ; + +/* all order-0 pages with possible false postive (non folio) */ +if (!(page_flags & (KPF_COMPOUND_HEAD |KPF_COMPOUND_TAIL ))) { + orders[0 ]++; + vaddr +=psize (); +continue ; + } + +/* skip non thp compound pages */ +if (!(page_flags &KPF_THP )) { + vaddr +=psize (); +continue ; + } + +/* vpn points to part of a THP at this point */ +if (page_flags &KPF_COMPOUND_HEAD ) + cur_order =1 ; +else {tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 412
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; +continue ; + } + + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + +if (next_folio_vaddr >= vaddr_start + len) +break ;Would we skip order 1 folio at the last position?
Quoted 9 lines
Quoted 6 lines
For example,
vaddr_startis0x2000, len is0x2000and the folio atvaddr_startis an order 1 folio, whose size is exactly0x2000.Then we will get
next_folio_vaddr==vaddr_start+ len.Could that happen?
No. After the loop, there is code checking
cur_orderand updating orders[].
Oh, I missed this.
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
In reply to Zi YanQuoted 98 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +1
-3@@ -34,8 +34,6 @@ uint64_t pmd_pagesize;#define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d"#define PATH_FMT "%s,0x%lx,0x%lx,%d" -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22)#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages))int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file)@@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)if (kpageflags_file) {pread (kpageflags_file, &page_flags,sizeof (page_flags), - (paddr &PFN_MASK ) *sizeof (page_flags)); +PAGEMAP_PFN (paddr) *sizeof (page_flags));return !!(page_flags &KPF_THP ); }tools/testing/selftests/mm/vm_util.c +56
-0@@ -338,6 +338,139 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max)return count; } +static int get_page_flags (char *vaddr,int pagemap_file,int kpageflags_file, +uint64_t *flags) +{ +unsigned long pfn; +size_t count; + + pfn =pagemap_get_pfn (pagemap_file, vaddr); +/* +* Treat non-present page as a page without any flag, so that +* gather_folio_orders() just record the current folio order. +*/ +if (pfn ==-1UL ) { + *flags =0 ; +return 0 ; + } + + count =pread (kpageflags_file, flags,sizeof (*flags), + pfn *sizeof (*flags)); + +if (count !=sizeof (*flags)) +return -1 ; + +return 0 ; +} + +static int gather_folio_orders (char *vaddr_start,size_t len, +int pagemap_file,int kpageflags_file, +int orders[],int nr_orders) +{ +uint64_t page_flags =0 ; +int cur_order =-1 ; +char *vaddr; + +if (!pagemap_file || !kpageflags_file) +return -1 ; +if (nr_orders <=0 ) +return -1 ; + +for (vaddr = vaddr_start; vaddr < vaddr_start + len; ) { +char *next_folio_vaddr; +int status; + +if (get_page_flags (vaddr, pagemap_file, kpageflags_file, &page_flags)) +return -1 ; + +/* all order-0 pages with possible false postive (non folio) */ +if (!(page_flags & (KPF_COMPOUND_HEAD |KPF_COMPOUND_TAIL ))) { + orders[0 ]++; + vaddr +=psize (); +continue ; + } + +/* skip non thp compound pages */ +if (!(page_flags &KPF_THP )) { + vaddr +=psize (); +continue ;
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 406
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+ } + +/* vpn points to part of a THP at this point */ +if (page_flags &KPF_COMPOUND_HEAD ) + cur_order =1 ; +else { +/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; +continue ;
If KPF_COMPOUND_TAIL is set, do we use the same vaddr, or should we advance to the next vaddr before continuing?
Quoted 95 lines
tools/testing/selftests/mm/vm_util.c +67
-0+ } + + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + +if (next_folio_vaddr >= vaddr_start + len) +break ; + +while (!(status =get_page_flags (next_folio_vaddr, pagemap_file, + kpageflags_file, + &page_flags))) { +/* next compound head page or order-0 page */ +if ((page_flags &KPF_COMPOUND_HEAD ) || + !(page_flags & (KPF_COMPOUND_HEAD | +KPF_COMPOUND_TAIL ))) { +if (cur_order < nr_orders) { + orders[cur_order]++; + cur_order =-1 ; + vaddr = next_folio_vaddr; + } +break ; + } + +/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; + + cur_order++; + next_folio_vaddr = vaddr + (1UL << (cur_order +pshift ())); + } + +if (status) +return status; + } +if (cur_order >0 && cur_order < nr_orders) + orders[cur_order]++; +return 0 ; +} + +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders) +{ +int *vaddr_orders; +int status; +int i; + + vaddr_orders = (int *)malloc (sizeof (int ) * nr_orders); + +if (!vaddr_orders) +ksft_exit_fail_msg ("Cannot allocate memory for vaddr_orders" ); + +memset (vaddr_orders,0 ,sizeof (int ) * nr_orders); + status =gather_folio_orders (vaddr_start, len, pagemap_file, + kpageflags_file, vaddr_orders, nr_orders); +if (status) +return status; + + status =0 ; +for (i =0 ; i < nr_orders; i++) +if (vaddr_orders[i] != orders[i]) { +ksft_print_msg ("order %d: expected: %d got %d\n" , i, + orders[i], vaddr_orders[i]); + status =-1 ; + } + +return status; +} +/* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor,uint64_t *ioctls)tools/testing/selftests/mm/vm_util.h +7
-0@@ -18,6 +18,11 @@#define PM_SWAP BIT_ULL(62)#define PM_PRESENT BIT_ULL(63) +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + +/* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore must use @@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd);unsigned long default_huge_page_size (void );int detect_hugetlb_page_sizes (size_t sizes[],int max); +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders);int uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);
Zi Yan
reviewerRe: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
Quoted 98 lines · Donet Tom
Quoted 97 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +1
-2@@ -34,8 +34,6 @@ uint64_t pmd_pagesize;#define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d"#define PATH_FMT "%s,0x%lx,0x%lx,%d" -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22)#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages))int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file)@@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)if (kpageflags_file) {pread (kpageflags_file, &page_flags,sizeof (page_flags), - (paddr &PFN_MASK ) *sizeof (page_flags)); +PAGEMAP_PFN (paddr) *sizeof (page_flags));return !!(page_flags &KPF_THP ); }tools/testing/selftests/mm/vm_util.c +59
-0@@ -338,6 +338,139 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max)return count; } +static int get_page_flags(char *vaddr, int pagemap_file, int kpageflags_file, +uint64_t *flags) +{ +unsigned long pfn; +size_t count; + + pfn =pagemap_get_pfn (pagemap_file, vaddr); +/* +* Treat non-present page as a page without any flag, so that +* gather_folio_orders() just record the current folio order. +*/ +if (pfn ==-1UL ) { + *flags =0 ; +return 0 ; + } + + count =pread (kpageflags_file, flags,sizeof (*flags), + pfn *sizeof (*flags)); + +if (count !=sizeof (*flags)) +return -1 ; + +return 0 ; +} + +static int gather_folio_orders (char *vaddr_start,size_t len, +int pagemap_file,int kpageflags_file, +int orders[],int nr_orders) +{ +uint64_t page_flags =0 ; +int cur_order =-1 ; +char *vaddr; + +if (!pagemap_file || !kpageflags_file) +return -1 ; +if (nr_orders <=0 ) +return -1 ; + +for (vaddr = vaddr_start; vaddr < vaddr_start + len; ) { +char *next_folio_vaddr; +int status; + +if (get_page_flags (vaddr, pagemap_file, kpageflags_file, &page_flags)) +return -1 ; + +/* all order-0 pages with possible false postive (non folio) */ +if (!(page_flags & (KPF_COMPOUND_HEAD |KPF_COMPOUND_TAIL ))) { + orders[0 ]++; + vaddr +=psize (); +continue ; + } + +/* skip non thp compound pages */ +if (!(page_flags &KPF_THP )) { + vaddr +=psize (); +continue ; + } + +/* vpn points to part of a THP at this point */ +if (page_flags &KPF_COMPOUND_HEAD )
Quoted 8 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 406
Quoted 6 lines
tools/testing/selftests/mm/vm_util.c +6
-0+ cur_order =1 ; + else { +/* not a head nor a tail in a THP? */ +if (!(page_flags &KPF_COMPOUND_TAIL )) +return -1 ; +continue ;If
KPF_COMPOUND_TAILis set, do we use the same vaddr, or should we advance to the next vaddr before continuing?
Yeah, I missed a vaddr += psize() here. Thank you for pointing this out.
Best Regards,
Yan, Zi
Baolin Wang
reviewerRe: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
In reply to Zi YanQuoted 12 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)
[snip]
Quoted 7 lines
tools/testing/selftests/mm/vm_util.c +7
-0+ +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders) +{ +int *vaddr_orders; +int status; +int i;
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 460
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+ + vaddr_orders = (int *)malloc (sizeof (int ) * nr_orders); + +if (!vaddr_orders) +ksft_exit_fail_msg ("Cannot allocate memory for vaddr_orders" ); + +memset (vaddr_orders,0 ,sizeof (int ) * nr_orders); + status =gather_folio_orders (vaddr_start, len, pagemap_file, + kpageflags_file, vaddr_orders, nr_orders); +if (status)
Missed calling free(vaddr_orders) before returning.
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 470
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+return status; + + status =0 ; +for (i =0 ; i < nr_orders; i++) +if (vaddr_orders[i] != orders[i]) { +ksft_print_msg ("order %d: expected: %d got %d\n" , i, + orders[i], vaddr_orders[i]); + status =-1 ; + } +
Ditto.
Quoted 31 lines
tools/testing/selftests/mm/vm_util.c +3
-0+return status; +} +/* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor,uint64_t *ioctls)tools/testing/selftests/mm/vm_util.h +7
-0@@ -18,6 +18,11 @@#define PM_SWAP BIT_ULL(62)#define PM_PRESENT BIT_ULL(63) +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + +/* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore must use @@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd);unsigned long default_huge_page_size (void );int detect_hugetlb_page_sizes (size_t sizes[],int max); +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders);int uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);
Zi Yan
reviewerRe: [PATCH v2 2/3] selftests/mm: add check_folio_orders() helper.
Quoted 49 lines · Baolin Wang
Quoted 12 lines · Zi Yan
The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios.
Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 133 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 141 insertions(+), 3 deletions(-)[snip]
Quoted 7 lines
tools/testing/selftests/mm/vm_util.c +7
-0+ +int check_folio_orders (char *vaddr_start,size_t len,int pagemap_file, +int kpageflags_file,int orders[],int nr_orders) +{ +int *vaddr_orders; +int status; +int i;tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 460
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+ + vaddr_orders = (int *)malloc (sizeof (int ) * nr_orders); + +if (!vaddr_orders) +ksft_exit_fail_msg ("Cannot allocate memory for vaddr_orders" ); + +memset (vaddr_orders,0 ,sizeof (int ) * nr_orders); + status =gather_folio_orders (vaddr_start, len, pagemap_file, + kpageflags_file, vaddr_orders, nr_orders); +if (status)Missed calling
free(vaddr_orders)before returning.tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 470
Quoted 10 lines
tools/testing/selftests/mm/vm_util.c +10
-0+return status; + + status =0 ; +for (i =0 ; i < nr_orders; i++) +if (vaddr_orders[i] != orders[i]) { +ksft_print_msg ("order %d: expected: %d got %d\n" , i, + orders[i], vaddr_orders[i]); + status =-1 ; + } +Ditto.
Quoted 3 lines
tools/testing/selftests/mm/vm_util.c int detect_hugetlb_page_sizes(size_t sizes[], int max) · line 444
Quoted 3 lines
tools/testing/selftests/mm/vm_util.c +3
-0+return status; +} +
Will add free() in the above two locations. Thank you for spotting them.
Best Regards,
Yan, Zi
Zi Yan
reviewerPATCH v2 3/3 selftests/mm: check after-split folio orders in split_huge_page_test.
In reply to Zi YanInstead of just checking the existence of PMD folios before and after folio split tests, use check_folio_orders() to check after-split folio orders.
The following tests are not changed:
1. split_pte_mapped_thp: the test already uses kpageflags to check;
2. split_file_backed_thp: no vaddr available.
--- .../selftests/mm/split_huge_page_test.c | 98 ++++++++++++++----- 1 file changed, 72 insertions(+), 26 deletions(-)
tools/testing/selftests/mm/split_huge_page_test.c +72 -26
@@ -25,6 +25,10 @@uint64_t pagesize;unsigned int pageshift;uint64_t pmd_pagesize; +unsigned int pmd_order; +unsigned int max_order; + +#define NR_ORDERS (max_order + 1)#define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages"#define SMAP_PATH "/proc/self/smaps"
@@ -36,6 +40,11 @@ uint64_t pmd_pagesize;#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages)) +const char *pagemap_proc ="/proc/self/pagemap" ; +const char *kpageflags_proc ="/proc/kpageflags" ; +int pagemap_fd; +int kpageflags_fd; +int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file) {uint64_t paddr;
@@ -151,6 +160,11 @@ void split_pmd_thp_to_order(int order)char *one_page;size_t len =4 * pmd_pagesize;size_t i; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); one_page =memalign (pmd_pagesize, len);if (!one_page)
@@ -172,12 +186,20 @@ void split_pmd_thp_to_order(int order)if (one_page[i] != (char )i)ksft_exit_fail_msg ("%ld byte corrupted\n" , i); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +/* set expected orders */ + orders[order] =4 << (pmd_order - order); + +if (check_folio_orders (one_page, len, pagemap_fd, kpageflags_fd, + orders,NR_ORDERS )) +ksft_exit_fail_msg ("Unexpected THP split\n" );if (!check_huge_anon (one_page,0 , pmd_pagesize))ksft_exit_fail_msg ("Still AnonHugePages not split\n" );ksft_test_result_pass ("Split huge pages to order %d successful\n" , order);free (one_page); +free (orders); }void split_pte_mapped_thp (void )
@@ -186,22 +208,6 @@ void split_pte_mapped_thp(void)size_t len =4 * pmd_pagesize;uint64_t thp_size;size_t i; -const char *pagemap_template ="/proc/%d/pagemap" ; -const char *kpageflags_proc ="/proc/kpageflags" ; -char pagemap_proc[255 ]; -int pagemap_fd; -int kpageflags_fd; - -if (snprintf (pagemap_proc,255 , pagemap_template,getpid ()) <0 ) -ksft_exit_fail_msg ("get pagemap proc error: %s\n" ,strerror (errno)); - - pagemap_fd =open (pagemap_proc,O_RDONLY ); -if (pagemap_fd ==-1 ) -ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); - - kpageflags_fd =open (kpageflags_proc,O_RDONLY ); -if (kpageflags_fd ==-1 ) -ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); one_page =mmap ((void *)(1UL <<30 ), len,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_PRIVATE ,-1 ,0 );
@@ -259,8 +265,6 @@ void split_pte_mapped_thp(void)ksft_test_result_pass ("Split PTE-mapped huge pages successful\n" );munmap (one_page, len); -close (pagemap_fd); -close (kpageflags_fd); }void split_file_backed_thp (int order)
@@ -463,10 +467,16 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, int order, int offset) { int fd; +char *split_addr;char *addr;size_t i;char testfile[INPUT_MAX ];int err =0 ; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); err =snprintf (testfile,INPUT_MAX ,"%s/test" , fs_loc);
@@ -474,16 +484,32 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc,ksft_exit_fail_msg ("cannot generate right test file name\n" ); err =create_pagecache_thp_and_fd (testfile, fd_size, &fd, &addr); -if (err) +if (err) { +free (orders);return ; + } err =0 ; -if (offset ==-1 ) -write_debugfs (PID_FMT ,getpid (), (uint64_t )addr, - (uint64_t )addr + fd_size, order); -else -write_debugfs (PID_FMT_OFFSET ,getpid (), (uint64_t )addr, - (uint64_t )addr + fd_size, order, offset); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +if (offset ==-1 ) { +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order); + +/* set expected orders */ + orders[order] = fd_size / (pagesize << order); + }else { +int times = fd_size / pmd_pagesize; + +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT_OFFSET ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order, offset); + +/* set expected orders */ +for (i = order +1 ; i < pmd_order; i++) + orders[i] = times; + orders[order] =2 * times; + }for (i =0 ; i < fd_size; i++)if (*(addr + i) != (char )i) {
@@ -492,6 +518,14 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, goto out; } +if (check_folio_orders (addr, fd_size, pagemap_fd, kpageflags_fd, orders, +NR_ORDERS )) { +ksft_print_msg ("Unexpected THP split\n" ); + err =1 ; + goto out; + } + +if (!check_huge_file (addr,0 , pmd_pagesize)) {ksft_print_msg ("Still FilePmdMapped not split\n" ); err =EXIT_FAILURE ;
@@ -499,6 +533,7 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, } out: +free (orders);munmap (addr, fd_size);close (fd);unlink (testfile);
@@ -522,7 +557,6 @@ int main(int argc, char **argv)const char *fs_loc;bool created_tmp;int offset; -unsigned int max_order;unsigned int nr_pages;unsigned int tests;
@@ -539,6 +573,7 @@ int main(int argc, char **argv) pagesize =getpagesize (); pageshift =ffs (pagesize) -1 ; pmd_pagesize =read_pmd_pagesize (); + pmd_order =GET_ORDER (pmd_pagesize / pagesize);if (!pmd_pagesize)ksft_exit_fail_msg ("Reading PMD pagesize failed\n" );
@@ -547,6 +582,14 @@ int main(int argc, char **argv) tests =2 + (max_order -1 ) + (2 * max_order) + (max_order -1 ) *4 +2 ;ksft_set_plan (tests); + pagemap_fd =open (pagemap_proc,O_RDONLY ); +if (pagemap_fd ==-1 ) +ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); + + kpageflags_fd =open (kpageflags_proc,O_RDONLY ); +if (kpageflags_fd ==-1 ) +ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); + fd_size =2 * pmd_pagesize;split_pmd_zero_pages ();
@@ -571,6 +614,9 @@ int main(int argc, char **argv)split_thp_in_pagecache_to_order_at (fd_size, fs_loc, i, offset);cleanup_thp_fs (fs_loc, created_tmp); +close (pagemap_fd); +close (kpageflags_fd); +ksft_finished ();return 0 ;
Signature · 1 line
2.47.2
Re: [PATCH v2 3/3] selftests/mm: check after-split folio orders in split_huge_page_test.
Quoted 193 lines · Zi Yan
Instead of just checking the existence of PMD folios before and after folio split tests, use
check_folio_orders()to check after-split folio orders.The following tests are not changed:
1.split_pte_mapped_thp: the test already uses kpageflags to check;
2.split_file_backed_thp: no vaddr available.Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 98 ++++++++++++++----- 1 file changed, 72 insertions(+), 26 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +60
-26@@ -25,6 +25,10 @@uint64_t pagesize;unsigned int pageshift;uint64_t pmd_pagesize; +unsigned int pmd_order; +unsigned int max_order; + +#define NR_ORDERS (max_order + 1)#define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages"#define SMAP_PATH "/proc/self/smaps"@@ -36,6 +40,11 @@ uint64_t pmd_pagesize;#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages)) +const char *pagemap_proc ="/proc/self/pagemap" ; +const char *kpageflags_proc ="/proc/kpageflags" ; +int pagemap_fd; +int kpageflags_fd; +int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file) {uint64_t paddr;@@ -151,6 +160,11 @@ void split_pmd_thp_to_order(int order)char *one_page;size_t len =4 * pmd_pagesize;size_t i; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); one_page =memalign (pmd_pagesize, len);if (!one_page)@@ -172,12 +186,20 @@ void split_pmd_thp_to_order(int order)if (one_page[i] != (char )i)ksft_exit_fail_msg ("%ld byte corrupted\n" , i); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +/* set expected orders */ + orders[order] =4 << (pmd_order - order); + +if (check_folio_orders (one_page, len, pagemap_fd, kpageflags_fd, + orders,NR_ORDERS )) +ksft_exit_fail_msg ("Unexpected THP split\n" );if (!check_huge_anon (one_page,0 , pmd_pagesize))ksft_exit_fail_msg ("Still AnonHugePages not split\n" );ksft_test_result_pass ("Split huge pages to order %d successful\n" , order);free (one_page); +free (orders); }void split_pte_mapped_thp (void )@@ -186,22 +208,6 @@ void split_pte_mapped_thp(void)size_t len =4 * pmd_pagesize;uint64_t thp_size;size_t i; -const char *pagemap_template ="/proc/%d/pagemap" ; -const char *kpageflags_proc ="/proc/kpageflags" ; -char pagemap_proc[255 ]; -int pagemap_fd; -int kpageflags_fd; - -if (snprintf (pagemap_proc,255 , pagemap_template,getpid ()) <0 ) -ksft_exit_fail_msg ("get pagemap proc error: %s\n" ,strerror (errno)); - - pagemap_fd =open (pagemap_proc,O_RDONLY ); -if (pagemap_fd ==-1 ) -ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); - - kpageflags_fd =open (kpageflags_proc,O_RDONLY ); -if (kpageflags_fd ==-1 ) -ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); one_page =mmap ((void *)(1UL <<30 ), len,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_PRIVATE ,-1 ,0 );@@ -259,8 +265,6 @@ void split_pte_mapped_thp(void)ksft_test_result_pass ("Split PTE-mapped huge pages successful\n" );munmap (one_page, len); -close (pagemap_fd); -close (kpageflags_fd); }void split_file_backed_thp (int order)@@ -463,10 +467,16 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, int order, int offset) { int fd; +char *split_addr;char *addr;size_t i;char testfile[INPUT_MAX ];int err =0 ; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); err =snprintf (testfile,INPUT_MAX ,"%s/test" , fs_loc);@@ -474,16 +484,32 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc,ksft_exit_fail_msg ("cannot generate right test file name\n" ); err =create_pagecache_thp_and_fd (testfile, fd_size, &fd, &addr); -if (err) +if (err) { +free (orders);return ; + } err =0 ; -if (offset ==-1 ) -write_debugfs (PID_FMT ,getpid (), (uint64_t )addr, - (uint64_t )addr + fd_size, order); -else -write_debugfs (PID_FMT_OFFSET ,getpid (), (uint64_t )addr, - (uint64_t )addr + fd_size, order, offset); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +if (offset ==-1 ) { +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order); + +/* set expected orders */ + orders[order] = fd_size / (pagesize << order); + }else { +int times = fd_size / pmd_pagesize; + +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT_OFFSET ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order, offset); + +/* set expected orders */ +for (i = order +1 ; i < pmd_order; i++) + orders[i] = times; + orders[order] =2 * times; + }for (i =0 ; i < fd_size; i++)if (*(addr + i) != (char )i) {@@ -492,6 +518,14 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, goto out; } +if (check_folio_orders (addr, fd_size, pagemap_fd, kpageflags_fd, orders, +NR_ORDERS )) { +ksft_print_msg ("Unexpected THP split\n" ); + err =1 ; + goto out; + } + +if (!check_huge_file (addr,0 , pmd_pagesize)) {ksft_print_msg ("Still FilePmdMapped not split\n" ); err =EXIT_FAILURE ;@@ -499,6 +533,7 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, } out: +free (orders);munmap (addr, fd_size);close (fd);unlink (testfile);@@ -522,7 +557,6 @@ int main(int argc, char **argv)const char *fs_loc;bool created_tmp;int offset; -unsigned int max_order;unsigned int nr_pages;unsigned int tests;
tools/testing/selftests/mm/split_huge_page_test.c int main(int argc, char **argv) · line 576
Quoted 4 lines
tools/testing/selftests/mm/split_huge_page_test.c +1
-0@@ -539,6 +573,7 @@ int main(int argc, char **argv) pagesize =getpagesize (); pageshift =ffs (pagesize) -1 ; pmd_pagesize =read_pmd_pagesize (); + pmd_order =GET_ORDER (pmd_pagesize / pagesize);
I think max_order is also same as pmd_order
nr_pages = pmd_pagesize / pagesize;
max_order = GET_ORDER(nr_pages);
Can we use one?
Quoted 28 lines
tools/testing/selftests/mm/split_huge_page_test.c +11
-0if (!pmd_pagesize)ksft_exit_fail_msg ("Reading PMD pagesize failed\n" );@@ -547,6 +582,14 @@ int main(int argc, char **argv) tests =2 + (max_order -1 ) + (2 * max_order) + (max_order -1 ) *4 +2 ;ksft_set_plan (tests); + pagemap_fd =open (pagemap_proc,O_RDONLY ); +if (pagemap_fd ==-1 ) +ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); + + kpageflags_fd =open (kpageflags_proc,O_RDONLY ); +if (kpageflags_fd ==-1 ) +ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); + fd_size =2 * pmd_pagesize;split_pmd_zero_pages ();@@ -571,6 +614,9 @@ int main(int argc, char **argv)split_thp_in_pagecache_to_order_at (fd_size, fs_loc, i, offset);cleanup_thp_fs (fs_loc, created_tmp); +close (pagemap_fd); +close (kpageflags_fd); +ksft_finished ();return 0 ;
Zi Yan
reviewerRe: [PATCH v2 3/3] selftests/mm: check after-split folio orders in split_huge_page_test.
Quoted 183 lines · Donet Tom
Quoted 177 lines · Zi Yan
Instead of just checking the existence of PMD folios before and after folio split tests, use
check_folio_orders()to check after-split folio orders.The following tests are not changed:
1.split_pte_mapped_thp: the test already uses kpageflags to check;
2.split_file_backed_thp: no vaddr available.Signed-off-by Zi Yan <[email protected]>--- .../selftests/mm/split_huge_page_test.c | 98 ++++++++++++++----- 1 file changed, 72 insertions(+), 26 deletions(-)tools/testing/selftests/mm/split_huge_page_test.c +26
-18@@ -25,6 +25,10 @@uint64_t pagesize;unsigned int pageshift;uint64_t pmd_pagesize; +unsigned int pmd_order; +unsigned int max_order; + +#define NR_ORDERS (max_order + 1)#define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages"#define SMAP_PATH "/proc/self/smaps"@@ -36,6 +40,11 @@ uint64_t pmd_pagesize;#define GET_ORDER (nr_pages) (31 - __builtin_clz(nr_pages)) +const char *pagemap_proc = "/proc/self/pagemap"; +const char *kpageflags_proc ="/proc/kpageflags" ; +int pagemap_fd; +int kpageflags_fd; +int is_backed_by_thp (char *vaddr,int pagemap_file,int kpageflags_file) {uint64_t paddr;@@ -151,6 +160,11 @@ void split_pmd_thp_to_order(int order)char *one_page;size_t len =4 * pmd_pagesize;size_t i; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); one_page =memalign (pmd_pagesize, len);if (!one_page)@@ -172,12 +186,20 @@ void split_pmd_thp_to_order(int order)if (one_page[i] != (char )i)ksft_exit_fail_msg ("%ld byte corrupted\n" , i); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +/* set expected orders */ + orders[order] =4 << (pmd_order - order); + +if (check_folio_orders (one_page, len, pagemap_fd, kpageflags_fd, + orders,NR_ORDERS )) +ksft_exit_fail_msg ("Unexpected THP split\n" );if (!check_huge_anon (one_page,0 , pmd_pagesize))ksft_exit_fail_msg ("Still AnonHugePages not split\n" );ksft_test_result_pass ("Split huge pages to order %d successful\n" , order);free (one_page); +free (orders); }void split_pte_mapped_thp (void )@@ -186,22 +208,6 @@ void split_pte_mapped_thp(void)size_t len =4 * pmd_pagesize;uint64_t thp_size;size_t i; -const char *pagemap_template ="/proc/%d/pagemap" ; -const char *kpageflags_proc ="/proc/kpageflags" ; -char pagemap_proc[255 ]; -int pagemap_fd; -int kpageflags_fd; - -if (snprintf (pagemap_proc,255 , pagemap_template,getpid ()) <0 ) -ksft_exit_fail_msg ("get pagemap proc error: %s\n" ,strerror (errno)); - - pagemap_fd =open (pagemap_proc,O_RDONLY ); -if (pagemap_fd ==-1 ) -ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); - - kpageflags_fd =open (kpageflags_proc,O_RDONLY ); -if (kpageflags_fd ==-1 ) -ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); one_page =mmap ((void *)(1UL <<30 ), len,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_PRIVATE ,-1 ,0 );@@ -259,8 +265,6 @@ void split_pte_mapped_thp(void)ksft_test_result_pass ("Split PTE-mapped huge pages successful\n" );munmap (one_page, len); -close (pagemap_fd); -close (kpageflags_fd); }void split_file_backed_thp (int order)@@ -463,10 +467,16 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, int order, int offset) { int fd; +char *split_addr;char *addr;size_t i;char testfile[INPUT_MAX ];int err =0 ; +int *orders; + + orders = (int *)malloc (sizeof (int ) *NR_ORDERS ); +if (!orders) +ksft_exit_fail_msg ("Fail to allocate memory: %s\n" ,strerror (errno)); err =snprintf (testfile,INPUT_MAX ,"%s/test" , fs_loc); @@ -474,16 +484,32 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, ksft_exit_fail_msg("cannot generate right test file name\n");err = create_pagecache_thp_and_fd(testfile, fd_size, &fd, &addr);tools/testing/selftests/mm/split_huge_page_test.c +31
-7-if (err) +if (err) { +free (orders);return ; + } err =0 ; - if (offset == -1) -write_debugfs (PID_FMT ,getpid (), (uint64_t )addr, - (uint64_t )addr + fd_size, order); - else - write_debugfs(PID_FMT_OFFSET, getpid(), (uint64_t)addr, - (uint64_t)addr + fd_size, order, offset); +memset (orders,0 ,sizeof (int ) *NR_ORDERS ); +if (offset ==-1 ) { +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order); + +/* set expected orders */ + orders[order] = fd_size / (pagesize << order); + }else { +int times = fd_size / pmd_pagesize; + +for (split_addr = addr; split_addr < addr + fd_size; split_addr += pmd_pagesize) +write_debugfs (PID_FMT_OFFSET ,getpid (), (uint64_t )split_addr, + (uint64_t )split_addr + pagesize, order, offset); + +/* set expected orders */ +for (i = order +1 ; i < pmd_order; i++) + orders[i] = times; + orders[order] =2 * times; + }for (i =0 ; i < fd_size; i++)if (*(addr + i) != (char )i) {@@ -492,6 +518,14 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, goto out; } + if (check_folio_orders(addr, fd_size, pagemap_fd, kpageflags_fd, orders, + NR_ORDERS)) { +ksft_print_msg ("Unexpected THP split\n" ); + err =1 ; + goto out; + } + +if (!check_huge_file (addr,0 , pmd_pagesize)) {ksft_print_msg ("Still FilePmdMapped not split\n" ); err =EXIT_FAILURE ;@@ -499,6 +533,7 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc, } out: +free (orders);munmap (addr, fd_size);close (fd);unlink (testfile);@@ -522,7 +557,6 @@ int main(int argc, char **argv)const char *fs_loc;bool created_tmp;int offset; -unsigned int max_order;unsigned int nr_pages;unsigned int tests; @@ -539,6 +573,7 @@ int main(int argc, char **argv)pagesize = getpagesize(); pageshift = ffs(pagesize) - 1; pmd_pagesize = read_pmd_pagesize();tools/testing/selftests/mm/split_huge_page_test.c int main(int argc, char **argv) · line 576
Quoted 1 line
tools/testing/selftests/mm/split_huge_page_test.c +1
-0+ pmd_order =GET_ORDER (pmd_pagesize / pagesize);I think
max_orderis also same aspmd_order
Quoted 4 lines
nr_pages=pmd_pagesize/ pagesize;
max_order=GET_ORDER(nr_pages);Can we use one?
Sure. Will rename max_order to pmd_order. Thanks.
Quoted 16 lines
Quoted 16 lines
if (!pmd_pagesize)
ksft_exit_fail_msg("Reading PMD pagesize failed\n");
@@ -547,6 +582,14 @@ intmain(int argc, char **argv)
tests = 2 + (max_order- 1) + (2 *max_order) + (max_order- 1) * 4 + 2;ksft_set_plan(tests);
+pagemap_fd=open(pagemap_proc, O_RDONLY);tools/testing/selftests/mm/split_huge_page_test.c +7
-0+if (pagemap_fd ==-1 ) +ksft_exit_fail_msg ("read pagemap: %s\n" ,strerror (errno)); + + kpageflags_fd =open (kpageflags_proc,O_RDONLY ); +if (kpageflags_fd ==-1 ) +ksft_exit_fail_msg ("read kpageflags: %s\n" ,strerror (errno)); + fd_size =2 * pmd_pagesize;split_pmd_zero_pages ();
Quoted 8 lines
tools/testing/selftests/mm/split_huge_page_test.c int main(int argc, char **argv) · line 620
Quoted 8 lines
tools/testing/selftests/mm/split_huge_page_test.c +2
-0@@ -571,6 +614,9 @@ int main(int argc, char **argv)split_thp_in_pagecache_to_order_at (fd_size, fs_loc, i, offset);cleanup_thp_fs (fs_loc, created_tmp); +close (pagemap_fd); +close (kpageflags_fd); +ksft_finished ();return 0 ;
Best Regards,
Yan, Zi