Messages in this thread | | | Date | Thu, 18 Aug 2022 23:22:47 -0700 | From | Rebecca Mckeever <> | Subject | Re: [PATCH 6/8] memblock tests: update alloc_nid_api to test memblock_alloc_try_nid_raw |
| |
On Tue, Aug 16, 2022 at 09:24:53AM +0800, Huang, Shaoqin wrote: > > > On 8/14/2022 1:53 PM, Rebecca Mckeever wrote: > > Update memblock_alloc_try_nid() tests so that they test either > > memblock_alloc_try_nid() or memblock_alloc_try_nid_raw() depending on the > > value of alloc_nid_test_flags. Run through all the existing tests in > > alloc_nid_api twice: once for memblock_alloc_try_nid() and once for > > memblock_alloc_try_nid_raw(). > > > > When the tests run memblock_alloc_try_nid(), they test that the entire > > memory region is zero. When the tests run memblock_alloc_try_nid_raw(), > > they test that the entire memory region is nonzero. > > > > Signed-off-by: Rebecca Mckeever <remckee0@gmail.com> > > --- > > tools/testing/memblock/tests/alloc_nid_api.c | 196 ++++++++++++------- > > 1 file changed, 127 insertions(+), 69 deletions(-) > > > > diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c > > index 82fa8ea36320..e16106d8446b 100644 > > --- a/tools/testing/memblock/tests/alloc_nid_api.c > > +++ b/tools/testing/memblock/tests/alloc_nid_api.c > > @@ -1,6 +1,42 @@ > > // SPDX-License-Identifier: GPL-2.0-or-later > > #include "alloc_nid_api.h" > > +static const char * const func_testing[] = { > > + "memblock_alloc_try_nid", > > + "memblock_alloc_try_nid_raw" > > +}; > > + > > +static int alloc_nid_test_flags = TEST_ZEROED; > > + > > +static inline const char * const get_func_testing(int flags) > > +{ > > + if (flags & TEST_RAW) > > + return func_testing[1]; > > + else > > + return func_testing[0]; > > +} > > + > > +static inline void *run_memblock_alloc_try_nid(phys_addr_t size, > > + phys_addr_t align, > > + phys_addr_t min_addr, > > + phys_addr_t max_addr, int nid) > > +{ > > + if (alloc_nid_test_flags & TEST_RAW) > > + return memblock_alloc_try_nid_raw(size, align, min_addr, > > + max_addr, nid); > > + else > > + return memblock_alloc_try_nid(size, align, min_addr, > > + max_addr, nid); > > +} > > + > > +static inline void verify_mem_content(void *mem, int size) > > +{ > > + if (alloc_nid_test_flags & TEST_RAW) > > + ASSERT_MEM_NE((char *)mem, 0, size); > > + else > > + ASSERT_MEM_EQ((char *)mem, 0, size); > > +} > > + > > These static functions seems the same with the PATCH5 did, have you > considered to keep only one common function? > I considered it. The function will need to have a flags parameter added to it if the definition is moved to common.h. I will make this change.
> > /* > > * A simple test that tries to allocate a memory region within min_addr and > > * max_addr range: > > @@ -32,12 +68,13 @@ static int alloc_try_nid_top_down_simple_check(void) > > min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; > > max_addr = min_addr + SZ_512; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > rgn_end = rgn->base + rgn->size; > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, max_addr - size); > > @@ -86,12 +123,13 @@ static int alloc_try_nid_top_down_end_misaligned_check(void) > > min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; > > max_addr = min_addr + SZ_512 + misalign; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > rgn_end = rgn->base + rgn->size; > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, max_addr - size - misalign); > > @@ -137,12 +175,13 @@ static int alloc_try_nid_exact_address_generic_check(void) > > min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES; > > max_addr = min_addr + size; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > rgn_end = rgn->base + rgn->size; > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, min_addr); > > @@ -189,11 +228,12 @@ static int alloc_try_nid_top_down_narrow_range_check(void) > > min_addr = memblock_start_of_DRAM() + SZ_512; > > max_addr = min_addr + SMP_CACHE_BYTES; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, max_addr - size); > > @@ -241,8 +281,9 @@ static int alloc_try_nid_low_max_generic_check(void) > > min_addr = memblock_start_of_DRAM(); > > max_addr = min_addr + SMP_CACHE_BYTES; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_EQ(allocated_ptr, NULL); > > @@ -287,11 +328,12 @@ static int alloc_try_nid_min_reserved_generic_check(void) > > memblock_reserve(reserved_base, r1_size); > > - allocated_ptr = memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); > > + verify_mem_content(allocated_ptr, r2_size); > > ASSERT_EQ(rgn->size, total_size); > > ASSERT_EQ(rgn->base, reserved_base); > > @@ -338,11 +380,12 @@ static int alloc_try_nid_max_reserved_generic_check(void) > > memblock_reserve(max_addr, r1_size); > > - allocated_ptr = memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); > > + verify_mem_content(allocated_ptr, r2_size); > > ASSERT_EQ(rgn->size, total_size); > > ASSERT_EQ(rgn->base, min_addr); > > @@ -402,11 +445,12 @@ static int alloc_try_nid_top_down_reserved_with_space_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); > > + verify_mem_content(allocated_ptr, r3_size); > > ASSERT_EQ(rgn1->size, r1.size + r3_size); > > ASSERT_EQ(rgn1->base, max_addr - r3_size); > > @@ -466,11 +510,12 @@ static int alloc_try_nid_reserved_full_merge_generic_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); > > + verify_mem_content(allocated_ptr, r3_size); > > ASSERT_EQ(rgn->size, total_size); > > ASSERT_EQ(rgn->base, r2.base); > > @@ -531,11 +576,12 @@ static int alloc_try_nid_top_down_reserved_no_space_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); > > + verify_mem_content(allocated_ptr, r3_size); > > ASSERT_EQ(rgn1->size, r1.size); > > ASSERT_EQ(rgn1->base, r1.base); > > @@ -597,8 +643,9 @@ static int alloc_try_nid_reserved_all_generic_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_EQ(allocated_ptr, NULL); > > @@ -628,11 +675,12 @@ static int alloc_try_nid_top_down_cap_max_check(void) > > min_addr = memblock_end_of_DRAM() - SZ_1K; > > max_addr = memblock_end_of_DRAM() + SZ_256; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); > > @@ -666,11 +714,12 @@ static int alloc_try_nid_top_down_cap_min_check(void) > > min_addr = memblock_start_of_DRAM() - SZ_256; > > max_addr = memblock_end_of_DRAM(); > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); > > @@ -714,13 +763,13 @@ static int alloc_try_nid_bottom_up_simple_check(void) > > min_addr = memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; > > max_addr = min_addr + SZ_512; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > rgn_end = rgn->base + rgn->size; > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, min_addr); > > @@ -769,13 +818,13 @@ static int alloc_try_nid_bottom_up_start_misaligned_check(void) > > min_addr = memblock_start_of_DRAM() + misalign; > > max_addr = min_addr + SZ_512; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > rgn_end = rgn->base + rgn->size; > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, min_addr + (SMP_CACHE_BYTES - misalign)); > > @@ -822,12 +871,12 @@ static int alloc_try_nid_bottom_up_narrow_range_check(void) > > min_addr = memblock_start_of_DRAM() + SZ_512; > > max_addr = min_addr + SMP_CACHE_BYTES; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); > > @@ -887,12 +936,12 @@ static int alloc_try_nid_bottom_up_reserved_with_space_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); > > + verify_mem_content(allocated_ptr, r3_size); > > ASSERT_EQ(rgn1->size, r1.size); > > ASSERT_EQ(rgn1->base, max_addr); > > @@ -959,12 +1008,12 @@ static int alloc_try_nid_bottom_up_reserved_no_space_check(void) > > memblock_reserve(r1.base, r1.size); > > memblock_reserve(r2.base, r2.size); > > - allocated_ptr = memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); > > + verify_mem_content(allocated_ptr, r3_size); > > ASSERT_EQ(rgn3->size, r3_size); > > ASSERT_EQ(rgn3->base, memblock_start_of_DRAM()); > > @@ -1004,12 +1053,12 @@ static int alloc_try_nid_bottom_up_cap_max_check(void) > > min_addr = memblock_start_of_DRAM() + SZ_1K; > > max_addr = memblock_end_of_DRAM() + SZ_256; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, min_addr); > > @@ -1043,12 +1092,12 @@ static int alloc_try_nid_bottom_up_cap_min_check(void) > > min_addr = memblock_start_of_DRAM(); > > max_addr = memblock_end_of_DRAM() - SZ_256; > > - allocated_ptr = memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > - min_addr, max_addr, > > - NUMA_NO_NODE); > > + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, > > + min_addr, max_addr, > > + NUMA_NO_NODE); > > ASSERT_NE(allocated_ptr, NULL); > > - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); > > + verify_mem_content(allocated_ptr, size); > > ASSERT_EQ(rgn->size, size); > > ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); > > @@ -1193,13 +1242,14 @@ static int alloc_try_nid_low_max_check(void) > > return 0; > > } > > -int memblock_alloc_nid_checks(void) > > +static int memblock_alloc_nid_checks_internal(int flags) > > { > > - const char *func_testing = "memblock_alloc_try_nid"; > > + const char *func = get_func_testing(flags); > > + alloc_nid_test_flags = flags; > > prefix_reset(); > > - prefix_push(func_testing); > > - test_print("Running %s tests...\n", func_testing); > > + prefix_push(func); > > + test_print("Running %s tests...\n", func); > > reset_memblock_attributes(); > > dummy_physical_memory_init(); > > @@ -1225,3 +1275,11 @@ int memblock_alloc_nid_checks(void) > > return 0; > > } > > + > > +int memblock_alloc_nid_checks(void) > > +{ > > + memblock_alloc_nid_checks_internal(TEST_ZEROED); > > + memblock_alloc_nid_checks_internal(TEST_RAW); > > + > > + return 0; > > +}
Thanks, Rebecca
| |