From patchwork Wed Mar 12 13:07:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 14013512 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 DCD2BC28B28 for ; Wed, 12 Mar 2025 13:07:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 197FB280005; Wed, 12 Mar 2025 09:07:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 12060280001; Wed, 12 Mar 2025 09:07:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E67C4280005; Wed, 12 Mar 2025 09:07:43 -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 C000F280001 for ; Wed, 12 Mar 2025 09:07:43 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 88BC5C1132 for ; Wed, 12 Mar 2025 13:07:44 +0000 (UTC) X-FDA: 83212926048.19.8EB5CF7 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by imf27.hostedemail.com (Postfix) with ESMTP id A64C840003 for ; Wed, 12 Mar 2025 13:07:42 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=l8VuFhdy; spf=pass (imf27.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741784862; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=8zE2S+Fhbk8m5YQC6Y/DJAFYmBoP4OROj/JXsAR1KIs=; b=td4yoqfobvo3Kpvnr1QUj7/F5q/2NQXXVTQPJB/oYLcLD45P4kBT9tk345zqsrRhDxFMpD cswTUqfUxJTPqRAKjITJNjAtcYSalfXoMq2v08ADns0fGihdIor1K48N4l/6y/gB5KAIDi dHt2kTFM/otb/5qREQW1ehj7Aa3vBh0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=l8VuFhdy; spf=pass (imf27.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741784862; a=rsa-sha256; cv=none; b=LvfvcndlcE3scfMdkjFPR0xb38v++3OhGHwlNrTakW5KyMxMac++pK9fhflFVnCm7qjSLr ovTHizRvNJhDaP+DfaKSccvQbngnS/pA/FFnWmRiYcFqipywdi2F+8Ksn6Qmg1HWXph0IM P0LupVQQh7Gq8ThlPILaOqhADcFD/yw= Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac25313ea37so1024735866b.1 for ; Wed, 12 Mar 2025 06:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741784861; x=1742389661; darn=kvack.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=8zE2S+Fhbk8m5YQC6Y/DJAFYmBoP4OROj/JXsAR1KIs=; b=l8VuFhdykCN2+nlj2yfdlWKY/N75hPdr4Iy129JbcQzmm+gwLKl2aIWK9CMDLdj+3P hG/4khUdq5baIoh9ZTJyiuE11nvXtXVgAnya8qLl6FERtDqzj0FQUxi6xrshPyvGDiEv tV6Z/LmZe1j/1m3qjvEnoeYP6AzlPuH1/REVkggVQqI84lKstN+KzD4ELA2wjbHWBPuF CHmiFMIvT02AMP5MeDinifqQt1UP2rupxsWlJ88p7CXfcxnoneuJMMyRb0pKDpaOVEW7 k4cxSipQnVmQPJlLlQHkteixgulDsIc3il5hA01SCkJ0TQRcTRw/LIjaP2K69D3/yYC2 gTXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741784861; x=1742389661; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8zE2S+Fhbk8m5YQC6Y/DJAFYmBoP4OROj/JXsAR1KIs=; b=XkJDGjtumpOUXZSM+YL4WhvyT/IcWFm1F05vYxNCUrCbp8F9/UErQ5ZEECV5Mh2nJe Hqs7ixhq+0uW3WJKUf0+ZhJRXSPhoSTpr3r2W95rrhygMZdQ5mlEvIwnhaGXbV+2yFht 6FQZnzbBF8qKNpNbjWqq3Wh3VfuocOa0b+Wbukrx+3WWi9rNg+ybYgmo2JSFTQ11zk5E MqeZ+XfAJela3kYeMzJcxJ8hoVKMCksjkOKMAZVWnmIwv4KFi8kFiD3Vj3pLjoLPHzr0 tiDQ2GQVRMPu1QHBpd8+YNxjziyKc7nXOAPWxG2kTnXSMKjAVyHyzBo3czUudjHqPu8h dYhQ== X-Gm-Message-State: AOJu0YxTEOyuGO3AxqXXN/nqWbdqPHrDBTnGhVb1bUO0SClwTnuxZjs6 nU1SHG9Cy30z1WC2F9PGm4YIfkjYgYd0wrN6ne5heUrL/65zjKbM X-Gm-Gg: ASbGncsRkUdgAhus/63U/qSG3tErm/NbPYPoopGrkyh5C5tM6I/HWwsbDk3XqTlrDgm j+5tLvCrkbz2voQoBdklO1SpwGuiU7AurD8Fd643/6spwUPV2CZTNu9E788PUScqyJiihBCcxeY 7uQbdyTXdkk/xuiWLIvMAl+z+t/Gpq3QPQ4ER7lancdzFo/uE/8eRfaecKJ5I3VoskdO3J4shpY aka4r6cfY9fpXa5iTv5SZXsLTDbCt78D7S2AR/+6dy4QGA/vtg1AvGWdy+0ow0vPvysrhyBWFv1 aJrIhdbpziv22nh68H1u+nv7aO/oV/EmoqkGnB/Cr36G X-Google-Smtp-Source: AGHT+IHtV9zVXvc1ICKdqfD0CMezopYDLOjlPFtRjtobiZt9SSgezz4xJjKP6ppBLPxOPBJHuaB1Vg== X-Received: by 2002:a17:907:86a8:b0:ac1:e1d8:997c with SMTP id a640c23a62f3a-ac252719297mr2734464766b.31.1741784860822; Wed, 12 Mar 2025 06:07:40 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac2929390b4sm572218866b.75.2025.03.12.06.07.40 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Mar 2025 06:07:40 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, Wei Yang , Yajun Deng Subject: [PATCH 3/3] memblock tests: add test for memblock_set_node Date: Wed, 12 Mar 2025 13:07:28 +0000 Message-Id: <20250312130728.1117-4-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20250312130728.1117-1-richard.weiyang@gmail.com> References: <20250312130728.1117-1-richard.weiyang@gmail.com> X-Stat-Signature: taq68gbeerdc7wdqn7ktpc8cdbum9zkw X-Rspamd-Queue-Id: A64C840003 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741784862-556605 X-HE-Meta: U2FsdGVkX1//X6HGKAB/LDc79yCvvM/Av1AWoOxoY2Hw5Z7qSi3shsnPW22n/0n4IIaBgk1fqF/GZNYddBeDgz15h8Y25jvJ6WEt6OUtpuPm8nlLbbuHsCRbmncZhd/RQClLgn9FqobHkqpkhYa/taqywvWcqKEnGExrWEzwSsdT3xYIwPMHh0OGcIGN4ssEI304XYEPsLrXmgf4nKkKhIguehWA0ALwTHojn5fPfL6e9hx3Qq6An6BeayrH9QSAmktVKTZMzcUY2WxEbbFPNw6iKok3Nlk2p6TVoXgQJxnVD3bqmprqAGFprvFJBzISzbqPthE6Di6o9GRHZrSh7a1qNmYVOf2Hn6uwoLcI8j6VcUjUD0Xnaq3bqUPuxuevGRRyeVqkGZiieTPlVOiV80m53PdensDXXMdUDmYBEH9o8A6TqkmLgfmKSqJvIOLbk4dJhE/yywVgobYPiy/XL33KuU9wbJewgrSnDJVmAFfCE7bKyQf9Ke/nb+GuNdtmZJR9sMPTRf4Hx5yY/z1HMytiKvuniWuZSGRNmeOu6SNrnh05CJhH+qGptWhJDj153puLDDpbdqK0fs4+c2hQIf4z1su/xdvjESWr+0VuIpiR/FoxtgXYbIm/hwP1xQgiwgwZ5ee3Ebf60jupTyaT64fPHcqV+ZmGrDqSuuk49VAWkRODGMiCptM54m3Jm7PQOAHPOM2MMXNrqqvtCx4KhwTWmw1ccsKQp4Mtd/oOO+9KBw4HcphMfVL/qi4MinRu/IkJUT/AmuBfOasKhuGjUwykgOh3vC6UrGKnBhUFDN8e09JurTokbWG8gEg8Bdcu81/RHzMFUMwf5RKwdvfTad4kvnWY1Wjwm21wGPiRG448OKWLmuWRNg56QFsJ1RnqBCZ78zWe1cqi+V6oqHRAp+MTMvA2f2q12Xzlsz4AzAlhyso9bCctuzrZQ32600+w3v5CRRxNy9rvO23UrjU K7yiPs24 Fs4oNWneGovIr79IWTIMXlLRv5qQF6BpdnwLFSaX5tjs3D7M936en9SEQMGyDqBiRkHlm7ADcemzyOLvj0l9yp+mddNxzlg2/dOOhj38R3/Z7CZzDtKwo/NFPzgV0A9K9rKjgs/d7Cdxg9baR6uo4IGPIx+4OyFJtjlqo0XytssHBwff8dJZS6+6WzR+dH6bhowAGcCfGQSQ8mslFwpxSECLmdYjap6nd8kYjikxbX6Xz1yZ2rNp+O0wAwkOWcJZfKC8EfkfCZ3N5gvt89f4TZzA9IdhQUkaDgaEzJzN6V5IrEC+PpDICridmaoDrWjtJYXNMbH8PFc7Qf/9Dyb6zXB8F4yelP/PprhYHGLsPy5XbNAMvVF5TjxT/Xsq2rHc8LqOrBVr0aRU5+/H1hg3KuzmdULHj4YSGQukEXPfR+639VDcbjaehvjcaZ4nY2ZfIVZpkLddR0XJMLxfBxzD/ubSNV0jRL4LIn8a3+8wXe/AjFFrUtwhM3CVYh30FM/O2td8BdgV1fxmZvP+Mh/zDzsOzjlM9uv8HVey9zwtZ+P4nPRCcfmbFPKUJJw== 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: List-Subscribe: List-Unsubscribe: Add a test to check memblock_set_node() behavior. And create a corner case in which the memblock.reserved array is doubled during memblock_set_node(). And finally make sure all regions in memblock.reserved are with valid node id. Signed-off-by: Wei Yang CC: Mike Rapoport CC: Yajun Deng --- tools/testing/memblock/tests/basic_api.c | 102 +++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index 67503089e6a0..45dd122a62a8 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -2434,6 +2434,107 @@ static int memblock_overlaps_region_checks(void) return 0; } +#ifdef CONFIG_NUMA +static int memblock_set_node_check(void) +{ + unsigned long i; + struct memblock_region *rgn; + void *orig_region; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + dummy_physical_memory_init(); + memblock_add(dummy_physical_memory_base(), MEM_SIZE); + orig_region = memblock.reserved.regions; + + /* Equally Split range to node 0 and 1*/ + memblock_set_node(memblock_start_of_DRAM(), + memblock_phys_mem_size() / 2, &memblock.memory, 0); + memblock_set_node(memblock_start_of_DRAM() + memblock_phys_mem_size() / 2, + memblock_phys_mem_size() / 2, &memblock.memory, 1); + + ASSERT_EQ(memblock.memory.cnt, 2); + rgn = &memblock.memory.regions[0]; + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); + ASSERT_EQ(rgn->size, memblock_phys_mem_size() / 2); + ASSERT_EQ(memblock_get_region_node(rgn), 0); + rgn = &memblock.memory.regions[1]; + ASSERT_EQ(rgn->base, memblock_start_of_DRAM() + memblock_phys_mem_size() / 2); + ASSERT_EQ(rgn->size, memblock_phys_mem_size() / 2); + ASSERT_EQ(memblock_get_region_node(rgn), 1); + + /* Reserve 126 regions with the last one across node boundary */ + for (i = 0; i < 125; i++) + memblock_reserve(memblock_start_of_DRAM() + SZ_16 * i, SZ_8); + + memblock_reserve(memblock_start_of_DRAM() + memblock_phys_mem_size() / 2 - SZ_8, + SZ_16); + + /* + * Commit 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()") + * do following process to set nid to each memblock.reserved region. + * But it may miss some region if memblock_set_node() double the + * array. + * + * By checking 'max', we make sure all region nid is set properly. + */ +repeat: + for_each_mem_region(rgn) { + int nid = memblock_get_region_node(rgn); + unsigned long max = memblock.reserved.max; + + memblock_set_node(rgn->base, rgn->size, &memblock.reserved, nid); + if (max != memblock.reserved.max) + goto repeat; + } + + /* Confirm each region has valid node set */ + for_each_reserved_mem_region(rgn) { + ASSERT_TRUE(numa_valid_node(memblock_get_region_node(rgn))); + if (rgn == (memblock.reserved.regions + memblock.reserved.cnt - 1)) + ASSERT_EQ(1, memblock_get_region_node(rgn)); + else + ASSERT_EQ(0, memblock_get_region_node(rgn)); + } + + dummy_physical_memory_cleanup(); + + /* + * The current reserved.regions is occupying a range of memory that + * allocated from dummy_physical_memory_init(). After free the memory, + * we must not use it. So restore the origin memory region to make sure + * the tests can run as normal and not affected by the double array. + */ + memblock.reserved.regions = orig_region; + memblock.reserved.cnt = INIT_MEMBLOCK_RESERVED_REGIONS; + + test_pass_pop(); + + return 0; +} + +static int memblock_set_node_checks(void) +{ + prefix_reset(); + prefix_push("memblock_set_node"); + test_print("Running memblock_set_node tests...\n"); + + memblock_set_node_check(); + + prefix_pop(); + + return 0; +} +#else +static int memblock_set_node_checks(void) +{ + return 0; +} +#endif + int memblock_basic_checks(void) { memblock_initialization_check(); @@ -2444,6 +2545,7 @@ int memblock_basic_checks(void) memblock_bottom_up_checks(); memblock_trim_memory_checks(); memblock_overlaps_region_checks(); + memblock_set_node_checks(); return 0; }