From patchwork Tue Mar 18 07:19:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 14020394 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 D67B3C28B28 for ; Tue, 18 Mar 2025 07:20:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C30AE280005; Tue, 18 Mar 2025 03:20:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE231280001; Tue, 18 Mar 2025 03:20:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A82DC280005; Tue, 18 Mar 2025 03:20:06 -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 894EC280001 for ; Tue, 18 Mar 2025 03:20:06 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6D4ED160CAC for ; Tue, 18 Mar 2025 07:20:07 +0000 (UTC) X-FDA: 83233822854.29.0246B74 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by imf04.hostedemail.com (Postfix) with ESMTP id 9C13540002 for ; Tue, 18 Mar 2025 07:20:05 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=klj7K1IZ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.54 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742282405; a=rsa-sha256; cv=none; b=B4FE7eLz2xqxRcnnJgG4byGcqU8Klvfi8+lvS5ymqDVPDOggZBDJo92LtCYngaMZOBZhZI YErQ7GgbclqpFAvrJZ2WIuy9hELC6AYwDvyyUolU9ofTDqS1ba22IyOAEVTHS041MuGr1J aBxwwpHqixYD9eJHjHskTKJt1gHBi3o= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=klj7K1IZ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.54 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742282405; 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=OilE87PirqWgG9TbL4Fk/0TuP1rP+OzsnuOoMgu2kWE=; b=m44zyCH/wkigrkPw6WFZ4WnPPiWbII563TGL/DmDeqPKNzz9Ofk+tmhPQTnBmbHAOwTOo/ ZoYfZjQHwP7NH0fq1CY9dL8LRB707tEMLpf4XkLyURB8EMg5YAy708hWqoegQw/bRcpLk4 J4mQp/YLx3+KFUJO+YML1TG/GvQYjiw= Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5e5c7d6b96fso554038a12.3 for ; Tue, 18 Mar 2025 00:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742282404; x=1742887204; 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=OilE87PirqWgG9TbL4Fk/0TuP1rP+OzsnuOoMgu2kWE=; b=klj7K1IZ5rfrowPc0xYimvC7oEbMJLpgDTCpAJtVecqVMWdKOS6LGzqqqZFG04wRCi CujSoyBXDWpHv1uaGw1p/+JD4iTrouKgGBPOkiJOhbf8hnnUQbhW5H9V5cQt+ATARkSh aUbjImIaTd0iYuIVnhC8P7afpvrIaOeq5n7wATTRMiZP76sEg68UbHfZpHQEmg8kS+CE S7ZygpKiMcmO06svbFhq9QQtrduby4Ks5L6NQeA0wfMHJ39cWHD/1geBlvHg2tnW6sCC +Otye+VFeYYDxy627Jh5wyEL6x+J9CpxDgzhozuQ1tv/GNaxx/2fIMHUfYeHhHsEluRm PzXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742282404; x=1742887204; 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=OilE87PirqWgG9TbL4Fk/0TuP1rP+OzsnuOoMgu2kWE=; b=LkMudAhdfCoK1xeJQrGg39bj25y1IoJ6bhdCqpz6OWIZZ/adEMzco2LrjFIjspLIWz kGssWbe6039ICgMNIvLEJVfjHVJrJt4J8oN61jTmO7C6zdo0f+gJ5ybgOtj0OC4ypqA3 9qmK0wUbYfhltAISmtM228McX8cLV5OH40hKsMf9ZOYErMFaggRQhl937grk1UrmaZf8 66Qy40sNb2jioMbFpTNQMKCbuRbsm2aCeaWrv2RS1FCyJtbeqqUwK99FZACCcNonXML0 +SWjvY6ZcGFuFz3h+bx2lhB09gCDfO9XZbq2AE30j+PuvLXQQlof62RAkR+XnwUNWyiY bU8g== X-Gm-Message-State: AOJu0YyOah49OCQ0EfTYzXe2PXRoCExT61sLhSF01OYZaG2X/wRMJtpE SS5WyIVScDMJqPUmwbykVuxtzGZLp0w8s5Zao9ffIL/Gv5IujH7M X-Gm-Gg: ASbGnct5jEsxbOr8zG6yXbSZxDfmb7qagYjxw7k1IvpeF/xTsV4zNt5GAf8ofBVrjNa Z36/1SMCBsyecgr+x6ATBB+6TsuTHmQbH9hvoI9LW+DFgMsNhvUQllTOxCcaptb8cr3UsgQhqbJ tZuKaxbyVuVPxHOdNI9n1Wu7CsPdjCnfnyIFB10gvib9rBPQRdRFabdCxMVaqDf/vx7sQ/T6ro1 0yDydadT/cV2GyF914eKM8EYJCds0wIiftA66uKWBAPV/LnbWRekRFpcjhad8MoFyjQ0/XkPN0Z TgGNrZLrA49+kQPcYcjJ+0t6p9B+OJ6vTpFFiw/cxnEK X-Google-Smtp-Source: AGHT+IFiVSTikb7+5mC8s0XQi56tZ1JxiO1qVqO2027wRJ0vqIgODHk92LkukKamYflo5HLAMJxQVA== X-Received: by 2002:a05:6402:84f:b0:5e7:dcab:1df8 with SMTP id 4fb4d7f45d1cf-5e8a0426a94mr12813255a12.26.1742282403823; Tue, 18 Mar 2025 00:20:03 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e81692e5cbsm7129980a12.6.2025.03.18.00.20.02 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Mar 2025 00:20:03 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org, yajun.deng@linux.dev Cc: linux-mm@kvack.org, Wei Yang Subject: [Patch v2 3/3] memblock tests: add test for memblock_set_node Date: Tue, 18 Mar 2025 07:19:48 +0000 Message-Id: <20250318071948.23854-4-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20250318071948.23854-1-richard.weiyang@gmail.com> References: <20250318071948.23854-1-richard.weiyang@gmail.com> X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: osh1zcm9boudxq1pkafa3oqpik19ib6q X-Rspamd-Queue-Id: 9C13540002 X-HE-Tag: 1742282405-138204 X-HE-Meta: U2FsdGVkX19y1duyQYQFHoEDcVn4gULxhHW2RRrkojHVBr8w42clvsoa8c6EAgaWjKwP5ZRjlEL2Tr0KvdDNnZGRfvohXg2BINsMj/QfRYF6xSKCVCJa+nhccFpXoKxzDoiRvXOeTFCUBIdLUl8o2LEuQDDen6Ak1OnJmGHTmGwlzhX/u6NaySUPOTYAYnAs9JOgJTmIidxQX2UKr6DEvQ0gjv/RrigKhUM7t6ix1+jtD6d8OUUGWXgJ/2I2U4Akk9D0gDROEe6W0IgABFkXX8rd9SMKyNdJvjUQUcWHJI5TnzZc31gxppZq3EJTcAliy16+8tLQASo3k4w3fLbjxD36sIvuLRqCRo1aANX7MIusMNAOMuopSPYGWc6/Pu7h6jvzCvhSr25i/JbnJdhp/ZkuSJWs5eGPAe5vDDP0csH/QyyyOmPV3ECIEVPDusT+oBDe6H7wxuiBuUSbk1HkAkTs9YmG+3pXMK5TLriqlPCnwSi9F2O8/WdtcT7Wb9QdSRwGgOrWw1kbS3tOaLShrEHTtNgREHrfiQhnATVC3XfXQgNsk3AhnqG9yaugjEEvCalKMuXYZEbNxP3cay437eumAN2+W3yF6GKmaOVzJHlr0N8CzPVYM9hkHSRV/gx3UmP0oFUy8AahSjIZmrX7gYJrb+BwPp96zL/9ypAJFw/qVKGKC29A16ypOKQiJf7KQEg5y7EM9V4Pt/2H7SrYkPI46MMijCBsxwpZa5Bht5F+QayvBfnJmYO6UCHWqsde2LQT6R1Exmpge5u6LCRo+EoMZ4aDkC4lhlYI2O0OtPYqtDVjrf3RH+7wZV58dG6Q+xbjhGAWN1h+Ow9ztvE7OydrMM6CS59I2pegiUS96FQgmtK7KvDxIOS4FP4codVS0d60zpY6JOlJ62Nf5WIp75eNQtu1DKm4Z7dBJ87UPplryCxxT5ABIxYYOigHCF8jsyJkRtvSa20oVtL5aMh nlrsu4+8 8ppHlGdf9oeLAGbStH/gH+md4QOjZUJjF0iNqJd4e3jNhffD5QEw5d4NWBPnu0bkLoz4dRatMLaVnnaM/zm2wplc5QwNvq5MYl0ONQxDyjYOzOdHe12RwgtvOXdJp3fMeztVSpy/s450uGmQFJwFJAC5VPSFriuP8VrOkTVep1kVNFDGXApAzhWOjhW0Lrs+p/Id2NMUaFGZniOX7sPLSoa1wJSoWxVjjoUX73CvP1Eg6k+mPxmM9braE6WTvX+HAit0OcmIvhhXiskRYzT/XOGo+W7Sae4V6q57KvFVanQLA48PEcRBDvBuV9wSXn9bDpKN0WIqaej7kwJG+oi6MikmAx7mOUiheHLt91RSSPTmjj7a1CEFXTY0tHRI8eAAEqUiXJZSB2UJcDotqb8Ht3QLH5NsOqDR+cg466SSMmxf4fkJzbhUiahHMqpMkUzrefHxNEgGZmDkzT1/AwGQoOLvIkijlSRePJctIj40gHGnNF1ttx6p5TdLDhdajdpLGx0/G2Op3A2iI6OVivs4hL+KW79p4uFOrsnUAj9Ic3O1H7owjItdmBq1X/g== 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 --- v2: move the check out side loop --- 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..01e836fba488 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, max_reserved; + 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: + max_reserved = memblock.reserved.max; + for_each_mem_region(rgn) { + int nid = memblock_get_region_node(rgn); + + memblock_set_node(rgn->base, rgn->size, &memblock.reserved, nid); + } + if (max_reserved != 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; }