memblock tests: add labels to verbose output for generic alloc tests

Generic tests for memblock_alloc*() functions do not use separate
functions for testing top-down and bottom-up allocation directions.
Therefore, the function name that is displayed in the verbose testing
output does not include the allocation direction.

Add an additional prefix when running generic tests for
memblock_alloc*() functions that indicates which allocation direction is
set. The prefix will be displayed when the tests are run in verbose mode.

Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Shaoqin Huang <shaoqin.huang@intel.com>
Signed-off-by: Rebecca Mckeever <remckee0@gmail.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Link: https://lore.kernel.org/r/fb76a42253d2a196a7daea29dd8121a69904f58e.1661578349.git.remckee0@gmail.com

diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c
index c97da91a98d66c6947813312d05a5c786b4d82db..de3405634f8a6f4146e30666d823d58dd627eeeb 100644 (file)
--- a/tools/testing/memblock/tests/alloc_api.c
+++ b/tools/testing/memblock/tests/alloc_api.c
@@ -751,10 +751,8 @@ static int alloc_after_check(void)
 static int alloc_in_between_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_in_between_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_in_between_generic_check();
+       run_top_down(alloc_in_between_generic_check);
+       run_bottom_up(alloc_in_between_generic_check);
 
        return 0;
 }
@@ -773,10 +771,8 @@ static int alloc_second_fit_check(void)
 static int alloc_small_gaps_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_small_gaps_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_small_gaps_generic_check();
+       run_top_down(alloc_small_gaps_generic_check);
+       run_bottom_up(alloc_small_gaps_generic_check);
 
        return 0;
 }
@@ -784,10 +780,8 @@ static int alloc_small_gaps_check(void)
 static int alloc_all_reserved_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_all_reserved_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_all_reserved_generic_check();
+       run_top_down(alloc_all_reserved_generic_check);
+       run_bottom_up(alloc_all_reserved_generic_check);
 
        return 0;
 }
@@ -795,10 +789,8 @@ static int alloc_all_reserved_check(void)
 static int alloc_no_space_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_no_space_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_no_space_generic_check();
+       run_top_down(alloc_no_space_generic_check);
+       run_bottom_up(alloc_no_space_generic_check);
 
        return 0;
 }
@@ -806,10 +798,8 @@ static int alloc_no_space_check(void)
 static int alloc_limited_space_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_limited_space_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_limited_space_generic_check();
+       run_top_down(alloc_limited_space_generic_check);
+       run_bottom_up(alloc_limited_space_generic_check);
 
        return 0;
 }
@@ -817,10 +807,8 @@ static int alloc_limited_space_check(void)
 static int alloc_no_memory_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_no_memory_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_no_memory_generic_check();
+       run_top_down(alloc_no_memory_generic_check);
+       run_bottom_up(alloc_no_memory_generic_check);
 
        return 0;
 }

diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c
index f1c7d6f170b62f3b4d3da4a8ad04019aad6eb6bf..06577bd0e349b30af8e2a05311dccd68d909457d 100644 (file)
--- a/tools/testing/memblock/tests/alloc_helpers_api.c
+++ b/tools/testing/memblock/tests/alloc_helpers_api.c
@@ -357,10 +357,8 @@ static int alloc_from_bottom_up_min_addr_cap_check(void)
 static int alloc_from_simple_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_from_simple_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_from_simple_generic_check();
+       run_top_down(alloc_from_simple_generic_check);
+       run_bottom_up(alloc_from_simple_generic_check);
 
        return 0;
 }
@@ -368,10 +366,8 @@ static int alloc_from_simple_check(void)
 static int alloc_from_misaligned_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_from_misaligned_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_from_misaligned_generic_check();
+       run_top_down(alloc_from_misaligned_generic_check);
+       run_bottom_up(alloc_from_misaligned_generic_check);
 
        return 0;
 }

diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c
index a069534c459e57dc3726c061acfac53d264e7317..9324d706ee3abd521a6e64d4a103ef8ecfa04025 100644 (file)
--- a/tools/testing/memblock/tests/alloc_nid_api.c
+++ b/tools/testing/memblock/tests/alloc_nid_api.c
@@ -1142,10 +1142,8 @@ static int alloc_try_nid_cap_min_check(void)
 static int alloc_try_nid_min_reserved_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_min_reserved_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_min_reserved_generic_check();
+       run_top_down(alloc_try_nid_min_reserved_generic_check);
+       run_bottom_up(alloc_try_nid_min_reserved_generic_check);
 
        return 0;
 }
@@ -1153,10 +1151,8 @@ static int alloc_try_nid_min_reserved_check(void)
 static int alloc_try_nid_max_reserved_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_max_reserved_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_max_reserved_generic_check();
+       run_top_down(alloc_try_nid_max_reserved_generic_check);
+       run_bottom_up(alloc_try_nid_max_reserved_generic_check);
 
        return 0;
 }
@@ -1164,10 +1160,8 @@ static int alloc_try_nid_max_reserved_check(void)
 static int alloc_try_nid_exact_address_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_exact_address_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_exact_address_generic_check();
+       run_top_down(alloc_try_nid_exact_address_generic_check);
+       run_bottom_up(alloc_try_nid_exact_address_generic_check);
 
        return 0;
 }
@@ -1175,10 +1169,8 @@ static int alloc_try_nid_exact_address_check(void)
 static int alloc_try_nid_reserved_full_merge_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_reserved_full_merge_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_reserved_full_merge_generic_check();
+       run_top_down(alloc_try_nid_reserved_full_merge_generic_check);
+       run_bottom_up(alloc_try_nid_reserved_full_merge_generic_check);
 
        return 0;
 }
@@ -1186,10 +1178,8 @@ static int alloc_try_nid_reserved_full_merge_check(void)
 static int alloc_try_nid_reserved_all_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_reserved_all_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_reserved_all_generic_check();
+       run_top_down(alloc_try_nid_reserved_all_generic_check);
+       run_bottom_up(alloc_try_nid_reserved_all_generic_check);
 
        return 0;
 }
@@ -1197,10 +1187,8 @@ static int alloc_try_nid_reserved_all_check(void)
 static int alloc_try_nid_low_max_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
-       memblock_set_bottom_up(false);
-       alloc_try_nid_low_max_generic_check();
-       memblock_set_bottom_up(true);
-       alloc_try_nid_low_max_generic_check();
+       run_top_down(alloc_try_nid_low_max_generic_check);
+       run_bottom_up(alloc_try_nid_low_max_generic_check);
 
        return 0;
 }

diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h
index 93e559780890ed591761d034c291d243b5cae171..c53f9c365714cae753742d1198d405c5107864a0 100644 (file)
--- a/tools/testing/memblock/tests/common.h
+++ b/tools/testing/memblock/tests/common.h
@@ -100,4 +100,20 @@ static inline void test_pass_pop(void)
        prefix_pop();
 }
 
+static inline void run_top_down(int (*func)())
+{
+       memblock_set_bottom_up(false);
+       prefix_push("top-down");
+       func();
+       prefix_pop();
+}
+
+static inline void run_bottom_up(int (*func)())
+{
+       memblock_set_bottom_up(true);
+       prefix_push("bottom-up");
+       func();
+       prefix_pop();
+}
+
 #endif