selftests/mm: khugepaged: skip swap tests when no swap available
Subsystems (4)
PATCH 1/1 selftests/mm: khugepaged: skip swap tests when no swap available
When no swap is configured, swap-related tests fail because madvise(MADV_PAGEOUT) does not swap out pages. Add a helper function to detect swap availability and skip these tests.
--- tools/testing/selftests/mm/khugepaged.c | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
tools/testing/selftests/mm/khugepaged.c +33 -0
@@ -216,6 +216,25 @@ static bool check_swap(void *addr, unsigned long size)return swap; } +static bool is_swap_available (unsigned long size) +{ +unsigned long swap_total =0 ; +char buffer[256 ]; +FILE *fp; + + fp =fopen ("/proc/meminfo" ,"r" ); +if (!fp) +return false; + +while (fgets (buffer,sizeof (buffer), fp)) { +if (sscanf (buffer,"SwapTotal: %lu kB" , &swap_total) ==1 ) +break ; + } +fclose (fp); + +return swap_total >= (size /1024 ); +} +static void *alloc_mapping (int nr) {void *p;
@@ -734,6 +753,13 @@ static void collapse_swapin_single_pte(struct collapse_context *c, struct mem_op {void *p; +if (!is_swap_available (page_size)) { +ksft_print_msg ("No swap available..." ); +skip ("Skip" ); +ksft_test_result_skip ("%s\n" , __func__); +return ; + } + p = ops->setup_area (1 ); ops->fault (p,0 , hpage_pmd_size);
@@ -760,6 +786,13 @@ static void collapse_max_ptes_swap(struct collapse_context *c, struct mem_ops *oint max_ptes_swap =thp_read_num ("khugepaged/max_ptes_swap" );void *p; +if (!is_swap_available ((max_ptes_swap +1 ) * page_size)) { +ksft_print_msg ("No swap available..." ); +skip ("Skip" ); +ksft_test_result_skip ("%s\n" , __func__); +return ; + } + p = ops->setup_area (1 ); ops->fault (p,0 , hpage_pmd_size);
Signature · 1 line
2.55.0
David Hildenbrand (Arm)
maintainerQuoted 3 lines · Alexander Gordeev
When no swap is configured, swap-related tests fail because
madvise(MADV_PAGEOUT)does not swap out pages. Add a helper function to detect swap availability and skip these tests.
You should mention what the effect of that is.
Quoted 54 lines
Signed-off-by Alexander Gordeev <[email protected]>--- tools/testing/selftests/mm/khugepaged.c | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+)tools/testing/selftests/mm/khugepaged.c +26
-0@@ -216,6 +216,25 @@ static bool check_swap(void *addr, unsigned long size)return swap; } +static bool is_swap_available (unsigned long size) +{ +unsigned long swap_total =0 ; +char buffer[256 ]; +FILE *fp; + + fp =fopen ("/proc/meminfo" ,"r" ); +if (!fp) +return false; + +while (fgets (buffer,sizeof (buffer), fp)) { +if (sscanf (buffer,"SwapTotal: %lu kB" , &swap_total) ==1 ) +break ; + } +fclose (fp); + +return swap_total >= (size /1024 ); +} +static void *alloc_mapping (int nr) {void *p;@@ -734,6 +753,13 @@ static void collapse_swapin_single_pte(struct collapse_context *c, struct mem_op {void *p; +if (!is_swap_available (page_size)) { +ksft_print_msg ("No swap available..." ); +skip ("Skip" ); +ksft_test_result_skip ("%s\n" , __func__); +return ; + } + p = ops->setup_area (1 ); ops->fault (p,0 , hpage_pmd_size);@@ -760,6 +786,13 @@ static void collapse_max_ptes_swap(struct collapse_context *c, struct mem_ops *oint max_ptes_swap =thp_read_num ("khugepaged/max_ptes_swap" );void *p;
tools/testing/selftests/mm/khugepaged.c static void collapse_max_ptes_swap(struct collapse_context *c, struct mem_ops *o · line 798
Quoted 10 lines
tools/testing/selftests/mm/khugepaged.c +7
-0+if (!is_swap_available ((max_ptes_swap +1 ) * page_size)) { +ksft_print_msg ("No swap available..." ); +skip ("Skip" ); +ksft_test_result_skip ("%s\n" , __func__); +return ; + } + p = ops->setup_area (1 ); ops->fault (p,0 , hpage_pmd_size);
See
https://lore.kernel.org/all/[email protected]/
where I raise that we should rather handle the actual MADV_PAGEOUT errors, because there can be other reasons why MADV_PAGEOUT just fails.
Signature · 3 lines
Cheers, David