From nobody Mon Apr 6 00:17:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1513DC6FA82 for ; Tue, 13 Sep 2022 06:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230468AbiIMGmL (ORCPT ); Tue, 13 Sep 2022 02:42:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230044AbiIMGmI (ORCPT ); Tue, 13 Sep 2022 02:42:08 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F21DB53D3D for ; Mon, 12 Sep 2022 23:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663051327; x=1694587327; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hj1h+6xFFazhwZdF3cst9SX/EiCK6lsmLCgWcuSVcwA=; b=T+ln/3lp/Ts+ye98eY+zPNkoi16jmRe2dZhJVzR8n5TRi5zatP3vw7SY Q2jAD2IhMoZCDtSHQsjJ4XHD1xSW4fBJeUiwqIZbXi2KUeRu0H1KPm5DZ VzsIH+JBgWJdjT3dsotc8btf0By/xS8ANgT/TlZYFNR1uBE4Wp3ITVBZ5 eV20mFOVF3bJ/t3Y2PmPS7KgR/MCuYVDVN4K589mONQeBjmo0bQC6DrUW loEZEAy0wBIZsKSugx2FQ233KmA6/ZAPkS5uxPJmytXQwcqyedhE5yowU SwpnIoVu0FQ5hFJgURiM0bDC9qr5qOzF+7OdomBbgt8LMgdXiJmO9lVwl g==; X-IronPort-AV: E=McAfee;i="6500,9779,10468"; a="324296435" X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="324296435" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 23:41:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="678428774" Received: from q.bj.intel.com ([10.238.154.102]) by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2022 23:41:49 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Karolina Drobnik , Rebecca Mckeever , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] memblock test: Add test to memblock_add() 129th region Date: Tue, 13 Sep 2022 14:41:30 +0800 Message-Id: <20220913064138.407601-2-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220913064138.407601-1-shaoqin.huang@intel.com> References: <20220913064138.407601-1-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Shaoqin Huang Add 129th region into the memblock, and this will trigger the memblock_double_array() function, this needs valid memory regions. So using dummy_physical_memory_init() to allocate a large enough memory region, and split it into a large enough memory which can be choosed by memblock_double_array(), and the left memory will be split into small memory region, and add them into the memblock. It make sure the memblock_double_array() will always choose the valid memory region that is allocated by the dummy_physical_memory_init(). So memblock_double_array() must success. Another thing should be done is to restore the memory.regions after memblock_double_array(), due to now the memory.regions is pointing to a memory region allocated by dummy_physical_memory_init(). And it will affect the subsequent tests if we don't restore the memory region. So simply record the origin region, and restore it after the test. Signed-off-by: Shaoqin Huang --- tools/testing/memblock/tests/basic_api.c | 96 ++++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +- tools/testing/memblock/tests/common.h | 3 + 3 files changed, 104 insertions(+), 2 deletions(-) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index a13a57ba0815..7120fd8e47b1 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -423,6 +423,101 @@ static int memblock_add_near_max_check(void) return 0; } =20 +/* + * A test that trying to add the 129th memory block. + * Expect to trigger memblock_double_array() to double the + * memblock.memory.max, find a new valid memory as + * memory.regions. + */ +static int memblock_add_many_check(void) +{ + int i; + void *orig_region; + struct region r =3D { + .base =3D SZ_16K, + .size =3D MEM_SIZE, + }; + phys_addr_t new_memory_regions_size; + phys_addr_t base, size, block_size; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + dummy_physical_memory_init(); + /* + * We allocated enough memory by using dummy_physical_memory_init(), and + * split it into small block. First we split a large enough memory block + * as the memory region which will be choosed by memblock_double_array(). + */ + base =3D PAGE_ALIGN(dummy_physical_memory_base()); + new_memory_regions_size =3D PAGE_ALIGN(INIT_MEMBLOCK_REGIONS * 2 * + sizeof(struct memblock_region)); + memblock_add(base, new_memory_regions_size); + + /* + * For the left memory, we split them into small block and add them into + * memblock later. + */ + base +=3D new_memory_regions_size; + size =3D MEM_SIZE - new_memory_regions_size; + block_size =3D size / (INIT_MEMBLOCK_REGIONS * 2); + + orig_region =3D memblock.memory.regions; + + for (i =3D 0; i < INIT_MEMBLOCK_REGIONS; i++) { + /* + * Add these small block to fulfill the memblock. We keep an + * interval between the nearby memory to avoid being merged. + */ + memblock_add(base + block_size * (2 * i + 1), block_size); + + ASSERT_EQ(memblock.memory.cnt, i + 2); + ASSERT_EQ(memblock.memory.total_size, new_memory_regions_size + + (i + 1) * block_size); + } + + /* + * At there, memblock_double_array() has been succeed, check if it + * update the memory.max. + */ + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + /* memblock_double_array() will reserve the memory it used. Check it. */ + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, new_memory_regions_size); + + /* + * Now memblock_double_array() works fine. Let's check after the + * double_array(), the memblock_add() still works as normal. + */ + memblock_add(r.base, r.size); + ASSERT_EQ(memblock.memory.regions[0].base, r.base); + ASSERT_EQ(memblock.memory.regions[0].size, r.size); + + ASSERT_EQ(memblock.memory.cnt, INIT_MEMBLOCK_REGIONS + 2); + ASSERT_EQ(memblock.memory.total_size, INIT_MEMBLOCK_REGIONS * block_size + + new_memory_regions_size + + MEM_SIZE); + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + dummy_physical_memory_cleanup(); + + /* + * The current memory.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.memory.regions =3D orig_region; + memblock.memory.cnt =3D INIT_MEMBLOCK_REGIONS; + + test_pass_pop(); + + return 0; +} + static int memblock_add_checks(void) { prefix_reset(); @@ -438,6 +533,7 @@ static int memblock_add_checks(void) memblock_add_twice_check(); memblock_add_between_check(); memblock_add_near_max_check(); + memblock_add_many_check(); =20 prefix_pop(); =20 diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock= /tests/common.c index eec6901081af..2de6a2b6efd2 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -5,8 +5,6 @@ #include #include =20 -#define INIT_MEMBLOCK_REGIONS 128 -#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS #define PREFIXES_MAX 15 #define DELIM ": " =20 @@ -84,6 +82,11 @@ void dummy_physical_memory_cleanup(void) free(memory_block.base); } =20 +phys_addr_t dummy_physical_memory_base(void) +{ + return (phys_addr_t)memory_block.base; +} + static void usage(const char *prog) { BUILD_BUG_ON(ARRAY_SIZE(help_opts) !=3D ARRAY_SIZE(long_opts) - 1); diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index 78128e109a95..ba14dc989ae9 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -11,6 +11,8 @@ #include <../selftests/kselftest.h> =20 #define MEM_SIZE SZ_16K +#define INIT_MEMBLOCK_REGIONS 128 +#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS =20 enum test_flags { /* No special request. */ @@ -104,6 +106,7 @@ void reset_memblock_attributes(void); void setup_memblock(void); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); +phys_addr_t dummy_physical_memory_base(void); void parse_args(int argc, char **argv); =20 void test_fail(void); --=20 2.34.1 From nobody Mon Apr 6 00:17:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 286B6C6FA82 for ; Tue, 13 Sep 2022 06:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230095AbiIMGmQ (ORCPT ); Tue, 13 Sep 2022 02:42:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbiIMGmM (ORCPT ); Tue, 13 Sep 2022 02:42:12 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 586DF58526 for ; Mon, 12 Sep 2022 23:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663051331; x=1694587331; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C4y1rYIKX4fqF3zCci/fAjCkU8Jw0wyitSdCTFzi5Ss=; b=mjSob+YMQYY64k3ihyki+pZfl863gax3uHEjNt2/LFUbjM7KgfQV0CMI e1JsANF+WLhlHPLUZL6UmH1pwOuFf7WHhM5sgZJ2L9yIagDQIAE7f6Kmt NTVzMysNuxmVzv0TYZfmgzTy+vPAFOfm1tp7Dlqxthp4KLzGFCgq02PJx UGrJIrsrS9bHgpKrYWv+d7ryZu37wzzXLDmQQAn0SWDLAC7ODY6O2nJZY nWdeV3V6kkCRnib5B3FFIf0XlHMxK6mOdEFGf8nrPA8OnQlW9TCQJvEmu 0kqdbjzm47icjKmow91RVNIuS6oRb6u5ujoHfzKkDs6Tvg85OmuuSRCnh A==; X-IronPort-AV: E=McAfee;i="6500,9779,10468"; a="324296478" X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="324296478" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 23:41:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="678428866" Received: from q.bj.intel.com ([10.238.154.102]) by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2022 23:41:53 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Karolina Drobnik , Rebecca Mckeever , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] memblock test: Add test to memblock_reserve() 129th region Date: Tue, 13 Sep 2022 14:41:31 +0800 Message-Id: <20220913064138.407601-3-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220913064138.407601-1-shaoqin.huang@intel.com> References: <20220913064138.407601-1-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Shaoqin Huang Reserve 129th region in the memblock, and this will trigger the memblock_double_array() function, this needs valid memory regions. So using dummy_physical_memory_init() to allocate a valid memory region. At the same time, reserve 128 faked memory region, and make sure these reserved region not intersect with the valid memory region. So memblock_double_array() will choose the valid memory region, and it will success. Also need to restore the reserved.regions after memblock_double_array(), to make sure the subsequent tests can run as normal. Signed-off-by: Shaoqin Huang --- tools/testing/memblock/tests/basic_api.c | 90 ++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index 7120fd8e47b1..1924524ad868 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -895,6 +895,95 @@ static int memblock_reserve_near_max_check(void) return 0; } =20 +/* + * A test that trying to reserve the 129th memory block. + * Expect to trigger memblock_double_array() to double the + * memblock.memory.max, find a new valid memory as + * reserved.regions. + */ +static int memblock_reserve_many_check(void) +{ + int i; + void *orig_region; + struct region r =3D { + .base =3D SZ_16K, + .size =3D MEM_SIZE, + }; + phys_addr_t memory_base =3D SZ_128K; + phys_addr_t new_reserved_regions_size; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + /* Add a valid memory region used by double_array(). */ + dummy_physical_memory_init(); + memblock_add(dummy_physical_memory_base(), MEM_SIZE); + + for (i =3D 0; i < INIT_MEMBLOCK_REGIONS; i++) { + /* Reserve some fakes memory region to fulfill the memblock. */ + memblock_reserve(memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.reserved.cnt, i + 1); + ASSERT_EQ(memblock.reserved.total_size, (i + 1) * MEM_SIZE); + + /* Keep the gap so these memory region will not be merged. */ + memory_base +=3D MEM_SIZE * 2; + } + + orig_region =3D memblock.reserved.regions; + + /* This reserve the 129 memory_region, and makes it double array. */ + memblock_reserve(memory_base, MEM_SIZE); + + /* + * This is the memory region size used by the doubled reserved.regions, + * and it has been reserved due to it has been used. The size is used to + * calculate the total_size that the memblock.reserved have now. + */ + new_reserved_regions_size =3D PAGE_ALIGN((INIT_MEMBLOCK_REGIONS * 2) * + sizeof(struct memblock_region)); + /* + * The double_array() will find a free memory region as the new + * reserved.regions, and the used memory region will be reserved, so + * there will be one more region exist in the reserved memblock. And the + * one more reserved region's size is new_reserved_regions_size. + */ + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 2); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM= _SIZE + + new_reserved_regions_size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + /* + * Now memblock_double_array() works fine. Let's check after the + * double_array(), the memblock_reserve() still works as normal. + */ + memblock_reserve(r.base, r.size); + ASSERT_EQ(memblock.reserved.regions[0].base, r.base); + ASSERT_EQ(memblock.reserved.regions[0].size, r.size); + + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 3); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 2) * MEM= _SIZE + + new_reserved_regions_size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + 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 =3D orig_region; + memblock.reserved.cnt =3D INIT_MEMBLOCK_REGIONS; + + test_pass_pop(); + + return 0; +} + static int memblock_reserve_checks(void) { prefix_reset(); @@ -909,6 +998,7 @@ static int memblock_reserve_checks(void) memblock_reserve_twice_check(); memblock_reserve_between_check(); memblock_reserve_near_max_check(); + memblock_reserve_many_check(); =20 prefix_pop(); =20 --=20 2.34.1 From nobody Mon Apr 6 00:17:15 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45C9AC6FA82 for ; Tue, 13 Sep 2022 06:42:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230432AbiIMGmT (ORCPT ); Tue, 13 Sep 2022 02:42:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230044AbiIMGmM (ORCPT ); Tue, 13 Sep 2022 02:42:12 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D9FD5852E for ; Mon, 12 Sep 2022 23:42:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663051332; x=1694587332; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=daaV3WZWukjbgGvbQ73mOCe8nI4eaN3LDyARuyKPkhs=; b=A1ALKGTk+MhkveQQTPMPCvDK6KF7/sGi7vIy244Sf2VqBCENdSeaSiFF zWkiMTnh47/+4Tape8FuLt0/VJUGJj44KlNZ6hurgKpw4/X6ZTWJ/fV6X XLftWTc8AHrO0bBqI2iiQubK6G25LA22RqGaML4x2kgcZ+NEVzzRjiYVc yxfdfpKp2inuOCkOAaIwSHy0Y511FH2JanIjU1pLx2/KxJ860q0sxtZ+2 vwzx9CLM19+jSjd4JSTvNXy0kjGASnD7gwES5qkVapNgelAHt3fD+UnOa CrC1+4QK4qtNdjSnu3Ukal9+yCvjSEjwQytM/+QkTexwyOTIooEhiT4Gy g==; X-IronPort-AV: E=McAfee;i="6500,9779,10468"; a="324296495" X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="324296495" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 23:41:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="678428897" Received: from q.bj.intel.com ([10.238.154.102]) by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2022 23:41:56 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] memblock test: Update TODO list Date: Tue, 13 Sep 2022 14:41:32 +0800 Message-Id: <20220913064138.407601-4-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220913064138.407601-1-shaoqin.huang@intel.com> References: <20220913064138.407601-1-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Shaoqin Huang Remove the completed items from TODO list. Signed-off-by: Shaoqin Huang --- tools/testing/memblock/TODO | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/testing/memblock/TODO b/tools/testing/memblock/TODO index 33044c634ea7..503cc96fcdc3 100644 --- a/tools/testing/memblock/TODO +++ b/tools/testing/memblock/TODO @@ -1,17 +1,10 @@ TODO =3D=3D=3D=3D=3D =20 -1. Add tests trying to memblock_add() or memblock_reserve() 129th region. - This will trigger memblock_double_array(), make sure it succeeds. - *Important:* These tests require valid memory ranges, use dummy physical - memory block from common.c to implement them. It is also v= ery - likely that the current MEM_SIZE won't be enough for these - test cases. Use realloc to adjust the size accordingly. - -2. Add test cases using this functions (implement them for both directions= ): +1. Add test cases using this functions (implement them for both directions= ): + memblock_alloc_raw() + memblock_alloc_exact_nid_raw() + memblock_alloc_try_nid_raw() =20 -3. Add tests for memblock_alloc_node() to check if the correct NUMA node i= s set +2. Add tests for memblock_alloc_node() to check if the correct NUMA node i= s set for the new region --=20 2.34.1