mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 23:03:57 -04:00
memblock tests: add verbose output to memblock tests
Add and use functions and macros for printing verbose testing output. If the Memblock simulator was compiled with VERBOSE=1: - prefix_push(): appends the given string to a prefix string that will be printed in test_fail() and test_pass*(). - prefix_pop(): removes the last prefix from the prefix string. - prefix_reset(): clears the prefix string. - test_fail(): prints a message after a test fails containing the test number of the failing test and the prefix. - test_pass(): prints a message after a test passes containing its test number and the prefix. - test_print(): prints the given formatted output string. - test_pass_pop(): runs test_pass() followed by prefix_pop(). - PREFIX_PUSH(): runs prefix_push(__func__). If the Memblock simulator was not compiled with VERBOSE=1, these functions/macros do nothing. Add the assert wrapper macros ASSERT_EQ(), ASSERT_NE(), and ASSERT_LT(). If the assert condition fails, these macros call test_fail() before executing assert(). Acked-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/f234d443fe154d5ae8d8aa07284aff69edfb6f61.1656907314.git.remckee0@gmail.com
This commit is contained in:
committed by
Mike Rapoport
parent
946dccb35d
commit
76586c00e7
@@ -21,6 +21,8 @@ static int alloc_from_simple_generic_check(void)
|
||||
void *allocated_ptr = NULL;
|
||||
char *b;
|
||||
|
||||
PREFIX_PUSH();
|
||||
|
||||
phys_addr_t size = SZ_16;
|
||||
phys_addr_t min_addr;
|
||||
|
||||
@@ -31,14 +33,16 @@ static int alloc_from_simple_generic_check(void)
|
||||
allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);
|
||||
b = (char *)allocated_ptr;
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(*b == 0);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(*b, 0);
|
||||
|
||||
assert(rgn->size == size);
|
||||
assert(rgn->base == min_addr);
|
||||
ASSERT_EQ(rgn->size, size);
|
||||
ASSERT_EQ(rgn->base, min_addr);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -64,6 +68,8 @@ static int alloc_from_misaligned_generic_check(void)
|
||||
void *allocated_ptr = NULL;
|
||||
char *b;
|
||||
|
||||
PREFIX_PUSH();
|
||||
|
||||
phys_addr_t size = SZ_32;
|
||||
phys_addr_t min_addr;
|
||||
|
||||
@@ -75,14 +81,16 @@ static int alloc_from_misaligned_generic_check(void)
|
||||
allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);
|
||||
b = (char *)allocated_ptr;
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(*b == 0);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(*b, 0);
|
||||
|
||||
assert(rgn->size == size);
|
||||
assert(rgn->base == memblock_end_of_DRAM() - SMP_CACHE_BYTES);
|
||||
ASSERT_EQ(rgn->size, size);
|
||||
ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -110,6 +118,8 @@ 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;
|
||||
|
||||
@@ -120,12 +130,14 @@ static int alloc_from_top_down_high_addr_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->size == size);
|
||||
assert(rgn->base == memblock_end_of_DRAM() - SMP_CACHE_BYTES);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->size, size);
|
||||
ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -151,6 +163,8 @@ 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;
|
||||
@@ -165,12 +179,14 @@ static int alloc_from_top_down_no_space_above_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->base == min_addr - r1_size);
|
||||
assert(rgn->size == total_size);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->base, min_addr - r1_size);
|
||||
ASSERT_EQ(rgn->size, total_size);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == total_size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, total_size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -186,6 +202,8 @@ 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;
|
||||
@@ -199,12 +217,14 @@ static int alloc_from_top_down_min_addr_cap_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->base == start_addr);
|
||||
assert(rgn->size == MEM_SIZE);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->base, start_addr);
|
||||
ASSERT_EQ(rgn->size, MEM_SIZE);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == MEM_SIZE);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, MEM_SIZE);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -230,6 +250,8 @@ 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;
|
||||
|
||||
@@ -240,12 +262,14 @@ static int alloc_from_bottom_up_high_addr_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->size == size);
|
||||
assert(rgn->base == memblock_start_of_DRAM());
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->size, size);
|
||||
ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -270,6 +294,8 @@ 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;
|
||||
@@ -284,12 +310,14 @@ static int alloc_from_bottom_up_no_space_above_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->base == memblock_start_of_DRAM());
|
||||
assert(rgn->size == r1_size);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
|
||||
ASSERT_EQ(rgn->size, r1_size);
|
||||
|
||||
assert(memblock.reserved.cnt == 2);
|
||||
assert(memblock.reserved.total_size == r1_size + r2_size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 2);
|
||||
ASSERT_EQ(memblock.reserved.total_size, r1_size + r2_size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -304,6 +332,8 @@ 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;
|
||||
@@ -315,12 +345,14 @@ static int alloc_from_bottom_up_min_addr_cap_check(void)
|
||||
|
||||
allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);
|
||||
|
||||
assert(allocated_ptr);
|
||||
assert(rgn->base == start_addr);
|
||||
assert(rgn->size == r1_size);
|
||||
ASSERT_NE(allocated_ptr, NULL);
|
||||
ASSERT_EQ(rgn->base, start_addr);
|
||||
ASSERT_EQ(rgn->size, r1_size);
|
||||
|
||||
assert(memblock.reserved.cnt == 1);
|
||||
assert(memblock.reserved.total_size == r1_size);
|
||||
ASSERT_EQ(memblock.reserved.cnt, 1);
|
||||
ASSERT_EQ(memblock.reserved.total_size, r1_size);
|
||||
|
||||
test_pass_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -328,6 +360,7 @@ static int alloc_from_bottom_up_min_addr_cap_check(void)
|
||||
/* Test case wrappers */
|
||||
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);
|
||||
@@ -338,6 +371,7 @@ 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);
|
||||
@@ -348,6 +382,7 @@ static int alloc_from_misaligned_check(void)
|
||||
|
||||
static int alloc_from_high_addr_check(void)
|
||||
{
|
||||
test_print("\tRunning %s...\n", __func__);
|
||||
memblock_set_bottom_up(false);
|
||||
alloc_from_top_down_high_addr_check();
|
||||
memblock_set_bottom_up(true);
|
||||
@@ -358,6 +393,7 @@ static int alloc_from_high_addr_check(void)
|
||||
|
||||
static int alloc_from_no_space_above_check(void)
|
||||
{
|
||||
test_print("\tRunning %s...\n", __func__);
|
||||
memblock_set_bottom_up(false);
|
||||
alloc_from_top_down_no_space_above_check();
|
||||
memblock_set_bottom_up(true);
|
||||
@@ -368,6 +404,7 @@ static int alloc_from_no_space_above_check(void)
|
||||
|
||||
static int alloc_from_min_addr_cap_check(void)
|
||||
{
|
||||
test_print("\tRunning %s...\n", __func__);
|
||||
memblock_set_bottom_up(false);
|
||||
alloc_from_top_down_min_addr_cap_check();
|
||||
memblock_set_bottom_up(true);
|
||||
@@ -378,6 +415,12 @@ static int alloc_from_min_addr_cap_check(void)
|
||||
|
||||
int memblock_alloc_helpers_checks(void)
|
||||
{
|
||||
const char *func_testing = "memblock_alloc_from";
|
||||
|
||||
prefix_reset();
|
||||
prefix_push(func_testing);
|
||||
test_print("Running %s tests...\n", func_testing);
|
||||
|
||||
reset_memblock_attributes();
|
||||
dummy_physical_memory_init();
|
||||
|
||||
@@ -389,5 +432,7 @@ int memblock_alloc_helpers_checks(void)
|
||||
|
||||
dummy_physical_memory_cleanup();
|
||||
|
||||
prefix_pop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user