From patchwork Sun Aug 14 06:06:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rebecca Mckeever X-Patchwork-Id: 12942856 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 D7544C25B06 for ; Sun, 14 Aug 2022 06:07:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 723EE8E0007; Sun, 14 Aug 2022 02:07:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD768E0001; Sun, 14 Aug 2022 02:07:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FDF78E0007; Sun, 14 Aug 2022 02:07:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3E91A8E0001 for ; Sun, 14 Aug 2022 02:07:12 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E4E29C0218 for ; Sun, 14 Aug 2022 06:07:11 +0000 (UTC) X-FDA: 79797165462.10.5EB7F29 Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by imf04.hostedemail.com (Postfix) with ESMTP id 8EDAB4003E for ; Sun, 14 Aug 2022 06:07:11 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id t15so2490648ilm.7 for ; Sat, 13 Aug 2022 23:07:11 -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; bh=Y17OOl0b7CQD6Vt9597weZ/gJQko4O3Bqol78jXbBU8=; b=g6KBQDx7nImhHT+L3NFhQmH1Sa/REqOtGIGFp5sCwL2vICbQstkCaUDkDMTrCZSf/f 3yedy95vHRFDu9hWm0G59ByGCass/byR1uscsrChQjKgya3s1Lomny3OwrNK9GkQAgwg eSyfy1mHj5etSD7ajwgMyqKsDAQA8XI4boCm4trTBkQX4pelkMJ/CwunZRwnUo+6Vg2Z faQH4VlPsTXES0s6Ta6YPGsoEWDujT83L9yMNy3iSRFAJuEZBoWhbdbpyU9nv8pwvwmi ShXQND6x6exEMSiBidGNuXRXTVb9JOR674vJd/vQNhxa6Q+J6WELwiNN2YYl6fEVt2a6 m3Dw== 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; bh=Y17OOl0b7CQD6Vt9597weZ/gJQko4O3Bqol78jXbBU8=; b=SpvzA/l+OOl6ZEHFKSFqbPIeF4Y5Ufr4WsPONcMYWitIQQI1ai91gWflRw/6aRZyhE g94utPJKZz3gyK/ah9xvW5naQmD9wtQJjYX/ARL4AQJWj54WtZhLYP0slUQbIccoKR41 XB05uUGB11kL6pcIpCTxEPqa893xlZTUYYGDuKxRCNwl7IJXM9tCv6bWgwG87ZwOWZnZ t3DU3h5QmmMCw+bBG/IQgmEdIyMmX0joNmE0Yx4Xt6B6OlilVGSRjvYVc+0jqHE1UoHr ouQeOtMb+kQRhXZr+sqc3C1ueasMEruqkThubOzDQm4SMD750j/raTjVx9cxeV73qceX Xctw== X-Gm-Message-State: ACgBeo25QfsPZSSgibp40Z3dQ539tZA2hSD1vbiWtSLqrsnPSFnwrwn2 3aZEq2burrsUU0PMi3mn4sQ= X-Google-Smtp-Source: AA6agR4i28dUdKHGO68m/+VYuT0meUTZWYUmoraPj1FjhP+hWTB/83KeY27CYEOi7oIVNVCCwLrh7w== X-Received: by 2002:a92:3652:0:b0:2df:4133:787 with SMTP id d18-20020a923652000000b002df41330787mr4872527ilf.39.1660457230804; Sat, 13 Aug 2022 23:07:10 -0700 (PDT) Received: from sophie ([68.235.43.126]) by smtp.gmail.com with ESMTPSA id ay21-20020a5d9d95000000b00684584f7354sm3194761iob.55.2022.08.13.23.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 23:07:10 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 4/4] memblock tests: add generic NUMA tests for memblock_alloc_try_nid* Date: Sun, 14 Aug 2022 01:06:18 -0500 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660457231; 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=Y17OOl0b7CQD6Vt9597weZ/gJQko4O3Bqol78jXbBU8=; b=6IDjVhbEgN9ENvrGWlTFE7kum0W7RfqwI9Q0m0dCXIefScO+mZ7teqc//W5QS9l2oSfseC a0lYFPsguQiAUFwd2a+Biu068CbhILpiURE1wzvtwP7QY+TdVlFqEKoiUHLuZ7Syk7T8i3 xRv3t/zlGUDds1AKtfOHou3k3HIFkjY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=g6KBQDx7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of remckee0@gmail.com designates 209.85.166.194 as permitted sender) smtp.mailfrom=remckee0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660457231; a=rsa-sha256; cv=none; b=p9yV6oDXO0AmEU69HJ68C+Uw9BClQPNTnhlaGSz5nIGLjH9G+1CHqPmIFdKK/TPA9kMvN5 T180Q/DV52GiBixR3aOEZqEg5HsX9D8pBKnx6tgpoCZq+1ylfOr6XAYBLfYkdTFRItBXJ4 SxVLXs1W7NJGmR1QPL/6M6qs4+ZmvE4= X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8EDAB4003E X-Rspam-User: X-Stat-Signature: ohhxusedwh176kk6hdahyd1ufq4bdio5 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=g6KBQDx7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of remckee0@gmail.com designates 209.85.166.194 as permitted sender) smtp.mailfrom=remckee0@gmail.com X-HE-Tag: 1660457231-980887 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000009, 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 --- tools/testing/memblock/tests/alloc_nid_api.c | 203 +++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c index 112cd8018d7c..9cbc95ebe07d 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -2390,6 +2390,179 @@ static int alloc_try_nid_numa_bottom_up_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_generic_numa_large_region_check(void) +{ + int nid_req = 3; + void *allocated_ptr = NULL; + + PREFIX_PUSH(); + + phys_addr_t size = SZ_8K * MEM_FACTOR; + phys_addr_t min_addr; + phys_addr_t max_addr; + + setup_numa_memblock(); + + 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; + + PREFIX_PUSH(); + + phys_addr_t size = req_node->size; + phys_addr_t total_size; + phys_addr_t max_addr; + phys_addr_t min_addr; + + setup_numa_memblock(); + + 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); + verify_mem_content(allocated_ptr, size); + + 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; + + PREFIX_PUSH(); + + phys_addr_t size = SZ_256; + phys_addr_t max_addr; + phys_addr_t min_addr; + + setup_numa_memblock(); + + 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) { @@ -2501,6 +2674,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_generic_numa_large_region_check); + run_bottom_up(alloc_try_nid_generic_numa_large_region_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", @@ -2517,6 +2717,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; }