memblock tests: update tests to check if memblock_alloc zeroed memory

Add an assert in memblock_alloc() tests where allocation is expected to
occur. The assert checks whether the entire chunk of allocated memory is
cleared.

The current memblock_alloc() tests do not check whether the allocated
memory was zeroed. memblock_alloc() should zero the allocated memory since
it is a wrapper for memblock_alloc_try_nid().

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

diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c
index a14f38eb8a89042dfe5c21f459aab5d2c01281a3..c97da91a98d66c6947813312d05a5c786b4d82db 100644 (file)
--- a/tools/testing/memblock/tests/alloc_api.c
+++ b/tools/testing/memblock/tests/alloc_api.c
@@ -22,6 +22,8 @@ static int alloc_top_down_simple_check(void)
        allocated_ptr = memblock_alloc(size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, size);
+
        ASSERT_EQ(rgn->size, size);
        ASSERT_EQ(rgn->base, expected_start);
 
@@ -80,6 +82,8 @@ static int alloc_top_down_disjoint_check(void)
        allocated_ptr = memblock_alloc(r2_size, alignment);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r2_size);
+
        ASSERT_EQ(rgn1->size, r1.size);
        ASSERT_EQ(rgn1->base, r1.base);
 
@@ -125,6 +129,8 @@ static int alloc_top_down_before_check(void)
        allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r2_size);
+
        ASSERT_EQ(rgn->size, total_size);
        ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size);
 
@@ -173,6 +179,8 @@ static int alloc_top_down_after_check(void)
        allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r2_size);
+
        ASSERT_EQ(rgn->size, total_size);
        ASSERT_EQ(rgn->base, r1.base - r2_size);
 
@@ -223,6 +231,8 @@ static int alloc_top_down_second_fit_check(void)
        allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r3_size);
+
        ASSERT_EQ(rgn->size, r2.size + r3_size);
        ASSERT_EQ(rgn->base, r2.base - r3_size);
 
@@ -277,6 +287,8 @@ static int alloc_in_between_generic_check(void)
        allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r3_size);
+
        ASSERT_EQ(rgn->size, total_size);
        ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size);
 
@@ -418,6 +430,8 @@ static int alloc_limited_space_generic_check(void)
        allocated_ptr = memblock_alloc(available_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, available_size);
+
        ASSERT_EQ(rgn->size, MEM_SIZE);
        ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
 
@@ -472,6 +486,8 @@ static int alloc_bottom_up_simple_check(void)
        allocated_ptr = memblock_alloc(SZ_2, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, SZ_2);
+
        ASSERT_EQ(rgn->size, SZ_2);
        ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
 
@@ -528,6 +544,7 @@ static int alloc_bottom_up_disjoint_check(void)
        allocated_ptr = memblock_alloc(r2_size, alignment);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r2_size);
 
        ASSERT_EQ(rgn1->size, r1.size);
        ASSERT_EQ(rgn1->base, r1.base);
@@ -571,6 +588,8 @@ static int alloc_bottom_up_before_check(void)
        allocated_ptr = memblock_alloc(r1_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r1_size);
+
        ASSERT_EQ(rgn->size, total_size);
        ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
 
@@ -618,6 +637,8 @@ static int alloc_bottom_up_after_check(void)
        allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r2_size);
+
        ASSERT_EQ(rgn->size, total_size);
        ASSERT_EQ(rgn->base, r1.base);
 
@@ -669,6 +690,8 @@ static int alloc_bottom_up_second_fit_check(void)
        allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);
 
        ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_EQ(allocated_ptr, 0, r3_size);
+
        ASSERT_EQ(rgn->size, r2.size + r3_size);
        ASSERT_EQ(rgn->base, r2.base);
 

diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock/tests/common.c
index 76a8ad818f3a76422a312422e513977e23c6094a..eec6901081af36ed72a426dbe4d3ae83d75bff75 100644 (file)
--- a/tools/testing/memblock/tests/common.c
+++ b/tools/testing/memblock/tests/common.c
@@ -60,16 +60,23 @@ void reset_memblock_attributes(void)
        memblock.current_limit  = MEMBLOCK_ALLOC_ANYWHERE;
 }
 
+static inline void fill_memblock(void)
+{
+       memset(memory_block.base, 1, MEM_SIZE);
+}
+
 void setup_memblock(void)
 {
        reset_memblock_regions();
        memblock_add((phys_addr_t)memory_block.base, MEM_SIZE);
+       fill_memblock();
 }
 
 void dummy_physical_memory_init(void)
 {
        memory_block.base = malloc(MEM_SIZE);
        assert(memory_block.base);
+       fill_memblock();
 }
 
 void dummy_physical_memory_cleanup(void)

diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h
index d396e5423a8e110f04b050e1e788d0dd308e7ad3..93e559780890ed591761d034c291d243b5cae171 100644 (file)
--- a/tools/testing/memblock/tests/common.h
+++ b/tools/testing/memblock/tests/common.h
@@ -51,6 +51,18 @@
        assert((_expected) < (_seen)); \
 } while (0)
 
+/**
+ * ASSERT_MEM_EQ():
+ * Check that the first @_size bytes of @_seen are all equal to @_expected.
+ * If false, print failed test message (if running with --verbose) and then
+ * assert.
+ */
+#define ASSERT_MEM_EQ(_seen, _expected, _size) do { \
+       for (int _i = 0; _i < (_size); _i++) { \
+               ASSERT_EQ(((char *)_seen)[_i], (_expected)); \
+       } \
+} while (0)
+
 #define PREFIX_PUSH() prefix_push(__func__)
 
 /*