Commit 49da0700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'memblock-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock updates from Mike Rapoport:
 "Test suite improvements:

   - Added verification that memblock allocations zero the allocated
     memory

   - Added more test cases for memblock_add(), memblock_remove(),
     memblock_reserve() and memblock_free()

   - Added tests for memblock_*_raw() family

   - Added tests for NUMA-aware allocations in memblock_alloc_try_nid()
     and memblock_alloc_try_nid_raw()"

* tag 'memblock-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock tests: add generic NUMA tests for memblock_alloc_try_nid*
  memblock tests: add bottom-up NUMA tests for memblock_alloc_try_nid*
  memblock tests: add top-down NUMA tests for memblock_alloc_try_nid*
  memblock tests: add simulation of physical memory with multiple NUMA nodes
  memblock_tests: move variable declarations to single block
  memblock tests: remove 'cleared' from comment blocks
  memblock tests: add tests for memblock_trim_memory
  memblock tests: add tests for memblock_*bottom_up functions
  memblock tests: update alloc_nid_api to test memblock_alloc_try_nid_raw
  memblock tests: update alloc_api to test memblock_alloc_raw
  memblock tests: add additional tests for basic api and memblock_alloc
  memblock tests: add labels to verbose output for generic alloc tests
  memblock tests: update zeroed memory check for memblock_alloc_* tests
  memblock tests: update tests to check if memblock_alloc zeroed memory
  memblock tests: update reference to obsolete build option in comments
  memblock tests: add command line help option
parents f311d498 3e4519b7

tools/testing/memblock/scripts/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


# Simulate CONFIG_NUMA=y

ifeq ($(NUMA), 1)

	CFLAGS += -D CONFIG_NUMA

	CFLAGS += -D CONFIG_NUMA -D CONFIG_NODES_SHIFT=4

endif



# Use 32 bit physical addresses.

tools/testing/memblock/tests/alloc_api.c

+137 −86
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

#include "alloc_api.h"



static int alloc_test_flags = TEST_F_NONE;



static inline const char * const get_memblock_alloc_name(int flags)

{

	if (flags & TEST_F_RAW)

		return "memblock_alloc_raw";

	return "memblock_alloc";

}



static inline void *run_memblock_alloc(phys_addr_t size, phys_addr_t align)

{

	if (alloc_test_flags & TEST_F_RAW)

		return memblock_alloc_raw(size, align);

	return memblock_alloc(size, align);

}



/*

 * A simple test that tries to allocate a small memory region.

 * Expect to allocate an aligned region near the end of the available memory.
@@ -9,19 +25,19 @@ 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;



	allocated_ptr = memblock_alloc(size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, size, alloc_test_flags);



	ASSERT_EQ(rgn->size, size);

	ASSERT_EQ(rgn->base, expected_start);
@@ -58,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;
@@ -77,9 +91,11 @@ static int alloc_top_down_disjoint_check(void) 


	memblock_reserve(r1.base, r1.size);



	allocated_ptr = memblock_alloc(r2_size, alignment);

	allocated_ptr = run_memblock_alloc(r2_size, alignment);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r2_size, alloc_test_flags);



	ASSERT_EQ(rgn1->size, r1.size);

	ASSERT_EQ(rgn1->base, r1.base);
@@ -108,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

	 */
@@ -118,13 +131,16 @@ 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);



	allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r2_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, total_size);

	ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size);
@@ -152,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();



	/*
@@ -170,9 +184,11 @@ static int alloc_top_down_after_check(void) 


	memblock_reserve(r1.base, r1.size);



	allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r2_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, total_size);

	ASSERT_EQ(rgn->base, r1.base - r2_size);
@@ -201,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;
@@ -220,9 +234,11 @@ static int alloc_top_down_second_fit_check(void) 
	memblock_reserve(r1.base, r1.size);

	memblock_reserve(r2.base, r2.size);



	allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r3_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, r2.size + r3_size);

	ASSERT_EQ(rgn->base, r2.base - r3_size);
@@ -250,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;

	/*
@@ -261,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;
@@ -274,9 +288,11 @@ static int alloc_in_between_generic_check(void) 
	memblock_reserve(r1.base, r1.size);

	memblock_reserve(r2.base, r2.size);



	allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r3_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, total_size);

	ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size);
@@ -304,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();
@@ -320,7 +334,7 @@ static int alloc_small_gaps_generic_check(void) 
		region_end += gap_size + region_size;

	}



	allocated_ptr = memblock_alloc(region_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(region_size, SMP_CACHE_BYTES);



	ASSERT_EQ(allocated_ptr, NULL);
@@ -338,13 +352,12 @@ static int alloc_all_reserved_generic_check(void) 
	void *allocated_ptr = NULL;



	PREFIX_PUSH();



	setup_memblock();



	/* Simulate full memory */

	memblock_reserve(memblock_start_of_DRAM(), MEM_SIZE);



	allocated_ptr = memblock_alloc(SZ_256, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(SZ_256, SMP_CACHE_BYTES);



	ASSERT_EQ(allocated_ptr, NULL);
@@ -369,18 +382,16 @@ 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);



	allocated_ptr = memblock_alloc(SZ_1K, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(SZ_1K, SMP_CACHE_BYTES);



	ASSERT_EQ(allocated_ptr, NULL);
@@ -404,20 +415,20 @@ 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 */

	memblock_reserve(memblock_start_of_DRAM(), reserved_size);



	allocated_ptr = memblock_alloc(available_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(available_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, available_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, MEM_SIZE);

	ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
@@ -443,7 +454,40 @@ static int alloc_no_memory_generic_check(void) 


	reset_memblock_regions();



	allocated_ptr = memblock_alloc(SZ_1K, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(SZ_1K, SMP_CACHE_BYTES);



	ASSERT_EQ(allocated_ptr, NULL);

	ASSERT_EQ(rgn->size, 0);

	ASSERT_EQ(rgn->base, 0);

	ASSERT_EQ(memblock.reserved.total_size, 0);



	test_pass_pop();



	return 0;

}



/*

 * A test that tries to allocate a region that is larger than the total size of

 * available memory (memblock.memory):

 *

 *  +-----------------------------------+

 *  |                 new               |

 *  +-----------------------------------+

 *  |                                 |

 *  |                                 |

 *  +---------------------------------+

 *

 * Expect no allocation to happen.

 */

static int alloc_too_large_generic_check(void)

{

	struct memblock_region *rgn = &memblock.reserved.regions[0];

	void *allocated_ptr = NULL;



	PREFIX_PUSH();

	setup_memblock();



	allocated_ptr = run_memblock_alloc(MEM_SIZE + SZ_2, SMP_CACHE_BYTES);



	ASSERT_EQ(allocated_ptr, NULL);

	ASSERT_EQ(rgn->size, 0);
@@ -466,12 +510,13 @@ static int alloc_bottom_up_simple_check(void) 
	void *allocated_ptr = NULL;



	PREFIX_PUSH();



	setup_memblock();



	allocated_ptr = memblock_alloc(SZ_2, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(SZ_2, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, SZ_2, alloc_test_flags);



	ASSERT_EQ(rgn->size, SZ_2);

	ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
@@ -506,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;
@@ -525,9 +568,10 @@ static int alloc_bottom_up_disjoint_check(void) 


	memblock_reserve(r1.base, r1.size);



	allocated_ptr = memblock_alloc(r2_size, alignment);

	allocated_ptr = run_memblock_alloc(r2_size, alignment);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r2_size, alloc_test_flags);



	ASSERT_EQ(rgn1->size, r1.size);

	ASSERT_EQ(rgn1->base, r1.base);
@@ -557,20 +601,20 @@ 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);



	allocated_ptr = memblock_alloc(r1_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r1_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r1_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, total_size);

	ASSERT_EQ(rgn->base, memblock_start_of_DRAM());
@@ -597,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();



	/*
@@ -615,9 +657,11 @@ static int alloc_bottom_up_after_check(void) 


	memblock_reserve(r1.base, r1.size);



	allocated_ptr = memblock_alloc(r2_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r2_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, total_size);

	ASSERT_EQ(rgn->base, r1.base);
@@ -647,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();
@@ -666,9 +708,11 @@ static int alloc_bottom_up_second_fit_check(void) 
	memblock_reserve(r1.base, r1.size);

	memblock_reserve(r2.base, r2.size);



	allocated_ptr = memblock_alloc(r3_size, SMP_CACHE_BYTES);

	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);



	ASSERT_NE(allocated_ptr, NULL);

	assert_mem_content(allocated_ptr, r3_size, alloc_test_flags);



	ASSERT_EQ(rgn->size, r2.size + r3_size);

	ASSERT_EQ(rgn->base, r2.base);
@@ -728,10 +772,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;

}
@@ -750,10 +792,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;

}
@@ -761,10 +801,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;

}
@@ -772,10 +810,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;

}
@@ -783,10 +819,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;

}
@@ -794,21 +828,29 @@ 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;

}



int memblock_alloc_checks(void)

static int alloc_too_large_check(void)

{

	const char *func_testing = "memblock_alloc";

	test_print("\tRunning %s...\n", __func__);

	run_top_down(alloc_too_large_generic_check);

	run_bottom_up(alloc_too_large_generic_check);



	return 0;

}



static int memblock_alloc_checks_internal(int flags)

{

	const char *func = get_memblock_alloc_name(flags);



	alloc_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();
@@ -824,6 +866,7 @@ int memblock_alloc_checks(void) 
	alloc_no_space_check();

	alloc_limited_space_check();

	alloc_no_memory_check();

	alloc_too_large_check();



	dummy_physical_memory_cleanup();
@@ -831,3 +874,11 @@ int memblock_alloc_checks(void) 


	return 0;

}



int memblock_alloc_checks(void)

{

	memblock_alloc_checks_internal(TEST_F_NONE);

	memblock_alloc_checks_internal(TEST_F_RAW);



	return 0;

}

tools/testing/memblock/tests/alloc_helpers_api.c

+14 −38
Original line number Diff line number Diff line
@@ -19,22 +19,18 @@ static int alloc_from_simple_generic_check(void) 
{

	struct memblock_region *rgn = &memblock.reserved.regions[0];

	void *allocated_ptr = NULL;

	char *b;



	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;



	allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);

	b = (char *)allocated_ptr;



	ASSERT_NE(allocated_ptr, NULL);

	ASSERT_EQ(*b, 0);

	ASSERT_MEM_EQ(allocated_ptr, 0, size);



	ASSERT_EQ(rgn->size, size);

	ASSERT_EQ(rgn->base, min_addr);
@@ -66,23 +62,19 @@ static int alloc_from_misaligned_generic_check(void) 
{

	struct memblock_region *rgn = &memblock.reserved.regions[0];

	void *allocated_ptr = NULL;

	char *b;



	PREFIX_PUSH();



	phys_addr_t size = SZ_32;

	phys_addr_t min_addr;



	PREFIX_PUSH();

	setup_memblock();



	/* A misaligned address */

	min_addr = memblock_end_of_DRAM() - (SMP_CACHE_BYTES * 2 - 1);



	allocated_ptr = memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr);

	b = (char *)allocated_ptr;



	ASSERT_NE(allocated_ptr, NULL);

	ASSERT_EQ(*b, 0);

	ASSERT_MEM_EQ(allocated_ptr, 0, size);



	ASSERT_EQ(rgn->size, size);

	ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES);
@@ -117,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 */
@@ -162,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;
@@ -201,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();
@@ -249,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 */
@@ -293,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;
@@ -331,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();
@@ -361,10 +341,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;

}
@@ -372,10 +350,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;

}

tools/testing/memblock/tests/alloc_nid_api.c

+1606 −208

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/memblock/tests/alloc_nid_api.h

+16 −0
Original line number Diff line number Diff line
@@ -5,5 +5,21 @@ 
#include "common.h"



int memblock_alloc_nid_checks(void);

int __memblock_alloc_nid_numa_checks(void);



#ifdef CONFIG_NUMA

static inline int memblock_alloc_nid_numa_checks(void)

{

	__memblock_alloc_nid_numa_checks();

	return 0;

}



#else

static inline int memblock_alloc_nid_numa_checks(void)

{

	return 0;

}



#endif /* CONFIG_NUMA */



#endif