memblock_tests: move variable declarations to single block

Move variable declarations to a single block at the beginning of each
testing function.

Signed-off-by: Rebecca Mckeever <remckee0@gmail.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Link: https://lore.kernel.org/r/e61431e73977f305fdd027bca99d1dc119e96d84.1662264355.git.remckee0@gmail.com

diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c
index 36dd7e254cce9f2983ec6d332eadb70921ea9795..68f1a75cd72c440d7a8a5301fc100e451605f7e7 100644 (file)
--- a/tools/testing/memblock/tests/alloc_api.c
+++ b/tools/testing/memblock/tests/alloc_api.c
@@ -25,12 +25,10 @@ static int alloc_top_down_simple_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_2;
        phys_addr_t expected_start;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        expected_start = memblock_end_of_DRAM() - SMP_CACHE_BYTES;
@@ -76,15 +74,13 @@ static int alloc_top_down_disjoint_check(void)
        struct memblock_region *rgn2 = &memblock.reserved.regions[0];
        struct region r1;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r2_size = SZ_16;
        /* Use custom alignment */
        phys_addr_t alignment = SMP_CACHE_BYTES * 2;
        phys_addr_t total_size;
        phys_addr_t expected_start;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SZ_2;
@@ -128,9 +124,6 @@ static int alloc_top_down_before_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        /*
         * The first region ends at the aligned address to test region merging
         */
@@ -138,6 +131,7 @@ static int alloc_top_down_before_check(void)
        phys_addr_t r2_size = SZ_512;
        phys_addr_t total_size = r1_size + r2_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size);
@@ -174,12 +168,10 @@ static int alloc_top_down_after_check(void)
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        struct region r1;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r2_size = SZ_512;
        phys_addr_t total_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /*
@@ -225,12 +217,10 @@ static int alloc_top_down_second_fit_check(void)
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        struct region r1, r2;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_1K;
        phys_addr_t total_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SZ_512;
@@ -276,9 +266,6 @@ static int alloc_in_between_generic_check(void)
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        struct region r1, r2;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t r3_size = SZ_64;
        /*
@@ -287,6 +274,7 @@ static int alloc_in_between_generic_check(void)
        phys_addr_t rgn_size = (MEM_SIZE - (2 * gap_size + r3_size)) / 2;
        phys_addr_t total_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.size = rgn_size;
@@ -332,13 +320,11 @@ static int alloc_in_between_generic_check(void)
 static int alloc_small_gaps_generic_check(void)
 {
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t region_size = SZ_1K;
        phys_addr_t gap_size = SZ_256;
        phys_addr_t region_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        region_end = memblock_start_of_DRAM();
@@ -366,7 +352,6 @@ static int alloc_all_reserved_generic_check(void)
        void *allocated_ptr = NULL;
 
        PREFIX_PUSH();
-
        setup_memblock();
 
        /* Simulate full memory */
@@ -397,14 +382,12 @@ static int alloc_all_reserved_generic_check(void)
 static int alloc_no_space_generic_check(void)
 {
        void *allocated_ptr = NULL;
+       phys_addr_t available_size = SZ_256;
+       phys_addr_t reserved_size = MEM_SIZE - available_size;
 
        PREFIX_PUSH();
-
        setup_memblock();
 
-       phys_addr_t available_size = SZ_256;
-       phys_addr_t reserved_size = MEM_SIZE - available_size;
-
        /* Simulate almost-full memory */
        memblock_reserve(memblock_start_of_DRAM(), reserved_size);
 
@@ -432,12 +415,10 @@ static int alloc_limited_space_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t available_size = SZ_256;
        phys_addr_t reserved_size = MEM_SIZE - available_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /* Simulate almost-full memory */
@@ -504,7 +485,6 @@ static int alloc_too_large_generic_check(void)
        void *allocated_ptr = NULL;
 
        PREFIX_PUSH();
-
        setup_memblock();
 
        allocated_ptr = run_memblock_alloc(MEM_SIZE + SZ_2, SMP_CACHE_BYTES);
@@ -530,7 +510,6 @@ static int alloc_bottom_up_simple_check(void)
        void *allocated_ptr = NULL;
 
        PREFIX_PUSH();
-
        setup_memblock();
 
        allocated_ptr = run_memblock_alloc(SZ_2, SMP_CACHE_BYTES);
@@ -572,15 +551,13 @@ static int alloc_bottom_up_disjoint_check(void)
        struct memblock_region *rgn2 = &memblock.reserved.regions[1];
        struct region r1;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r2_size = SZ_16;
        /* Use custom alignment */
        phys_addr_t alignment = SMP_CACHE_BYTES * 2;
        phys_addr_t total_size;
        phys_addr_t expected_start;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_start_of_DRAM() + SZ_2;
@@ -624,13 +601,11 @@ static int alloc_bottom_up_before_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_512;
        phys_addr_t r2_size = SZ_128;
        phys_addr_t total_size = r1_size + r2_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size);
@@ -666,12 +641,10 @@ static int alloc_bottom_up_after_check(void)
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        struct region r1;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r2_size = SZ_512;
        phys_addr_t total_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /*
@@ -718,12 +691,10 @@ static int alloc_bottom_up_second_fit_check(void)
        struct memblock_region *rgn  = &memblock.reserved.regions[1];
        struct region r1, r2;
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_1K;
        phys_addr_t total_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_start_of_DRAM();

diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c
index 06577bd0e349b30af8e2a05311dccd68d909457d..3ef9486da8a09350422634ceaafeb8b687c7757e 100644 (file)
--- a/tools/testing/memblock/tests/alloc_helpers_api.c
+++ b/tools/testing/memblock/tests/alloc_helpers_api.c
@@ -19,12 +19,10 @@ static int alloc_from_simple_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_16;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_end_of_DRAM() - SMP_CACHE_BYTES;
@@ -64,12 +62,10 @@ static int alloc_from_misaligned_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_32;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /* A misaligned address */
@@ -113,12 +109,10 @@ static int alloc_from_top_down_high_addr_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_32;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /* The address is too close to the end of the memory */
@@ -158,14 +152,12 @@ static int alloc_from_top_down_no_space_above_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_64;
        phys_addr_t r2_size = SZ_2;
        phys_addr_t total_size = r1_size + r2_size;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -197,13 +189,11 @@ static int alloc_from_top_down_min_addr_cap_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_64;
        phys_addr_t min_addr;
        phys_addr_t start_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        start_addr = (phys_addr_t)memblock_start_of_DRAM();
@@ -245,12 +235,10 @@ static int alloc_from_bottom_up_high_addr_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_32;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        /* The address is too close to the end of the memory */
@@ -289,13 +277,11 @@ static int alloc_from_bottom_up_no_space_above_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_64;
        phys_addr_t min_addr;
        phys_addr_t r2_size;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SZ_128;
@@ -327,13 +313,11 @@ static int alloc_from_bottom_up_min_addr_cap_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_64;
        phys_addr_t min_addr;
        phys_addr_t start_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        start_addr = (phys_addr_t)memblock_start_of_DRAM();

diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c
index d89741dd3d4641d49ff84b892f637acadb232795..db5daa50fa72e045ba21f8bc38960a044567e8c5 100644 (file)
--- a/tools/testing/memblock/tests/alloc_nid_api.c
+++ b/tools/testing/memblock/tests/alloc_nid_api.c
@@ -39,14 +39,12 @@ static int alloc_try_nid_top_down_simple_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_128;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
        phys_addr_t rgn_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2;
@@ -93,15 +91,13 @@ static int alloc_try_nid_top_down_end_misaligned_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_128;
        phys_addr_t misalign = SZ_2;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
        phys_addr_t rgn_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2;
@@ -146,14 +142,12 @@ static int alloc_try_nid_exact_address_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_1K;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
        phys_addr_t rgn_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES;
@@ -200,13 +194,11 @@ static int alloc_try_nid_top_down_narrow_range_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_256;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SZ_512;
@@ -253,13 +245,11 @@ static int alloc_try_nid_top_down_narrow_range_check(void)
 static int alloc_try_nid_low_max_generic_check(void)
 {
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_1K;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM();
@@ -294,9 +284,6 @@ static int alloc_try_nid_min_reserved_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_128;
        phys_addr_t r2_size = SZ_64;
        phys_addr_t total_size = r1_size + r2_size;
@@ -304,6 +291,7 @@ static int alloc_try_nid_min_reserved_generic_check(void)
        phys_addr_t max_addr;
        phys_addr_t reserved_base;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        max_addr = memblock_end_of_DRAM();
@@ -348,15 +336,13 @@ static int alloc_try_nid_max_reserved_generic_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t r1_size = SZ_64;
        phys_addr_t r2_size = SZ_128;
        phys_addr_t total_size = r1_size + r2_size;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        max_addr = memblock_end_of_DRAM() - r1_size;
@@ -405,15 +391,13 @@ static int alloc_try_nid_top_down_reserved_with_space_check(void)
        struct memblock_region *rgn2 = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_64;
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t total_size;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -471,14 +455,12 @@ static int alloc_try_nid_reserved_full_merge_generic_check(void)
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_64;
        phys_addr_t total_size;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -536,15 +518,13 @@ static int alloc_try_nid_top_down_reserved_no_space_check(void)
        struct memblock_region *rgn2 = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_256;
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t total_size;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -605,14 +585,12 @@ static int alloc_try_nid_reserved_all_generic_check(void)
 {
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_256;
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES;
@@ -647,13 +625,11 @@ static int alloc_try_nid_top_down_cap_max_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_256;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_end_of_DRAM() - SZ_1K;
@@ -686,13 +662,11 @@ static int alloc_try_nid_top_down_cap_min_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_1K;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() - SZ_256;
@@ -734,14 +708,12 @@ static int alloc_try_nid_bottom_up_simple_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_128;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
        phys_addr_t rgn_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2;
@@ -788,15 +760,13 @@ static int alloc_try_nid_bottom_up_start_misaligned_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_128;
        phys_addr_t misalign = SZ_2;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
        phys_addr_t rgn_end;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + misalign;
@@ -843,13 +813,11 @@ static int alloc_try_nid_bottom_up_narrow_range_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_256;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SZ_512;
@@ -896,15 +864,13 @@ static int alloc_try_nid_bottom_up_reserved_with_space_check(void)
        struct memblock_region *rgn2 = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_64;
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t total_size;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -968,15 +934,13 @@ static int alloc_try_nid_bottom_up_reserved_no_space_check(void)
        struct memblock_region *rgn3 = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
        struct region r1, r2;
-
-       PREFIX_PUSH();
-
        phys_addr_t r3_size = SZ_256;
        phys_addr_t gap_size = SMP_CACHE_BYTES;
        phys_addr_t total_size;
        phys_addr_t max_addr;
        phys_addr_t min_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        r1.base = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;
@@ -1025,13 +989,11 @@ static int alloc_try_nid_bottom_up_cap_max_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_256;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM() + SZ_1K;
@@ -1064,13 +1026,11 @@ static int alloc_try_nid_bottom_up_cap_min_check(void)
 {
        struct memblock_region *rgn = &memblock.reserved.regions[0];
        void *allocated_ptr = NULL;
-
-       PREFIX_PUSH();
-
        phys_addr_t size = SZ_1K;
        phys_addr_t min_addr;
        phys_addr_t max_addr;
 
+       PREFIX_PUSH();
        setup_memblock();
 
        min_addr = memblock_start_of_DRAM();