memblock tests: add bottom-up NUMA tests for memblock_alloc_exact_nid_raw

Add tests for memblock_alloc_exact_nid_raw() where the simulated physical
memory is set up with multiple NUMA nodes. Additionally, all of these
tests set nid != NUMA_NO_NODE. These tests are run with a bottom-up
allocation direction.

The tested scenarios are:

Range unrestricted:
- region can be allocated in the specific node requested:
      + there are no previously reserved regions
      + the requested node is partially reserved but has enough space

Range restricted:
- region can be allocated in the specific node requested after dropping
  min_addr:
      + range partially overlaps with two different nodes, where the
        first node is the requested node
      + range partially overlaps with two different nodes, where the
        requested node ends before min_addr
      + range overlaps with multiple nodes along node boundaries, and
        the requested node ends before min_addr

Acked-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/935f0eed5e06fd44dc67d9f49b277923d7896bd3.1667802195.git.remckee0@gmail.com

diff --git a/tools/testing/memblock/tests/alloc_exact_nid_api.c b/tools/testing/memblock/tests/alloc_exact_nid_api.c
index 79150784b3739a5f3e2be313c246d09dbccc4735..b97b5c04de053510dc9e27b9c100cb5c2dedacd2 100644 (file)
--- a/tools/testing/memblock/tests/alloc_exact_nid_api.c
+++ b/tools/testing/memblock/tests/alloc_exact_nid_api.c
@@ -288,12 +288,286 @@ static int alloc_exact_nid_top_down_numa_no_overlap_low_check(void)
        return 0;
 }
 
+/*
+ * A test that tries to allocate a memory region in a specific NUMA node that
+ * has enough memory to allocate a region of the requested size.
+ * Expect to allocate an aligned region at the beginning of the requested node.
+ */
+static int alloc_exact_nid_bottom_up_numa_simple_check(void)
+{
+       int nid_req = 3;
+       struct memblock_region *new_rgn = &memblock.reserved.regions[0];
+       struct memblock_region *req_node = &memblock.memory.regions[nid_req];
+       void *allocated_ptr = NULL;
+       phys_addr_t size;
+       phys_addr_t min_addr;
+       phys_addr_t max_addr;
+
+       PREFIX_PUSH();
+       setup_numa_memblock(node_fractions);
+
+       ASSERT_LE(SZ_4, req_node->size);
+       size = req_node->size / SZ_4;
+       min_addr = memblock_start_of_DRAM();
+       max_addr = memblock_end_of_DRAM();
+
+       allocated_ptr = memblock_alloc_exact_nid_raw(size, SMP_CACHE_BYTES,
+                                                    min_addr, max_addr,
+                                                    nid_req);
+
+       ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_NE(allocated_ptr, 0, size);
+
+       ASSERT_EQ(new_rgn->size, size);
+       ASSERT_EQ(new_rgn->base, req_node->base);
+       ASSERT_LE(region_end(new_rgn), region_end(req_node));
+
+       ASSERT_EQ(memblock.reserved.cnt, 1);
+       ASSERT_EQ(memblock.reserved.total_size, size);
+
+       test_pass_pop();
+
+       return 0;
+}
+
+/*
+ * A test that tries to allocate a memory region in a specific NUMA node that
+ * is partially reserved but has enough memory for the allocated region:
+ *
+ *  |           +---------------------------------------+         |
+ *  |           |               requested               |         |
+ *  +-----------+---------------------------------------+---------+
+ *
+ *  |           +------------------+-----+                        |
+ *  |           |     reserved     | new |                        |
+ *  +-----------+------------------+-----+------------------------+
+ *
+ * Expect to allocate an aligned region in the requested node that merges with
+ * the existing reserved region. The total size gets updated.
+ */
+static int alloc_exact_nid_bottom_up_numa_part_reserved_check(void)
+{
+       int nid_req = 4;
+       struct memblock_region *new_rgn = &memblock.reserved.regions[0];
+       struct memblock_region *req_node = &memblock.memory.regions[nid_req];
+       void *allocated_ptr = NULL;
+       struct region r1;
+       phys_addr_t size;
+       phys_addr_t min_addr;
+       phys_addr_t max_addr;
+       phys_addr_t total_size;
+
+       PREFIX_PUSH();
+       setup_numa_memblock(node_fractions);
+
+       ASSERT_LE(SZ_8, req_node->size);
+       r1.base = req_node->base;
+       r1.size = req_node->size / SZ_2;
+       size = r1.size / SZ_4;
+       min_addr = memblock_start_of_DRAM();
+       max_addr = memblock_end_of_DRAM();
+       total_size = size + r1.size;
+
+       memblock_reserve(r1.base, r1.size);
+       allocated_ptr = memblock_alloc_exact_nid_raw(size, SMP_CACHE_BYTES,
+                                                    min_addr, max_addr,
+                                                    nid_req);
+
+       ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_NE(allocated_ptr, 0, size);
+
+       ASSERT_EQ(new_rgn->size, total_size);
+       ASSERT_EQ(new_rgn->base, req_node->base);
+       ASSERT_LE(region_end(new_rgn), region_end(req_node));
+
+       ASSERT_EQ(memblock.reserved.cnt, 1);
+       ASSERT_EQ(memblock.reserved.total_size, total_size);
+
+       test_pass_pop();
+
+       return 0;
+}
+
+/*
+ * A test that tries to allocate a memory region that spans over the min_addr
+ * and max_addr range and overlaps with two different nodes, where the first
+ * node is the requested node:
+ *
+ *                                min_addr
+ *                                |           max_addr
+ *                                |           |
+ *                                v           v
+ *  |           +-----------------------+-----------+              |
+ *  |           |       requested       |   node3   |              |
+ *  +-----------+-----------------------+-----------+--------------+
+ *                                +           +
+ *  |           +-----------+                                      |
+ *  |           |    rgn    |                                      |
+ *  +-----------+-----------+--------------------------------------+
+ *
+ * Expect to drop the lower limit and allocate a memory region at the beginning
+ * of the requested node.
+ */
+static int alloc_exact_nid_bottom_up_numa_split_range_low_check(void)
+{
+       int nid_req = 2;
+       struct memblock_region *new_rgn = &memblock.reserved.regions[0];
+       struct memblock_region *req_node = &memblock.memory.regions[nid_req];
+       void *allocated_ptr = NULL;
+       phys_addr_t size = SZ_512;
+       phys_addr_t min_addr;
+       phys_addr_t max_addr;
+       phys_addr_t req_node_end;
+
+       PREFIX_PUSH();
+       setup_numa_memblock(node_fractions);
+
+       req_node_end = region_end(req_node);
+       min_addr = req_node_end - SZ_256;
+       max_addr = min_addr + size;
+
+       allocated_ptr = memblock_alloc_exact_nid_raw(size, SMP_CACHE_BYTES,
+                                                    min_addr, max_addr,
+                                                    nid_req);
+
+       ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_NE(allocated_ptr, 0, size);
+
+       ASSERT_EQ(new_rgn->size, size);
+       ASSERT_EQ(new_rgn->base, req_node->base);
+       ASSERT_LE(region_end(new_rgn), req_node_end);
+
+       ASSERT_EQ(memblock.reserved.cnt, 1);
+       ASSERT_EQ(memblock.reserved.total_size, size);
+
+       test_pass_pop();
+
+       return 0;
+}
+
+/*
+ * A test that tries to allocate a memory region that spans over the min_addr
+ * and max_addr range and overlaps with two different nodes, where the requested
+ * node ends before min_addr:
+ *
+ *                                          min_addr
+ *                                         |         max_addr
+ *                                         |         |
+ *                                         v         v
+ *  |    +---------------+        +-------------+---------+         |
+ *  |    |   requested   |        |    node1    |  node2  |         |
+ *  +----+---------------+--------+-------------+---------+---------+
+ *                                         +         +
+ *  |    +---------+                                                |
+ *  |    |   rgn   |                                                |
+ *  +----+---------+------------------------------------------------+
+ *
+ * Expect to drop the lower limit and allocate a memory region that starts at
+ * the beginning of the requested node.
+ */
+static int alloc_exact_nid_bottom_up_numa_no_overlap_split_check(void)
+{
+       int nid_req = 2;
+       struct memblock_region *new_rgn = &memblock.reserved.regions[0];
+       struct memblock_region *req_node = &memblock.memory.regions[nid_req];
+       struct memblock_region *node2 = &memblock.memory.regions[6];
+       void *allocated_ptr = NULL;
+       phys_addr_t size;
+       phys_addr_t min_addr;
+       phys_addr_t max_addr;
+
+       PREFIX_PUSH();
+       setup_numa_memblock(node_fractions);
+
+       size = SZ_512;
+       min_addr = node2->base - SZ_256;
+       max_addr = min_addr + size;
+
+       allocated_ptr = memblock_alloc_exact_nid_raw(size, SMP_CACHE_BYTES,
+                                                    min_addr, max_addr,
+                                                    nid_req);
+
+       ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_NE(allocated_ptr, 0, size);
+
+       ASSERT_EQ(new_rgn->size, size);
+       ASSERT_EQ(new_rgn->base, req_node->base);
+       ASSERT_LE(region_end(new_rgn), region_end(req_node));
+
+       ASSERT_EQ(memblock.reserved.cnt, 1);
+       ASSERT_EQ(memblock.reserved.total_size, size);
+
+       test_pass_pop();
+
+       return 0;
+}
+
+/*
+ * A test that tries to allocate memory within min_addr and max_add range when
+ * the requested node and the range do not overlap, and requested node ends
+ * before min_addr. The range overlaps with multiple nodes along node
+ * boundaries:
+ *
+ *                          min_addr
+ *                          |                                 max_addr
+ *                          |                                 |
+ *                          v                                 v
+ *  |-----------+           +----------+----...----+----------+      |
+ *  | requested |           | min node |    ...    | max node |      |
+ *  +-----------+-----------+----------+----...----+----------+------+
+ *                          +                                 +
+ *  |-----+                                                          |
+ *  | rgn |                                                          |
+ *  +-----+----------------------------------------------------------+
+ *
+ * Expect to drop the lower limit and allocate a memory region that starts at
+ * the beginning of the requested node.
+ */
+static int alloc_exact_nid_bottom_up_numa_no_overlap_low_check(void)
+{
+       int nid_req = 0;
+       struct memblock_region *new_rgn = &memblock.reserved.regions[0];
+       struct memblock_region *req_node = &memblock.memory.regions[nid_req];
+       struct memblock_region *min_node = &memblock.memory.regions[2];
+       struct memblock_region *max_node = &memblock.memory.regions[5];
+       void *allocated_ptr = NULL;
+       phys_addr_t size = SZ_64;
+       phys_addr_t max_addr;
+       phys_addr_t min_addr;
+
+       PREFIX_PUSH();
+       setup_numa_memblock(node_fractions);
+
+       min_addr = min_node->base;
+       max_addr = region_end(max_node);
+
+       allocated_ptr = memblock_alloc_exact_nid_raw(size, SMP_CACHE_BYTES,
+                                                    min_addr, max_addr,
+                                                    nid_req);
+
+       ASSERT_NE(allocated_ptr, NULL);
+       ASSERT_MEM_NE(allocated_ptr, 0, size);
+
+       ASSERT_EQ(new_rgn->size, size);
+       ASSERT_EQ(new_rgn->base, req_node->base);
+       ASSERT_LE(region_end(new_rgn), region_end(req_node));
+
+       ASSERT_EQ(memblock.reserved.cnt, 1);
+       ASSERT_EQ(memblock.reserved.total_size, size);
+
+       test_pass_pop();
+
+       return 0;
+}
+
 /* Test case wrappers for NUMA tests */
 static int alloc_exact_nid_numa_simple_check(void)
 {
        test_print("\tRunning %s...\n", __func__);
        memblock_set_bottom_up(false);
        alloc_exact_nid_top_down_numa_simple_check();
+       memblock_set_bottom_up(true);
+       alloc_exact_nid_bottom_up_numa_simple_check();
 
        return 0;
 }
@@ -303,6 +577,8 @@ static int alloc_exact_nid_numa_part_reserved_check(void)
        test_print("\tRunning %s...\n", __func__);
        memblock_set_bottom_up(false);
        alloc_exact_nid_top_down_numa_part_reserved_check();
+       memblock_set_bottom_up(true);
+       alloc_exact_nid_bottom_up_numa_part_reserved_check();
 
        return 0;
 }
@@ -312,6 +588,8 @@ static int alloc_exact_nid_numa_split_range_low_check(void)
        test_print("\tRunning %s...\n", __func__);
        memblock_set_bottom_up(false);
        alloc_exact_nid_top_down_numa_split_range_low_check();
+       memblock_set_bottom_up(true);
+       alloc_exact_nid_bottom_up_numa_split_range_low_check();
 
        return 0;
 }
@@ -321,6 +599,8 @@ static int alloc_exact_nid_numa_no_overlap_split_check(void)
        test_print("\tRunning %s...\n", __func__);
        memblock_set_bottom_up(false);
        alloc_exact_nid_top_down_numa_no_overlap_split_check();
+       memblock_set_bottom_up(true);
+       alloc_exact_nid_bottom_up_numa_no_overlap_split_check();
 
        return 0;
 }
@@ -330,6 +610,8 @@ static int alloc_exact_nid_numa_no_overlap_low_check(void)
        test_print("\tRunning %s...\n", __func__);
        memblock_set_bottom_up(false);
        alloc_exact_nid_top_down_numa_no_overlap_low_check();
+       memblock_set_bottom_up(true);
+       alloc_exact_nid_bottom_up_numa_no_overlap_low_check();
 
        return 0;
 }