From nobody Tue Apr 7 07:09:08 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 1C16EECAAD3 for ; Tue, 30 Aug 2022 01:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbiH3Bvb (ORCPT ); Mon, 29 Aug 2022 21:51:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbiH3BvZ (ORCPT ); Mon, 29 Aug 2022 21:51:25 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC0287C32F for ; Mon, 29 Aug 2022 18:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661824282; x=1693360282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OHdeZU3zCE5Y6OYgb7a7NyVSc9y1tganA4G2YOsk2Ec=; b=AGGoIj3suGhDeQu+hQAiJRSFyloEffLBntv2IBubFt/2wjfDimD6vchW 2Dj+CqlL9kkM5z4/aVtuKKxpVW3i8OAEs0aU4MME7yuHw6upxP33YGzvW +wpA3Hi3qfRBLlPBg3ymNMtQUlH6lV1i0InbPS7AAFyVFIPvy5dKkxrKH AZ7JmGmgHrKk2bsbDnR0OerQuU3Y6KHtbNBkjWIhdEPpfqDd+FngOsA8p paTlFuxTB84vr+pY9Y9Zqw6xlr+3MGcF/A/Ff1w3SWlkfCOT1VnY3Kd+f yKjpiyilPmdnBbNKwokfSvZqWYvwx3AQMFg9qpG5SCOXDAP26yGtU+Fxv A==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="296330181" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="296330181" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 18:51:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641167057" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga008.jf.intel.com with ESMTP; 29 Aug 2022 18:51:10 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Karolina Drobnik , David Hildenbrand , Rebecca Mckeever , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] memblock test: Add test to memblock_add() 129th region Date: Tue, 30 Aug 2022 09:49:17 +0800 Message-Id: <20220830014925.162718-2-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830014925.162718-1-shaoqin.huang@intel.com> References: <20220830014925.162718-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 valid memory region, and fake the other memory region, so 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 | 82 ++++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +- tools/testing/memblock/tests/common.h | 3 + 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index 66f46f261e66..c8e201156cdc 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -326,6 +326,87 @@ static int memblock_add_twice_check(void) return 0; } =20 +/* + * A test that tries 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 memory_base =3D SZ_128K; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + /* + * Add one valid memory region, this will be choosed to be the memory + * that new memory.regions occupied. + */ + dummy_physical_memory_init(); + memblock_add((phys_addr_t)get_memory_block_base(), MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, MEM_SIZE); + + for (i =3D 1; i < INIT_MEMBLOCK_REGIONS; i++) { + /* Add some fakes memory region to fulfill the memblock. */ + memblock_add(memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, i + 1); + ASSERT_EQ(memblock.memory.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.memory.regions; + + /* This adds the 129 memory_region, and makes it double array. */ + memblock_add((phys_addr_t)memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, INIT_MEMBLOCK_REGIONS + 1); + ASSERT_EQ(memblock.memory.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_S= IZE); + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + ASSERT_EQ(memblock.reserved.cnt, 1); + /* This is the size used by new memory.regions. Check it. */ + ASSERT_EQ(memblock.reserved.total_size, PAGE_ALIGN(INIT_MEMBLOCK_REGIONS = * 2 * + sizeof(struct memblock_region))); + + /* The base is very small, so it should be insert to the first region. */ + 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 + 2) * MEM_S= IZE); + 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(); @@ -339,6 +420,7 @@ static int memblock_add_checks(void) memblock_add_overlap_bottom_check(); memblock_add_within_check(); memblock_add_twice_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 76a8ad818f3a..96fabd96ff31 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 @@ -77,6 +75,11 @@ void dummy_physical_memory_cleanup(void) free(memory_block.base); } =20 +void *get_memory_block_base(void) +{ + return 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 d396e5423a8e..d56af621c543 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 /** * ASSERT_EQ(): @@ -73,6 +75,7 @@ void reset_memblock_attributes(void); void setup_memblock(void); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); +void *get_memory_block_base(void); void parse_args(int argc, char **argv); =20 void test_fail(void); --=20 2.34.1 From nobody Tue Apr 7 07:09:08 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 6AB68ECAAD2 for ; Tue, 30 Aug 2022 01:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbiH3Bv2 (ORCPT ); Mon, 29 Aug 2022 21:51:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbiH3BvY (ORCPT ); Mon, 29 Aug 2022 21:51:24 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC49790833 for ; Mon, 29 Aug 2022 18:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661824282; x=1693360282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QVIKac2TXXwtCKl68qr2q3XupTvP7bG4gHMbUWl00rA=; b=m4yUZf2CX9iBIlvyUrHG4NgPaL/RjEj2K4ZSeThdWb5vAnJ4N9LEbitC 4Y6qYAUH5Nq4Gle8adGGmgm29XMpZ3uZx1FN15Qk2W1L3TbSw/ZrwDmqh HO7Qcit92k0HMynmrT+W1JBP0z9lM8vwZhUgz3IJ8oBCuqw2kebcq4rL5 HRpq3NlKWCKqvbPIvJ8pcpnm7VYLHqqVdcjRuUOu562dslHM6kRwF4Ruh nQ0/ce7mXFffp3+AuA2nVEBJDxwD4mMiPic12K22KlIoLnRHP5CJI0crO 6nZQF0vN8xnhoO0a0alD85cGJpbugtUcesKfW/N+nPjvi92i/4zxCZ3rh g==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="296330190" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="296330190" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 18:51:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641167067" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga008.jf.intel.com with ESMTP; 29 Aug 2022 18:51:14 -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 2/3] memblock test: Add test to memblock_reserve() 129th region Date: Tue, 30 Aug 2022 09:49:18 +0800 Message-Id: <20220830014925.162718-3-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830014925.162718-1-shaoqin.huang@intel.com> References: <20220830014925.162718-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 | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index c8e201156cdc..d8defc9866cb 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -686,6 +686,92 @@ static int memblock_reserve_twice_check(void) return 0; } =20 +/* + * A test that tries 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((phys_addr_t)get_memory_block_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 + 1 + 1); + 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); + + /* The base is very small, so it should be insert to the first region. */ + 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 + 2 + 1); + 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(); @@ -698,6 +784,7 @@ static int memblock_reserve_checks(void) memblock_reserve_overlap_bottom_check(); memblock_reserve_within_check(); memblock_reserve_twice_check(); + memblock_reserve_many_check(); =20 prefix_pop(); =20 --=20 2.34.1 From nobody Tue Apr 7 07:09:08 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 5868EECAAD2 for ; Tue, 30 Aug 2022 01:51:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiH3Bvg (ORCPT ); Mon, 29 Aug 2022 21:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229886AbiH3Bv1 (ORCPT ); Mon, 29 Aug 2022 21:51:27 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46BA6A74D9 for ; Mon, 29 Aug 2022 18:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661824285; x=1693360285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=daaV3WZWukjbgGvbQ73mOCe8nI4eaN3LDyARuyKPkhs=; b=j8F+97IQs6V5MXdm25G0kux5PlHq9exmfe9aIXOwaLflFeKBPHDNl3G+ mb7Q/DaBt7YQjBCPz9RuKOQQ3Rm7Aje5Xmw9yuFwqZySnM6lTIvGJtgnJ eCFJsmGm6fhf/S6jxTrgrX6vPL90jx2TrjuHbpRlCuxxmSqSmk7RhnVTn gpvwr7BEu/x14nmrZo7isAFOG+i9cdpdCiuME2Qkn36jeMDPM/9qrwgFG eTqxOF0r34gjDDWYsgFHspCisVH9zsWZ5Nh08KMvDkacT0mG7IOAa3uCq 9tohSjThk2emUBymI5c++mr8ByYtm1y/a/DgRXF+6v/cdfmgFCcZ5d8UU w==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="296330195" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="296330195" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 18:51:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641167077" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga008.jf.intel.com with ESMTP; 29 Aug 2022 18:51:16 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] memblock test: Update TODO list Date: Tue, 30 Aug 2022 09:49:19 +0800 Message-Id: <20220830014925.162718-4-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830014925.162718-1-shaoqin.huang@intel.com> References: <20220830014925.162718-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