From patchwork Sun Sep 4 04:21:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rebecca Mckeever X-Patchwork-Id: 12965121 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E173ECAAD3 for ; Sun, 4 Sep 2022 04:21:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18A0680182; Sun, 4 Sep 2022 00:21:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 139BE8015A; Sun, 4 Sep 2022 00:21:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA66380182; Sun, 4 Sep 2022 00:21:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D28E18015A for ; Sun, 4 Sep 2022 00:21:34 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AB02A80B3F for ; Sun, 4 Sep 2022 04:21:34 +0000 (UTC) X-FDA: 79873104108.24.D61CF3B Received: from mail-oa1-f67.google.com (mail-oa1-f67.google.com [209.85.160.67]) by imf26.hostedemail.com (Postfix) with ESMTP id 4FA1214007E for ; Sun, 4 Sep 2022 04:21:34 +0000 (UTC) Received: by mail-oa1-f67.google.com with SMTP id 586e51a60fabf-11edd61a9edso14571201fac.5 for ; Sat, 03 Sep 2022 21:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=nFrCU9H+yZfz0Rv5KY1oVWlm8oyUWBoBmZmxLKuuzI4=; b=Ns1b1DQoXsz5p0SSKmpl63+99/CPj4DT4gOigB3NBTlthJmdqHj+8Q+LmgcNgCZ7KM Zg9de6RI8FeFoRRoZy3kBYLdBXoE7qQ7TnPUaoIkTptEGshkSnbatrMqe6LVi+FdrabS t7RVKaKRtEFUzWPbbnjy0j8hg3BBnPQiiRobqgQIDneAcGKTdPZSmoeqD1jiLt09UsMp TGz8qTwOYNOw48h5+b8OKpAqdQuZv6RiltLW2WvQbNGYPaCGR8JQ7UOGTdLFg4BNNpvP fE+QtFepVeRqVRJ0ABiGtFhRbUdGymZe34hr1mZuL5Lqm9mopMER9qQEkp3TxuCo5H3b CTCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=nFrCU9H+yZfz0Rv5KY1oVWlm8oyUWBoBmZmxLKuuzI4=; b=5ElG2RYhpXHU5o0Re9vx0wIb6IufmFTQDACbAYocMtp5T/yZ3jKpjCG8QvcXBsELBQ oEw+TYHmy1dHLgS53+D51I14kZECyIGG5cqwjICBCsLbNhV8auY76/JOPjvbD2fOqvRV qT2btD7o/pMTMqYSCAYc+tLzm2fRpzFNeq+xE2RKBXnUQoxIXZ3/gdjiHgib9A82sEzl 5y0ODY835zQs8ynYW0seVfEqsNTqQVW9zhiUusOCLDS+WpiHNCUF9KpG9MkYtjr9t2W3 2AvHsUoIfBqAi8v6jepartf9wXcaGTJATZk4Ohbf3nZusW6FkchW4JXdCp8NcKqVZDXW bvfg== X-Gm-Message-State: ACgBeo1IQCbneWgIIWm/faQkMQ0gTSJEZs1PZxrZ/fPYN+Wg3z47aXqy FXZILvaG4hCPf6jp2+6G54A= X-Google-Smtp-Source: AA6agR5SeMYX6CXpetX2QhyGq5JsqLJEz5qCWz1Rl3sWitDouLQ34laKOa01IXHJM1rwNXxCsS9PxQ== X-Received: by 2002:a54:4014:0:b0:343:3683:1b60 with SMTP id x20-20020a544014000000b0034336831b60mr4906667oie.203.1662265293494; Sat, 03 Sep 2022 21:21:33 -0700 (PDT) Received: from sophie (static-198-54-128-109.cust.tzulo.com. [198.54.128.109]) by smtp.gmail.com with ESMTPSA id i7-20020a056870890700b0010bf07976c9sm3485476oao.41.2022.09.03.21.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Sep 2022 21:21:33 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v4 4/4] memblock tests: add generic NUMA tests for memblock_alloc_try_nid* Date: Sat, 3 Sep 2022 23:21:08 -0500 Message-Id: <3644b4e2e459bb656dd29bdef0b62291528b2f65.1662264560.git.remckee0@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Ns1b1DQo; spf=pass (imf26.hostedemail.com: domain of remckee0@gmail.com designates 209.85.160.67 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662265294; a=rsa-sha256; cv=none; b=npANQ6XWzT6eBhUfGr9s3HExxALEfDfGouDbQoW31QT+cWcWeWA3KW1JBUgpam9Ar1gCZd RezpNbJrK4Vz1v6DfBxFyT86wW2/fUsM4eM7jWawV8wiBzRoSu1C/YmkTVhqZwHDaMklJt +arTMLgzAN5wVpIWZB5qLHgn0pHEwWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662265294; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nFrCU9H+yZfz0Rv5KY1oVWlm8oyUWBoBmZmxLKuuzI4=; b=OupQUP8IVmMcGsqrzShJTGoSs3LMHqYJ34CWRDAnoYbdvbr2D97LTQy038KrSi0O/UjmCL tS5lGqkzkJcTVwAL0424/qGIFMv3JSoey7ELFxza4Yk4TkKYfu/tn91feQ2D5SIQeuwHt5 rKlUR/f7nOP/wwFJxAkiUUtdlRkMDnY= X-Stat-Signature: fa9c74c9c3f4tfn59i1rnprj7jexdmjz X-Rspamd-Queue-Id: 4FA1214007E Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Ns1b1DQo; spf=pass (imf26.hostedemail.com: domain of remckee0@gmail.com designates 209.85.160.67 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1662265294-696961 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add tests for memblock_alloc_try_nid() and memblock_alloc_try_nid_raw() where the simulated physical memory is set up with multiple NUMA nodes. Additionally, two of these tests set nid != NUMA_NO_NODE. All tests are run for both top-down and bottom-up allocation directions. The tested scenarios are: Range unrestricted: - region cannot be allocated: + none of the nodes have enough memory to allocate the region Range restricted: - region can be allocated in the specific node requested without dropping min_addr: + the range fully overlaps with the node, and there are adjacent reserved regions - region cannot be allocated: + nid is set to NUMA_NO_NODE and the total range can fit the region, but the range is split between two nodes and everything else is reserved Signed-off-by: Rebecca Mckeever Acked-by: David Hildenbrand --- tools/testing/memblock/tests/alloc_nid_api.c | 197 +++++++++++++++++++ 1 file changed, 197 insertions(+) diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c index 133d77e83e0e..8f25c90c2300 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -2349,6 +2349,173 @@ static int alloc_try_nid_bottom_up_numa_no_overlap_high_check(void) return 0; } +/* + * A test that tries to allocate a memory region in a specific NUMA node that + * does not have enough memory to allocate a region of the requested size. + * Additionally, none of the nodes have enough memory to allocate the region: + * + * +-----------------------------------+ + * | new | + * +-----------------------------------+ + * |-------+-------+-------+-------+-------+-------+-------+-------| + * | node0 | node1 | node2 | node3 | node4 | node5 | node6 | node7 | + * +-------+-------+-------+-------+-------+-------+-------+-------+ + * + * Expect no allocation to happen. + */ +static int alloc_try_nid_numa_large_region_generic_check(void) +{ + int nid_req = 3; + void *allocated_ptr = NULL; + phys_addr_t size = MEM_SIZE / SZ_2; + phys_addr_t min_addr; + phys_addr_t max_addr; + + PREFIX_PUSH(); + setup_numa_memblock(node_fractions); + + min_addr = memblock_start_of_DRAM(); + max_addr = memblock_end_of_DRAM(); + + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, nid_req); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to allocate memory within min_addr and max_addr range when + * there are two reserved regions at the borders. The requested node starts at + * min_addr and ends at max_addr and is the same size as the region to be + * allocated: + * + * min_addr + * | max_addr + * | | + * v v + * | +-----------+-----------------------+-----------------------| + * | | node5 | requested | node7 | + * +------+-----------+-----------------------+-----------------------+ + * + + + * | +----+-----------------------+----+ | + * | | r2 | new | r1 | | + * +-------------+----+-----------------------+----+------------------+ + * + * Expect to merge all of the regions into one. The region counter and total + * size fields get updated. + */ +static int alloc_try_nid_numa_reserved_full_merge_generic_check(void) +{ + int nid_req = 6; + int nid_next = nid_req + 1; + struct memblock_region *new_rgn = &memblock.reserved.regions[0]; + struct memblock_region *req_node = &memblock.memory.regions[nid_req]; + struct memblock_region *next_node = &memblock.memory.regions[nid_next]; + void *allocated_ptr = NULL; + struct region r1, r2; + phys_addr_t size = req_node->size; + phys_addr_t total_size; + phys_addr_t max_addr; + phys_addr_t min_addr; + + PREFIX_PUSH(); + setup_numa_memblock(node_fractions); + + r1.base = next_node->base; + r1.size = SZ_128; + + r2.size = SZ_128; + r2.base = r1.base - (size + r2.size); + + total_size = r1.size + r2.size + size; + min_addr = r2.base + r2.size; + max_addr = r1.base; + + memblock_reserve(r1.base, r1.size); + memblock_reserve(r2.base, r2.size); + + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, nid_req); + + ASSERT_NE(allocated_ptr, NULL); + assert_mem_content(allocated_ptr, size, alloc_nid_test_flags); + + ASSERT_EQ(new_rgn->size, total_size); + ASSERT_EQ(new_rgn->base, r2.base); + + ASSERT_LE(new_rgn->base, req_node->base); + ASSERT_LE(region_end(req_node), region_end(new_rgn)); + + 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 memory within min_addr and max_add range, + * where the total range can fit the region, but it is split between two nodes + * and everything else is reserved. Additionally, nid is set to NUMA_NO_NODE + * instead of requesting a specific node: + * + * +-----------+ + * | new | + * +-----------+ + * | +---------------------+-----------| + * | | prev node | next node | + * +------+---------------------+-----------+ + * + + + * |----------------------+ +-----| + * | r1 | | r2 | + * +----------------------+-----------+-----+ + * ^ ^ + * | | + * | max_addr + * | + * min_addr + * + * Expect no allocation to happen. + */ +static int alloc_try_nid_numa_split_all_reserved_generic_check(void) +{ + void *allocated_ptr = NULL; + struct memblock_region *next_node = &memblock.memory.regions[7]; + struct region r1, r2; + phys_addr_t size = SZ_256; + phys_addr_t max_addr; + phys_addr_t min_addr; + + PREFIX_PUSH(); + setup_numa_memblock(node_fractions); + + r2.base = next_node->base + SZ_128; + r2.size = memblock_end_of_DRAM() - r2.base; + + r1.size = MEM_SIZE - (r2.size + size); + r1.base = memblock_start_of_DRAM(); + + min_addr = r1.base + r1.size; + max_addr = r2.base; + + memblock_reserve(r1.base, r1.size); + memblock_reserve(r2.base, r2.size); + + allocated_ptr = run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); + + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); + + return 0; +} + /* Test case wrappers for NUMA tests */ static int alloc_try_nid_numa_simple_check(void) { @@ -2460,6 +2627,33 @@ static int alloc_try_nid_numa_no_overlap_high_check(void) return 0; } +static int alloc_try_nid_numa_large_region_check(void) +{ + test_print("\tRunning %s...\n", __func__); + run_top_down(alloc_try_nid_numa_large_region_generic_check); + run_bottom_up(alloc_try_nid_numa_large_region_generic_check); + + return 0; +} + +static int alloc_try_nid_numa_reserved_full_merge_check(void) +{ + test_print("\tRunning %s...\n", __func__); + run_top_down(alloc_try_nid_numa_reserved_full_merge_generic_check); + run_bottom_up(alloc_try_nid_numa_reserved_full_merge_generic_check); + + return 0; +} + +static int alloc_try_nid_numa_split_all_reserved_check(void) +{ + test_print("\tRunning %s...\n", __func__); + run_top_down(alloc_try_nid_numa_split_all_reserved_generic_check); + run_bottom_up(alloc_try_nid_numa_split_all_reserved_generic_check); + + return 0; +} + int __memblock_alloc_nid_numa_checks(void) { test_print("Running %s NUMA tests...\n", @@ -2476,6 +2670,9 @@ int __memblock_alloc_nid_numa_checks(void) alloc_try_nid_numa_no_overlap_split_check(); alloc_try_nid_numa_no_overlap_low_check(); alloc_try_nid_numa_no_overlap_high_check(); + alloc_try_nid_numa_large_region_check(); + alloc_try_nid_numa_reserved_full_merge_check(); + alloc_try_nid_numa_split_all_reserved_check(); return 0; }