From nobody Sun Apr 19 20:31: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 8AA8ECCA47B for ; Mon, 27 Jun 2022 22:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242701AbiF0WfS (ORCPT ); Mon, 27 Jun 2022 18:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242689AbiF0WfO (ORCPT ); Mon, 27 Jun 2022 18:35:14 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8515186DD for ; Mon, 27 Jun 2022 15:35:13 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id m24-20020a0568301e7800b00616b5c114d4so6618362otr.11 for ; Mon, 27 Jun 2022 15:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xzFZy7EobE569rOuuG/ggjMqoyz7vEjB3IIrzWyAvt8=; b=Xh27ketfaXEFOC6DK+tiYw5iMMoL/8r1KDSWyHu9v+GhHyClT1FLNSK4ljf9Y7opT3 v/E9krxlR5R+3Po9ayj1brra3jRWV7Gg3G/w9YXFAJHKr+PlLsUVMAbqwlcpIYska0QE bPNG87vmig13yB02ng9WgITScuYvnQCF7R29/blPfnzf+7uiaxqn0EiO+tPji3P0Bkyu 3QzsOt0/pixEt/PYrZqtMlnLax3JHtov76tNg7JpP+gplIdXd5U/iewKIT5qUlRP2Yvl B/aSqffVOJRBVOMqbaXZhW2ybGWM24YpYQsOpNP0gI1p0tfDjtbt9I93BnaXBhF5yIfC y7vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xzFZy7EobE569rOuuG/ggjMqoyz7vEjB3IIrzWyAvt8=; b=vw9CBQSOSMxhcDUm4dX6PoCMgmxwO6qHa9uGtsw1fHMcaKeofPYrH91srvAwRUanvp OUZUVGv4wZt1KeYhueVVB8jB2nbMGfNO+ItlXUrBtr1m3j2wuH9WRcxs3LgWCTLNr10B TZRRXF1wYCCWDAsV9KFk7mXI71AvgvOcn3pExx+2CQYe7v9vfujiJjpzNSLIk2lpGi0D rnl6WSWAWmewGqDO0+Yf+XvPfHWR3IxL2Vqov7hYT7tAnsblwsgTQYngCBH+A0TXYv7f elpB9zIaxTzzWvHfub0uyUEU2ItAnOytf6BuqUrbETK1NBz8EzHG1RFTi01ivOlJzHA/ lA9g== X-Gm-Message-State: AJIora+CS2ACtYSD80kgA8X5verhp44LYF4er7HgTRGaJ+kQcMgIabnF ySifUD90cGPzhLzrEU32IzTuMiYH8U4= X-Google-Smtp-Source: AGRyM1s34ggEikw34W5Mov+HOaasnI898DPmxdgNgkQk0hun/YjDp5qnH9KAnLWB+U4TtjKK/hFk8w== X-Received: by 2002:a9d:2da4:0:b0:616:8feb:6293 with SMTP id g33-20020a9d2da4000000b006168feb6293mr6788371otb.222.1656369313117; Mon, 27 Jun 2022 15:35:13 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id o7-20020a056870524700b0010897986b82sm3470666oai.2.2022.06.27.15.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 15:35:12 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v4 1/4] memblock tests: Makefile: add arguments to control verbosity Date: Mon, 27 Jun 2022 17:34:27 -0500 Message-Id: <5503f3efe82ecef5c99961a1d53003c8ad06cf27.1656368930.git.remckee0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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" Add VERBOSE and MEMBLOCK_DEBUG user-provided arguments. VERBOSE will enable verbose output from Memblock simulator. MEMBLOCK_DEBUG will enable memblock_dbg() messages. Update the help message to include VERBOSE and MEMBLOCK_DEBUG. Update the README to include VERBOSE. The README does not include all available options and refers to the help message for the remaining options. Therefore, omit MEMBLOCK_DEBUG from README. Reviewed-by: David Hildenbrand Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/Makefile | 4 ++++ tools/testing/memblock/README | 10 +++++++++- tools/testing/memblock/scripts/Makefile.include | 10 ++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/testing/memblock/Makefile b/tools/testing/memblock/Makef= ile index a698e24b35e7..9fde49ad73bd 100644 --- a/tools/testing/memblock/Makefile +++ b/tools/testing/memblock/Makefile @@ -45,6 +45,10 @@ help: @echo ' clean - Remove generated files and symlinks in the directory' @echo '' @echo 'Configuration:' + @echo ' make VERBOSE=3D1 - enable verbose output, which incl= udes the' + @echo ' names of functions being tested and= the' + @echo ' number of test cases passing' + @echo ' make MEMBLOCK_DEBUG=3D1 - enable memblock_dbg() messages' @echo ' make NUMA=3D1 - simulate enabled NUMA' @echo ' make MOVABLE_NODE=3D1 - override `movable_node_is_enabled= `' @echo ' definition to simulate movable NUMA= nodes' diff --git a/tools/testing/memblock/README b/tools/testing/memblock/README index ca6afcff013a..058146b528a5 100644 --- a/tools/testing/memblock/README +++ b/tools/testing/memblock/README @@ -34,7 +34,15 @@ To run the tests, build the main target and run it: $ make && ./main =20 A successful run produces no output. It is also possible to override diffe= rent -configuration parameters. For example, to simulate enabled NUMA, use: +configuration parameters. For example, to include verbose output, specify = the +VERBOSE flag when building the main target: + +$ make VERBOSE=3D1 + +This will print information about which functions are being tested and the +number of test cases that passed. + +To simulate enabled NUMA, use: =20 $ make NUMA=3D1 =20 diff --git a/tools/testing/memblock/scripts/Makefile.include b/tools/testin= g/memblock/scripts/Makefile.include index 641569ccb7b0..4401f79bed4c 100644 --- a/tools/testing/memblock/scripts/Makefile.include +++ b/tools/testing/memblock/scripts/Makefile.include @@ -17,3 +17,13 @@ ifeq ($(32BIT_PHYS_ADDR_T), 1) CFLAGS +=3D -m32 -U CONFIG_PHYS_ADDR_T_64BIT LDFLAGS +=3D -m32 endif + +# Enable verbose testing output +ifeq ($(VERBOSE), 1) + CFLAGS +=3D -D VERBOSE +endif + +# Enable memblock_dbg() messages +ifeq ($(MEMBLOCK_DEBUG), 1) + CFLAGS +=3D -D MEMBLOCK_DEBUG +endif --=20 2.34.1 From nobody Sun Apr 19 20:31: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 35CE8C43334 for ; Mon, 27 Jun 2022 22:35:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242730AbiF0Wfb (ORCPT ); Mon, 27 Jun 2022 18:35:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242709AbiF0WfV (ORCPT ); Mon, 27 Jun 2022 18:35:21 -0400 Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0661C12A for ; Mon, 27 Jun 2022 15:35:17 -0700 (PDT) Received: by mail-ot1-x341.google.com with SMTP id cb12-20020a056830618c00b00616b871cef3so6149214otb.5 for ; Mon, 27 Jun 2022 15:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Eiy+E7d5gH4Hw5Aw+/l38/K/wWnsxkO1Xpc73WbuH4=; b=INs7/kMzxDzlOd0wT3k1AZTK19Ews0cKEOjcU0ImSapX1qqdekfUnplRSijHbVGjZk 26UFrjYbkiibXO1EMeyZFGHETm0RiSXff00MGsEmcpJZeY9JGMi0XxBaRp5hKWY4SpLF 5AWIySRTiNPIGK+dcBx51KtbHTzQkbLtgxfQ5dB2Fzc+tY2CajOD/VZMJc7BsDyJKWvl wNkRYtp3TmN/wNM/inax5jrtG7Vwy72SNjnE9CmkUfOMrCf0FJKyRAAiVC+TervljDEN mX4flsKZrJTLK8dyNLZo1vwzE9+DX7hrBGK+pA/9xFdKZ5h8+FddO89fvf9czSQYFjO9 DXvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Eiy+E7d5gH4Hw5Aw+/l38/K/wWnsxkO1Xpc73WbuH4=; b=LbtPOurUnbv0VFnVWUFLlk4kxBLKHPU/Gr6j8AcSGP39aeRKvwVaBdZMBxrOP7Wev0 xuPck1ylzofK4mKVPE6GkO3ASvUhjh4txit6VEH/T3OIEsv80OnqAactD5UV5fW5dkro 8wG19rYlbT4HoKpJGMdollZmGsKSQXHgo7bPKo7MmPxVuw2YLQ+/MGmYMIwnLP86s28o jeu7zEeqUoJVeCpI19hPS0rvWF5ywKOX3q6WoQAQXOyGIQ5VGsuKqotkDZPb+5zlOHuW NqS34HMw+clpsePnRdiH0b6eo1ezqga3yYe/iokpmwKggHNsEP4IU1CINXjIn+qMBwl8 9eHQ== X-Gm-Message-State: AJIora9kOFrGpCv48pu/mhVyEN5pPgvU282F4zeFewXgxCG2Qmn2JvTH vzmUXkrwJXQea3fRRcX5HFc= X-Google-Smtp-Source: AGRyM1ugpCOxXcb50LT+1lWV2mO9bG0vBDxCRYD5U3fwqvx6I3CKkWEkMyRx0rpKgaxwaaAyqo+3YA== X-Received: by 2002:a9d:7646:0:b0:616:c17c:7d26 with SMTP id o6-20020a9d7646000000b00616c17c7d26mr5203854otl.83.1656369315964; Mon, 27 Jun 2022 15:35:15 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id b11-20020a9d60cb000000b00616dfd2c859sm678355otk.59.2022.06.27.15.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 15:35:15 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v4 2/4] memblock tests: add verbose output to memblock tests Date: Mon, 27 Jun 2022 17:34:28 -0500 Message-Id: <883c28e34527fd4cdc55df97c791ed8b2e79538d.1656368930.git.remckee0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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" Add and use functions and macros for printing verbose testing output. If the Memblock simulator was compiled with VERBOSE=3D1: - prefix_push(): appends the given string to a prefix string that will be printed in test_fail() and test_pass*(). - prefix_pop(): removes the last prefix from the prefix string. - prefix_reset(): clears the prefix string. - test_fail(): prints a message after a test fails containing the test number of the failing test and the prefix. - test_pass(): prints a message after a test passes containing its test number and the prefix. - test_print(): prints the given formatted output string. - test_pass_pop(): runs test_pass() followed by prefix_pop(). - PREFIX_PUSH(): runs prefix_push(__func__). If the Memblock simulator was not compiled with VERBOSE=3D1, these functions/macros do nothing. Add the assert wrapper macros ASSERT_EQ(), ASSERT_NE(), and ASSERT_LT(). If the assert condition fails, these macros call test_fail() before executing assert(). Signed-off-by: Rebecca Mckeever Acked-by: David Hildenbrand Reviewed-by: Shaoqin Huang --- tools/testing/memblock/tests/alloc_api.c | 225 +++++++---- .../memblock/tests/alloc_helpers_api.c | 129 ++++--- tools/testing/memblock/tests/alloc_nid_api.c | 351 +++++++++++------- tools/testing/memblock/tests/basic_api.c | 337 +++++++++++------ tools/testing/memblock/tests/common.c | 58 +++ tools/testing/memblock/tests/common.h | 62 ++++ 6 files changed, 818 insertions(+), 344 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index d1aa7e15c18d..a14f38eb8a89 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -10,6 +10,8 @@ static int alloc_top_down_simple_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_2; phys_addr_t expected_start; =20 @@ -19,12 +21,14 @@ static int alloc_top_down_simple_check(void) =20 allocated_ptr =3D memblock_alloc(size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D expected_start); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, expected_start); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -55,6 +59,8 @@ static int alloc_top_down_disjoint_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r2_size =3D SZ_16; /* Use custom alignment */ phys_addr_t alignment =3D SMP_CACHE_BYTES * 2; @@ -73,15 +79,17 @@ static int alloc_top_down_disjoint_check(void) =20 allocated_ptr =3D memblock_alloc(r2_size, alignment); =20 - assert(allocated_ptr); - assert(rgn1->size =3D=3D r1.size); - assert(rgn1->base =3D=3D r1.base); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn1->size, r1.size); + ASSERT_EQ(rgn1->base, r1.base); =20 - assert(rgn2->size =3D=3D r2_size); - assert(rgn2->base =3D=3D expected_start); + ASSERT_EQ(rgn2->size, r2_size); + ASSERT_EQ(rgn2->base, expected_start); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -101,6 +109,8 @@ static int alloc_top_down_before_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + /* * The first region ends at the aligned address to test region merging */ @@ -114,12 +124,14 @@ static int alloc_top_down_before_check(void) =20 allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D memblock_end_of_DRAM() - total_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -141,6 +153,8 @@ static int alloc_top_down_after_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r2_size =3D SZ_512; phys_addr_t total_size; =20 @@ -158,12 +172,14 @@ static int alloc_top_down_after_check(void) =20 allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D r1.base - r2_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, r1.base - r2_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -186,6 +202,8 @@ static int alloc_top_down_second_fit_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_1K; phys_addr_t total_size; =20 @@ -204,12 +222,14 @@ static int alloc_top_down_second_fit_check(void) =20 allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D r2.size + r3_size); - assert(rgn->base =3D=3D r2.base - r3_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, r2.size + r3_size); + ASSERT_EQ(rgn->base, r2.base - r3_size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -231,6 +251,8 @@ static int alloc_in_between_generic_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t r3_size =3D SZ_64; /* @@ -254,12 +276,14 @@ static int alloc_in_between_generic_check(void) =20 allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D r1.base - r2.size - r3_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -281,6 +305,8 @@ static int alloc_small_gaps_generic_check(void) { void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t region_size =3D SZ_1K; phys_addr_t gap_size =3D SZ_256; phys_addr_t region_end; @@ -296,7 +322,9 @@ static int alloc_small_gaps_generic_check(void) =20 allocated_ptr =3D memblock_alloc(region_size, SMP_CACHE_BYTES); =20 - assert(!allocated_ptr); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); =20 return 0; } @@ -309,6 +337,8 @@ static int alloc_all_reserved_generic_check(void) { void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + setup_memblock(); =20 /* Simulate full memory */ @@ -316,7 +346,9 @@ static int alloc_all_reserved_generic_check(void) =20 allocated_ptr =3D memblock_alloc(SZ_256, SMP_CACHE_BYTES); =20 - assert(!allocated_ptr); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); =20 return 0; } @@ -338,6 +370,8 @@ static int alloc_no_space_generic_check(void) { void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + setup_memblock(); =20 phys_addr_t available_size =3D SZ_256; @@ -348,7 +382,9 @@ static int alloc_no_space_generic_check(void) =20 allocated_ptr =3D memblock_alloc(SZ_1K, SMP_CACHE_BYTES); =20 - assert(!allocated_ptr); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); =20 return 0; } @@ -369,6 +405,8 @@ static int alloc_limited_space_generic_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t available_size =3D SZ_256; phys_addr_t reserved_size =3D MEM_SIZE - available_size; =20 @@ -379,12 +417,14 @@ static int alloc_limited_space_generic_check(void) =20 allocated_ptr =3D memblock_alloc(available_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D MEM_SIZE); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, MEM_SIZE); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, MEM_SIZE); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D MEM_SIZE); + test_pass_pop(); =20 return 0; } @@ -399,14 +439,18 @@ static int alloc_no_memory_generic_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + reset_memblock_regions(); =20 allocated_ptr =3D memblock_alloc(SZ_1K, SMP_CACHE_BYTES); =20 - assert(!allocated_ptr); - assert(rgn->size =3D=3D 0); - assert(rgn->base =3D=3D 0); - assert(memblock.reserved.total_size =3D=3D 0); + ASSERT_EQ(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, 0); + ASSERT_EQ(rgn->base, 0); + ASSERT_EQ(memblock.reserved.total_size, 0); + + test_pass_pop(); =20 return 0; } @@ -421,16 +465,20 @@ static int alloc_bottom_up_simple_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + setup_memblock(); =20 allocated_ptr =3D memblock_alloc(SZ_2, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D SZ_2); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, SZ_2); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D SZ_2); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, SZ_2); + + test_pass_pop(); =20 return 0; } @@ -459,6 +507,8 @@ static int alloc_bottom_up_disjoint_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r2_size =3D SZ_16; /* Use custom alignment */ phys_addr_t alignment =3D SMP_CACHE_BYTES * 2; @@ -477,16 +527,18 @@ static int alloc_bottom_up_disjoint_check(void) =20 allocated_ptr =3D memblock_alloc(r2_size, alignment); =20 - assert(allocated_ptr); + ASSERT_NE(allocated_ptr, NULL); =20 - assert(rgn1->size =3D=3D r1.size); - assert(rgn1->base =3D=3D r1.base); + ASSERT_EQ(rgn1->size, r1.size); + ASSERT_EQ(rgn1->base, r1.base); =20 - assert(rgn2->size =3D=3D r2_size); - assert(rgn2->base =3D=3D expected_start); + ASSERT_EQ(rgn2->size, r2_size); + ASSERT_EQ(rgn2->base, expected_start); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -506,6 +558,8 @@ static int alloc_bottom_up_before_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_512; phys_addr_t r2_size =3D SZ_128; phys_addr_t total_size =3D r1_size + r2_size; @@ -516,12 +570,14 @@ static int alloc_bottom_up_before_check(void) =20 allocated_ptr =3D memblock_alloc(r1_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -542,6 +598,8 @@ static int alloc_bottom_up_after_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r2_size =3D SZ_512; phys_addr_t total_size; =20 @@ -559,12 +617,14 @@ static int alloc_bottom_up_after_check(void) =20 allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D r1.base); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, r1.base); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -588,6 +648,8 @@ static int alloc_bottom_up_second_fit_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_1K; phys_addr_t total_size; =20 @@ -606,12 +668,14 @@ static int alloc_bottom_up_second_fit_check(void) =20 allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D r2.size + r3_size); - assert(rgn->base =3D=3D r2.base); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, r2.size + r3_size); + ASSERT_EQ(rgn->base, r2.base); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -619,6 +683,7 @@ static int alloc_bottom_up_second_fit_check(void) /* Test case wrappers */ static int alloc_simple_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_top_down_simple_check(); memblock_set_bottom_up(true); @@ -629,6 +694,7 @@ static int alloc_simple_check(void) =20 static int alloc_disjoint_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_top_down_disjoint_check(); memblock_set_bottom_up(true); @@ -639,6 +705,7 @@ static int alloc_disjoint_check(void) =20 static int alloc_before_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_top_down_before_check(); memblock_set_bottom_up(true); @@ -649,6 +716,7 @@ static int alloc_before_check(void) =20 static int alloc_after_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_top_down_after_check(); memblock_set_bottom_up(true); @@ -659,6 +727,7 @@ static int alloc_after_check(void) =20 static int alloc_in_between_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_in_between_generic_check(); memblock_set_bottom_up(true); @@ -669,6 +738,7 @@ static int alloc_in_between_check(void) =20 static int alloc_second_fit_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_top_down_second_fit_check(); memblock_set_bottom_up(true); @@ -679,6 +749,7 @@ static int alloc_second_fit_check(void) =20 static int alloc_small_gaps_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_small_gaps_generic_check(); memblock_set_bottom_up(true); @@ -689,6 +760,7 @@ static int alloc_small_gaps_check(void) =20 static int alloc_all_reserved_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_all_reserved_generic_check(); memblock_set_bottom_up(true); @@ -699,6 +771,7 @@ static int alloc_all_reserved_check(void) =20 static int alloc_no_space_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_no_space_generic_check(); memblock_set_bottom_up(true); @@ -709,6 +782,7 @@ static int alloc_no_space_check(void) =20 static int alloc_limited_space_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_limited_space_generic_check(); memblock_set_bottom_up(true); @@ -719,6 +793,7 @@ static int alloc_limited_space_check(void) =20 static int alloc_no_memory_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_no_memory_generic_check(); memblock_set_bottom_up(true); @@ -729,6 +804,12 @@ static int alloc_no_memory_check(void) =20 int memblock_alloc_checks(void) { + const char *func_testing =3D "memblock_alloc"; + + prefix_reset(); + prefix_push(func_testing); + test_print("Running %s tests...\n", func_testing); + reset_memblock_attributes(); dummy_physical_memory_init(); =20 @@ -746,5 +827,7 @@ int memblock_alloc_checks(void) =20 dummy_physical_memory_cleanup(); =20 + prefix_pop(); + return 0; } diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testi= ng/memblock/tests/alloc_helpers_api.c index 963a966db461..1069b4bdd5fd 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -21,6 +21,8 @@ static int alloc_from_simple_generic_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_16; phys_addr_t min_addr; =20 @@ -31,14 +33,16 @@ static int alloc_from_simple_generic_check(void) allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, min_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D min_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -64,6 +68,8 @@ static int alloc_from_misaligned_generic_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -75,14 +81,16 @@ static int alloc_from_misaligned_generic_check(void) allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_end_of_DRAM() - SMP_CACHE_BYTES); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); + + test_pass_pop(); =20 return 0; } @@ -110,6 +118,8 @@ static int alloc_from_top_down_high_addr_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -120,12 +130,14 @@ static int alloc_from_top_down_high_addr_check(void) =20 allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_end_of_DRAM() - SMP_CACHE_BYTES); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); + + test_pass_pop(); =20 return 0; } @@ -151,6 +163,8 @@ static int alloc_from_top_down_no_space_above_check(voi= d) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_64; phys_addr_t r2_size =3D SZ_2; phys_addr_t total_size =3D r1_size + r2_size; @@ -165,12 +179,14 @@ static int alloc_from_top_down_no_space_above_check(v= oid) =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->base =3D=3D min_addr - r1_size); - assert(rgn->size =3D=3D total_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->base, min_addr - r1_size); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -186,6 +202,8 @@ static int alloc_from_top_down_min_addr_cap_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t start_addr; @@ -199,12 +217,14 @@ static int alloc_from_top_down_min_addr_cap_check(voi= d) =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->base =3D=3D start_addr); - assert(rgn->size =3D=3D MEM_SIZE); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->base, start_addr); + ASSERT_EQ(rgn->size, MEM_SIZE); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, MEM_SIZE); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D MEM_SIZE); + test_pass_pop(); =20 return 0; } @@ -230,6 +250,8 @@ static int alloc_from_bottom_up_high_addr_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -240,12 +262,14 @@ static int alloc_from_bottom_up_high_addr_check(void) =20 allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -270,6 +294,8 @@ static int alloc_from_bottom_up_no_space_above_check(vo= id) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t r2_size; @@ -284,12 +310,14 @@ static int alloc_from_bottom_up_no_space_above_check(= void) =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); - assert(rgn->size =3D=3D r1_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); + ASSERT_EQ(rgn->size, r1_size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D r1_size + r2_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, r1_size + r2_size); + + test_pass_pop(); =20 return 0; } @@ -304,6 +332,8 @@ static int alloc_from_bottom_up_min_addr_cap_check(void) struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t start_addr; @@ -315,12 +345,14 @@ static int alloc_from_bottom_up_min_addr_cap_check(vo= id) =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 - assert(allocated_ptr); - assert(rgn->base =3D=3D start_addr); - assert(rgn->size =3D=3D r1_size); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(rgn->base, start_addr); + ASSERT_EQ(rgn->size, r1_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D r1_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, r1_size); + + test_pass_pop(); =20 return 0; } @@ -328,6 +360,7 @@ static int alloc_from_bottom_up_min_addr_cap_check(void) /* Test case wrappers */ static int alloc_from_simple_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_from_simple_generic_check(); memblock_set_bottom_up(true); @@ -338,6 +371,7 @@ static int alloc_from_simple_check(void) =20 static int alloc_from_misaligned_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_from_misaligned_generic_check(); memblock_set_bottom_up(true); @@ -348,6 +382,7 @@ static int alloc_from_misaligned_check(void) =20 static int alloc_from_high_addr_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_from_top_down_high_addr_check(); memblock_set_bottom_up(true); @@ -358,6 +393,7 @@ static int alloc_from_high_addr_check(void) =20 static int alloc_from_no_space_above_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_from_top_down_no_space_above_check(); memblock_set_bottom_up(true); @@ -368,6 +404,7 @@ static int alloc_from_no_space_above_check(void) =20 static int alloc_from_min_addr_cap_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_from_top_down_min_addr_cap_check(); memblock_set_bottom_up(true); @@ -378,6 +415,12 @@ static int alloc_from_min_addr_cap_check(void) =20 int memblock_alloc_helpers_checks(void) { + const char *func_testing =3D "memblock_alloc_from"; + + prefix_reset(); + prefix_push(func_testing); + test_print("Running %s tests...\n", func_testing); + reset_memblock_attributes(); dummy_physical_memory_init(); =20 @@ -389,5 +432,7 @@ int memblock_alloc_helpers_checks(void) =20 dummy_physical_memory_cleanup(); =20 + prefix_pop(); + return 0; } diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 6390206e50e1..255fd514e9f5 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -21,6 +21,8 @@ static int alloc_try_nid_top_down_simple_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_128; phys_addr_t min_addr; phys_addr_t max_addr; @@ -36,15 +38,17 @@ static int alloc_try_nid_top_down_simple_check(void) b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, max_addr - size); + ASSERT_EQ(rgn_end, max_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D max_addr - size); - assert(rgn_end =3D=3D max_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -72,6 +76,8 @@ static int alloc_try_nid_top_down_end_misaligned_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_128; phys_addr_t misalign =3D SZ_2; phys_addr_t min_addr; @@ -88,15 +94,17 @@ static int alloc_try_nid_top_down_end_misaligned_check(= void) b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D max_addr - size - misalign); - assert(rgn_end < max_addr); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, max_addr - size - misalign); + ASSERT_LT(rgn_end, max_addr); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); + + test_pass_pop(); =20 return 0; } @@ -122,6 +130,8 @@ static int alloc_try_nid_exact_address_generic_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -137,15 +147,17 @@ static int alloc_try_nid_exact_address_generic_check(= void) b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, min_addr); + ASSERT_EQ(rgn_end, max_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D min_addr); - assert(rgn_end =3D=3D max_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -173,6 +185,8 @@ static int alloc_try_nid_top_down_narrow_range_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -186,14 +200,16 @@ static int alloc_try_nid_top_down_narrow_range_check(= void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, max_addr - size); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D max_addr - size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -222,6 +238,8 @@ static int alloc_try_nid_low_max_generic_check(void) { void *allocated_ptr =3D NULL; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -234,7 +252,9 @@ static int alloc_try_nid_low_max_generic_check(void) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); =20 - assert(!allocated_ptr); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); =20 return 0; } @@ -259,6 +279,8 @@ static int alloc_try_nid_min_reserved_generic_check(voi= d) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_128; phys_addr_t r2_size =3D SZ_64; phys_addr_t total_size =3D r1_size + r2_size; @@ -278,14 +300,16 @@ static int alloc_try_nid_min_reserved_generic_check(v= oid) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D reserved_base); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, reserved_base); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -310,6 +334,8 @@ static int alloc_try_nid_max_reserved_generic_check(voi= d) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t r1_size =3D SZ_64; phys_addr_t r2_size =3D SZ_128; phys_addr_t total_size =3D r1_size + r2_size; @@ -327,14 +353,16 @@ static int alloc_try_nid_max_reserved_generic_check(v= oid) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, min_addr); =20 - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D min_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -364,6 +392,8 @@ static int alloc_try_nid_top_down_reserved_with_space_c= heck(void) char *b; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_64; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -389,17 +419,19 @@ static int alloc_try_nid_top_down_reserved_with_space= _check(void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn1->size, r1.size + r3_size); + ASSERT_EQ(rgn1->base, max_addr - r3_size); =20 - assert(rgn1->size =3D=3D r1.size + r3_size); - assert(rgn1->base =3D=3D max_addr - r3_size); + ASSERT_EQ(rgn2->size, r2.size); + ASSERT_EQ(rgn2->base, r2.base); =20 - assert(rgn2->size =3D=3D r2.size); - assert(rgn2->base =3D=3D r2.base); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -427,6 +459,8 @@ static int alloc_try_nid_reserved_full_merge_generic_ch= eck(void) char *b; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_64; phys_addr_t total_size; phys_addr_t max_addr; @@ -451,14 +485,16 @@ static int alloc_try_nid_reserved_full_merge_generic_= check(void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D total_size); - assert(rgn->base =3D=3D r2.base); + ASSERT_EQ(rgn->size, total_size); + ASSERT_EQ(rgn->base, r2.base); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -489,6 +525,8 @@ static int alloc_try_nid_top_down_reserved_no_space_che= ck(void) char *b; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -514,17 +552,19 @@ static int alloc_try_nid_top_down_reserved_no_space_c= heck(void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn1->size, r1.size); + ASSERT_EQ(rgn1->base, r1.base); =20 - assert(rgn1->size =3D=3D r1.size); - assert(rgn1->base =3D=3D r1.base); + ASSERT_EQ(rgn2->size, r2.size + r3_size); + ASSERT_EQ(rgn2->base, r2.base - r3_size); =20 - assert(rgn2->size =3D=3D r2.size + r3_size); - assert(rgn2->base =3D=3D r2.base - r3_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -554,6 +594,8 @@ static int alloc_try_nid_reserved_all_generic_check(voi= d) void *allocated_ptr =3D NULL; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t max_addr; @@ -576,7 +618,9 @@ static int alloc_try_nid_reserved_all_generic_check(voi= d) allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); =20 - assert(!allocated_ptr); + ASSERT_EQ(allocated_ptr, NULL); + + test_pass_pop(); =20 return 0; } @@ -592,6 +636,8 @@ static int alloc_try_nid_top_down_cap_max_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -605,14 +651,16 @@ static int alloc_try_nid_top_down_cap_max_check(void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_end_of_DRAM() - size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -628,6 +676,8 @@ static int alloc_try_nid_top_down_cap_min_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -641,14 +691,16 @@ static int alloc_try_nid_top_down_cap_min_check(void) min_addr, max_addr, NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_end_of_DRAM() - size); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); + + test_pass_pop(); =20 return 0; } @@ -673,6 +725,8 @@ static int alloc_try_nid_bottom_up_simple_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_128; phys_addr_t min_addr; phys_addr_t max_addr; @@ -689,15 +743,17 @@ static int alloc_try_nid_bottom_up_simple_check(void) b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, min_addr); + ASSERT_LT(rgn_end, max_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D min_addr); - assert(rgn_end < max_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -725,6 +781,8 @@ static int alloc_try_nid_bottom_up_start_misaligned_che= ck(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_128; phys_addr_t misalign =3D SZ_2; phys_addr_t min_addr; @@ -742,15 +800,17 @@ static int alloc_try_nid_bottom_up_start_misaligned_c= heck(void) b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, min_addr + (SMP_CACHE_BYTES - misalign)); + ASSERT_LT(rgn_end, max_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D min_addr + (SMP_CACHE_BYTES - misalign)); - assert(rgn_end < max_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -778,6 +838,8 @@ static int alloc_try_nid_bottom_up_narrow_range_check(v= oid) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -792,14 +854,16 @@ static int alloc_try_nid_bottom_up_narrow_range_check= (void) NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); + + test_pass_pop(); =20 return 0; } @@ -829,6 +893,8 @@ static int alloc_try_nid_bottom_up_reserved_with_space_= check(void) char *b; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_64; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -855,17 +921,19 @@ static int alloc_try_nid_bottom_up_reserved_with_spac= e_check(void) NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); =20 - assert(rgn1->size =3D=3D r1.size); - assert(rgn1->base =3D=3D max_addr); + ASSERT_EQ(rgn1->size, r1.size); + ASSERT_EQ(rgn1->base, max_addr); =20 - assert(rgn2->size =3D=3D r2.size + r3_size); - assert(rgn2->base =3D=3D r2.base); + ASSERT_EQ(rgn2->size, r2.size + r3_size); + ASSERT_EQ(rgn2->base, r2.base); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -899,6 +967,8 @@ static int alloc_try_nid_bottom_up_reserved_no_space_ch= eck(void) char *b; struct region r1, r2; =20 + PREFIX_PUSH(); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -925,20 +995,22 @@ static int alloc_try_nid_bottom_up_reserved_no_space_= check(void) NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn3->size, r3_size); + ASSERT_EQ(rgn3->base, memblock_start_of_DRAM()); =20 - assert(rgn3->size =3D=3D r3_size); - assert(rgn3->base =3D=3D memblock_start_of_DRAM()); + ASSERT_EQ(rgn2->size, r2.size); + ASSERT_EQ(rgn2->base, r2.base); =20 - assert(rgn2->size =3D=3D r2.size); - assert(rgn2->base =3D=3D r2.base); + ASSERT_EQ(rgn1->size, r1.size); + ASSERT_EQ(rgn1->base, r1.base); =20 - assert(rgn1->size =3D=3D r1.size); - assert(rgn1->base =3D=3D r1.base); + ASSERT_EQ(memblock.reserved.cnt, 3); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 3); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -954,6 +1026,8 @@ static int alloc_try_nid_bottom_up_cap_max_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -968,14 +1042,16 @@ static int alloc_try_nid_bottom_up_cap_max_check(voi= d) NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, min_addr); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D min_addr); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -991,6 +1067,8 @@ static int alloc_try_nid_bottom_up_cap_min_check(void) void *allocated_ptr =3D NULL; char *b; =20 + PREFIX_PUSH(); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -1005,14 +1083,16 @@ static int alloc_try_nid_bottom_up_cap_min_check(vo= id) NUMA_NO_NODE); b =3D (char *)allocated_ptr; =20 - assert(allocated_ptr); - assert(*b =3D=3D 0); + ASSERT_NE(allocated_ptr, NULL); + ASSERT_EQ(*b, 0); + + ASSERT_EQ(rgn->size, size); + ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 - assert(rgn->size =3D=3D size); - assert(rgn->base =3D=3D memblock_start_of_DRAM()); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D size); + test_pass_pop(); =20 return 0; } @@ -1020,6 +1100,7 @@ static int alloc_try_nid_bottom_up_cap_min_check(void) /* Test case wrappers */ static int alloc_try_nid_simple_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_simple_check(); memblock_set_bottom_up(true); @@ -1030,6 +1111,7 @@ static int alloc_try_nid_simple_check(void) =20 static int alloc_try_nid_misaligned_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_end_misaligned_check(); memblock_set_bottom_up(true); @@ -1040,6 +1122,7 @@ static int alloc_try_nid_misaligned_check(void) =20 static int alloc_try_nid_narrow_range_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_narrow_range_check(); memblock_set_bottom_up(true); @@ -1050,6 +1133,7 @@ static int alloc_try_nid_narrow_range_check(void) =20 static int alloc_try_nid_reserved_with_space_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_reserved_with_space_check(); memblock_set_bottom_up(true); @@ -1060,6 +1144,7 @@ static int alloc_try_nid_reserved_with_space_check(vo= id) =20 static int alloc_try_nid_reserved_no_space_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_reserved_no_space_check(); memblock_set_bottom_up(true); @@ -1070,6 +1155,7 @@ static int alloc_try_nid_reserved_no_space_check(void) =20 static int alloc_try_nid_cap_max_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_cap_max_check(); memblock_set_bottom_up(true); @@ -1080,6 +1166,7 @@ static int alloc_try_nid_cap_max_check(void) =20 static int alloc_try_nid_cap_min_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_top_down_cap_min_check(); memblock_set_bottom_up(true); @@ -1090,6 +1177,7 @@ static int alloc_try_nid_cap_min_check(void) =20 static int alloc_try_nid_min_reserved_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_min_reserved_generic_check(); memblock_set_bottom_up(true); @@ -1100,6 +1188,7 @@ static int alloc_try_nid_min_reserved_check(void) =20 static int alloc_try_nid_max_reserved_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_max_reserved_generic_check(); memblock_set_bottom_up(true); @@ -1110,6 +1199,7 @@ static int alloc_try_nid_max_reserved_check(void) =20 static int alloc_try_nid_exact_address_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_exact_address_generic_check(); memblock_set_bottom_up(true); @@ -1120,6 +1210,7 @@ static int alloc_try_nid_exact_address_check(void) =20 static int alloc_try_nid_reserved_full_merge_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_reserved_full_merge_generic_check(); memblock_set_bottom_up(true); @@ -1130,6 +1221,7 @@ static int alloc_try_nid_reserved_full_merge_check(vo= id) =20 static int alloc_try_nid_reserved_all_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_reserved_all_generic_check(); memblock_set_bottom_up(true); @@ -1140,6 +1232,7 @@ static int alloc_try_nid_reserved_all_check(void) =20 static int alloc_try_nid_low_max_check(void) { + test_print("\tRunning %s...\n", __func__); memblock_set_bottom_up(false); alloc_try_nid_low_max_generic_check(); memblock_set_bottom_up(true); @@ -1150,6 +1243,12 @@ static int alloc_try_nid_low_max_check(void) =20 int memblock_alloc_nid_checks(void) { + const char *func_testing =3D "memblock_alloc_try_nid"; + + prefix_reset(); + prefix_push(func_testing); + test_print("Running %s tests...\n", func_testing); + reset_memblock_attributes(); dummy_physical_memory_init(); =20 @@ -1170,5 +1269,7 @@ int memblock_alloc_nid_checks(void) =20 dummy_physical_memory_cleanup(); =20 + prefix_pop(); + return 0; } diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index a7bc180316d6..66f46f261e66 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -4,21 +4,29 @@ #include "basic_api.h" =20 #define EXPECTED_MEMBLOCK_REGIONS 128 +#define FUNC_ADD "memblock_add" +#define FUNC_RESERVE "memblock_reserve" +#define FUNC_REMOVE "memblock_remove" +#define FUNC_FREE "memblock_free" =20 static int memblock_initialization_check(void) { - assert(memblock.memory.regions); - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.max =3D=3D EXPECTED_MEMBLOCK_REGIONS); - assert(strcmp(memblock.memory.name, "memory") =3D=3D 0); + PREFIX_PUSH(); =20 - assert(memblock.reserved.regions); - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.memory.max =3D=3D EXPECTED_MEMBLOCK_REGIONS); - assert(strcmp(memblock.reserved.name, "reserved") =3D=3D 0); + ASSERT_NE(memblock.memory.regions, NULL); + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.max, EXPECTED_MEMBLOCK_REGIONS); + ASSERT_EQ(strcmp(memblock.memory.name, "memory"), 0); =20 - assert(!memblock.bottom_up); - assert(memblock.current_limit =3D=3D MEMBLOCK_ALLOC_ANYWHERE); + ASSERT_NE(memblock.reserved.regions, NULL); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.memory.max, EXPECTED_MEMBLOCK_REGIONS); + ASSERT_EQ(strcmp(memblock.reserved.name, "reserved"), 0); + + ASSERT_EQ(memblock.bottom_up, false); + ASSERT_EQ(memblock.current_limit, MEMBLOCK_ALLOC_ANYWHERE); + + test_pass_pop(); =20 return 0; } @@ -40,14 +48,18 @@ static int memblock_add_simple_check(void) .size =3D SZ_4M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add(r.base, r.size); =20 - assert(rgn->base =3D=3D r.base); - assert(rgn->size =3D=3D r.size); + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, r.size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r.size); + test_pass_pop(); =20 return 0; } @@ -69,18 +81,22 @@ static int memblock_add_node_simple_check(void) .size =3D SZ_16M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add_node(r.base, r.size, 1, MEMBLOCK_HOTPLUG); =20 - assert(rgn->base =3D=3D r.base); - assert(rgn->size =3D=3D r.size); + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, r.size); #ifdef CONFIG_NUMA - assert(rgn->nid =3D=3D 1); + ASSERT_EQ(rgn->nid, 1); #endif - assert(rgn->flags =3D=3D MEMBLOCK_HOTPLUG); + ASSERT_EQ(rgn->flags, MEMBLOCK_HOTPLUG); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r.size); + test_pass_pop(); =20 return 0; } @@ -113,18 +129,22 @@ static int memblock_add_disjoint_check(void) .size =3D SZ_8K }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_add(r2.base, r2.size); =20 - assert(rgn1->base =3D=3D r1.base); - assert(rgn1->size =3D=3D r1.size); + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1.size); + + ASSERT_EQ(rgn2->base, r2.base); + ASSERT_EQ(rgn2->size, r2.size); =20 - assert(rgn2->base =3D=3D r2.base); - assert(rgn2->size =3D=3D r2.size); + ASSERT_EQ(memblock.memory.cnt, 2); + ASSERT_EQ(memblock.memory.total_size, r1.size + r2.size); =20 - assert(memblock.memory.cnt =3D=3D 2); - assert(memblock.memory.total_size =3D=3D r1.size + r2.size); + test_pass_pop(); =20 return 0; } @@ -162,17 +182,21 @@ static int memblock_add_overlap_top_check(void) .size =3D SZ_512M }; =20 + PREFIX_PUSH(); + total_size =3D (r1.base - r2.base) + r1.size; =20 reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_add(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r2.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r2.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -210,17 +234,21 @@ static int memblock_add_overlap_bottom_check(void) .size =3D SZ_1G }; =20 + PREFIX_PUSH(); + total_size =3D (r2.base - r1.base) + r2.size; =20 reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_add(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -255,15 +283,19 @@ static int memblock_add_within_check(void) .size =3D SZ_1M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_add(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D r1.size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, r1.size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r1.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r1.size); + test_pass_pop(); =20 return 0; } @@ -279,19 +311,27 @@ static int memblock_add_twice_check(void) .size =3D SZ_2M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); =20 memblock_add(r.base, r.size); memblock_add(r.base, r.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r.size); + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r.size); + + test_pass_pop(); =20 return 0; } =20 static int memblock_add_checks(void) { + prefix_reset(); + prefix_push(FUNC_ADD); + test_print("Running %s tests...\n", FUNC_ADD); + memblock_add_simple_check(); memblock_add_node_simple_check(); memblock_add_disjoint_check(); @@ -300,6 +340,8 @@ static int memblock_add_checks(void) memblock_add_within_check(); memblock_add_twice_check(); =20 + prefix_pop(); + return 0; } =20 @@ -320,11 +362,15 @@ static int memblock_reserve_simple_check(void) .size =3D SZ_128M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_reserve(r.base, r.size); =20 - assert(rgn->base =3D=3D r.base); - assert(rgn->size =3D=3D r.size); + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, r.size); + + test_pass_pop(); =20 return 0; } @@ -356,18 +402,22 @@ static int memblock_reserve_disjoint_check(void) .size =3D SZ_512M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - assert(rgn1->base =3D=3D r1.base); - assert(rgn1->size =3D=3D r1.size); + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1.size); + + ASSERT_EQ(rgn2->base, r2.base); + ASSERT_EQ(rgn2->size, r2.size); =20 - assert(rgn2->base =3D=3D r2.base); - assert(rgn2->size =3D=3D r2.size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, r1.size + r2.size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D r1.size + r2.size); + test_pass_pop(); =20 return 0; } @@ -406,17 +456,21 @@ static int memblock_reserve_overlap_top_check(void) .size =3D SZ_1G }; =20 + PREFIX_PUSH(); + total_size =3D (r1.base - r2.base) + r1.size; =20 reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r2.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r2.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -455,17 +509,21 @@ static int memblock_reserve_overlap_bottom_check(void) .size =3D SZ_128K }; =20 + PREFIX_PUSH(); + total_size =3D (r2.base - r1.base) + r2.size; =20 reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -502,15 +560,19 @@ static int memblock_reserve_within_check(void) .size =3D SZ_64K }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D r1.size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, r1.size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, r1.size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D r1.size); + test_pass_pop(); =20 return 0; } @@ -527,19 +589,27 @@ static int memblock_reserve_twice_check(void) .size =3D SZ_2M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); =20 memblock_reserve(r.base, r.size); memblock_reserve(r.base, r.size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D r.size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, r.size); + + test_pass_pop(); =20 return 0; } =20 static int memblock_reserve_checks(void) { + prefix_reset(); + prefix_push(FUNC_RESERVE); + test_print("Running %s tests...\n", FUNC_RESERVE); + memblock_reserve_simple_check(); memblock_reserve_disjoint_check(); memblock_reserve_overlap_top_check(); @@ -547,6 +617,8 @@ static int memblock_reserve_checks(void) memblock_reserve_within_check(); memblock_reserve_twice_check(); =20 + prefix_pop(); + return 0; } =20 @@ -581,16 +653,20 @@ static int memblock_remove_simple_check(void) .size =3D SZ_4M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_add(r2.base, r2.size); memblock_remove(r1.base, r1.size); =20 - assert(rgn->base =3D=3D r2.base); - assert(rgn->size =3D=3D r2.size); + ASSERT_EQ(rgn->base, r2.base); + ASSERT_EQ(rgn->size, r2.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r2.size); + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r2.size); + + test_pass_pop(); =20 return 0; } @@ -626,15 +702,19 @@ static int memblock_remove_absent_check(void) .size =3D SZ_1G }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_remove(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D r1.size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, r1.size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, r1.size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D r1.size); + test_pass_pop(); =20 return 0; } @@ -674,6 +754,8 @@ static int memblock_remove_overlap_top_check(void) .size =3D SZ_32M }; =20 + PREFIX_PUSH(); + r1_end =3D r1.base + r1.size; r2_end =3D r2.base + r2.size; total_size =3D r1_end - r2_end; @@ -682,11 +764,13 @@ static int memblock_remove_overlap_top_check(void) memblock_add(r1.base, r1.size); memblock_remove(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base + r2.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r1.base + r2.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } @@ -724,17 +808,22 @@ static int memblock_remove_overlap_bottom_check(void) .size =3D SZ_256M }; =20 + PREFIX_PUSH(); + total_size =3D r2.base - r1.base; =20 reset_memblock_regions(); memblock_add(r1.base, r1.size); memblock_remove(r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); + + test_pass_pop(); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D total_size); return 0; } =20 @@ -774,6 +863,8 @@ static int memblock_remove_within_check(void) .size =3D SZ_1M }; =20 + PREFIX_PUSH(); + r1_size =3D r2.base - r1.base; r2_size =3D (r1.base + r1.size) - (r2.base + r2.size); total_size =3D r1_size + r2_size; @@ -782,26 +873,34 @@ static int memblock_remove_within_check(void) memblock_add(r1.base, r1.size); memblock_remove(r2.base, r2.size); =20 - assert(rgn1->base =3D=3D r1.base); - assert(rgn1->size =3D=3D r1_size); + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1_size); + + ASSERT_EQ(rgn2->base, r2.base + r2.size); + ASSERT_EQ(rgn2->size, r2_size); =20 - assert(rgn2->base =3D=3D r2.base + r2.size); - assert(rgn2->size =3D=3D r2_size); + ASSERT_EQ(memblock.memory.cnt, 2); + ASSERT_EQ(memblock.memory.total_size, total_size); =20 - assert(memblock.memory.cnt =3D=3D 2); - assert(memblock.memory.total_size =3D=3D total_size); + test_pass_pop(); =20 return 0; } =20 static int memblock_remove_checks(void) { + prefix_reset(); + prefix_push(FUNC_REMOVE); + test_print("Running %s tests...\n", FUNC_REMOVE); + memblock_remove_simple_check(); memblock_remove_absent_check(); memblock_remove_overlap_top_check(); memblock_remove_overlap_bottom_check(); memblock_remove_within_check(); =20 + prefix_pop(); + return 0; } =20 @@ -835,16 +934,20 @@ static int memblock_free_simple_check(void) .size =3D SZ_1M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); memblock_free((void *)r1.base, r1.size); =20 - assert(rgn->base =3D=3D r2.base); - assert(rgn->size =3D=3D r2.size); + ASSERT_EQ(rgn->base, r2.base); + ASSERT_EQ(rgn->size, r2.size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, r2.size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D r2.size); + test_pass_pop(); =20 return 0; } @@ -880,15 +983,19 @@ static int memblock_free_absent_check(void) .size =3D SZ_128M }; =20 + PREFIX_PUSH(); + reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_free((void *)r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D r1.size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, r1.size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, r1.size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D r1.size); + test_pass_pop(); =20 return 0; } @@ -928,17 +1035,21 @@ static int memblock_free_overlap_top_check(void) .size =3D SZ_8M }; =20 + PREFIX_PUSH(); + total_size =3D (r1.size + r1.base) - (r2.base + r2.size); =20 reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_free((void *)r2.base, r2.size); =20 - assert(rgn->base =3D=3D r2.base + r2.size); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r2.base + r2.size); + ASSERT_EQ(rgn->size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -973,17 +1084,21 @@ static int memblock_free_overlap_bottom_check(void) .size =3D SZ_32M }; =20 + PREFIX_PUSH(); + total_size =3D r2.base - r1.base; =20 reset_memblock_regions(); memblock_reserve(r1.base, r1.size); memblock_free((void *)r2.base, r2.size); =20 - assert(rgn->base =3D=3D r1.base); - assert(rgn->size =3D=3D total_size); + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } @@ -1024,6 +1139,8 @@ static int memblock_free_within_check(void) .size =3D SZ_1M }; =20 + PREFIX_PUSH(); + r1_size =3D r2.base - r1.base; r2_size =3D (r1.base + r1.size) - (r2.base + r2.size); total_size =3D r1_size + r2_size; @@ -1032,26 +1149,34 @@ static int memblock_free_within_check(void) memblock_reserve(r1.base, r1.size); memblock_free((void *)r2.base, r2.size); =20 - assert(rgn1->base =3D=3D r1.base); - assert(rgn1->size =3D=3D r1_size); + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1_size); =20 - assert(rgn2->base =3D=3D r2.base + r2.size); - assert(rgn2->size =3D=3D r2_size); + ASSERT_EQ(rgn2->base, r2.base + r2.size); + ASSERT_EQ(rgn2->size, r2_size); =20 - assert(memblock.reserved.cnt =3D=3D 2); - assert(memblock.reserved.total_size =3D=3D total_size); + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); =20 return 0; } =20 static int memblock_free_checks(void) { + prefix_reset(); + prefix_push(FUNC_FREE); + test_print("Running %s tests...\n", FUNC_FREE); + memblock_free_simple_check(); memblock_free_absent_check(); memblock_free_overlap_top_check(); memblock_free_overlap_bottom_check(); memblock_free_within_check(); =20 + prefix_pop(); + return 0; } =20 diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock= /tests/common.c index 62d3191f7c9a..e55b2a8bf0ff 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -4,8 +4,12 @@ =20 #define INIT_MEMBLOCK_REGIONS 128 #define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS +#define PREFIXES_LEN_MAX 256 +#define DELIM ": " +#define DELIM_LEN strlen(DELIM) =20 static struct test_memory memory_block; +static char __maybe_unused prefixes[PREFIXES_LEN_MAX]; =20 void reset_memblock_regions(void) { @@ -46,3 +50,57 @@ void dummy_physical_memory_cleanup(void) { free(memory_block.base); } + +#ifdef VERBOSE +void test_fail(void) +{ + ksft_test_result_fail(": %sfailed\n", prefixes); +} + +void test_pass(void) +{ + ksft_test_result_pass(": %spassed\n", prefixes); +} + +void test_print(const char *fmt, ...) +{ + int saved_errno =3D errno; + va_list args; + + va_start(args, fmt); + errno =3D saved_errno; + vprintf(fmt, args); + va_end(args); +} + +void prefix_reset(void) +{ + memset(prefixes, 0, PREFIXES_LEN_MAX); +} + +void prefix_push(const char *prefix) +{ + int prefix_max =3D PREFIXES_LEN_MAX - strlen(prefixes) - DELIM_LEN - 1; + + assert(strlen(prefix) <=3D prefix_max); + strncat(prefixes, prefix, prefix_max); + strncat(prefixes, DELIM, PREFIXES_LEN_MAX - strlen(prefixes) - 1); +} + +void prefix_pop(void) +{ + char *ptr; + + ptr =3D strrchr(prefixes, DELIM[0]); + if (!ptr) + prefixes[0] =3D 0; + else + *(ptr) =3D 0; + + ptr =3D strrchr(prefixes, DELIM[0]); + if (!ptr) + prefixes[0] =3D 0; + else + *(ptr + DELIM_LEN) =3D 0; +} +#endif /* VERBOSE */ diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index 619054d03219..46de86a755f3 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -7,9 +7,49 @@ #include #include #include +#include +#include <../selftests/kselftest.h> =20 #define MEM_SIZE SZ_16K =20 +/** + * ASSERT_EQ(): + * Check the condition + * @_expected =3D=3D @_seen + * If false, print failed test message (if in VERBOSE mode) and then assert + */ +#define ASSERT_EQ(_expected, _seen) do { \ + if ((_expected) !=3D (_seen)) \ + test_fail(); \ + assert((_expected) =3D=3D (_seen)); \ +} while (0) + +/** + * ASSERT_NE(): + * Check the condition + * @_expected !=3D @_seen + * If false, print failed test message (if in VERBOSE mode) and then assert + */ +#define ASSERT_NE(_expected, _seen) do { \ + if ((_expected) =3D=3D (_seen)) \ + test_fail(); \ + assert((_expected) !=3D (_seen)); \ +} while (0) + +/** + * ASSERT_LT(): + * Check the condition + * @_expected < @_seen + * If false, print failed test message (if in VERBOSE mode) and then assert + */ +#define ASSERT_LT(_expected, _seen) do { \ + if ((_expected) >=3D (_seen)) \ + test_fail(); \ + assert((_expected) < (_seen)); \ +} while (0) + +#define PREFIX_PUSH() prefix_push(__func__) + /* * Available memory registered with memblock needs to be valid for allocs * test to run. This is a convenience wrapper for memory allocated in @@ -31,4 +71,26 @@ void setup_memblock(void); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); =20 +#ifdef VERBOSE +void test_fail(void); +void test_pass(void); +void test_print(const char *fmt, ...); +void prefix_reset(void); +void prefix_push(const char *prefix); +void prefix_pop(void); +#else +static inline void test_fail(void) {} +static inline void test_pass(void) {} +static inline void test_print(const char *fmt, ...) {} +static inline void prefix_reset(void) {} +static inline void prefix_push(const char *prefix) {} +static inline void prefix_pop(void) {} +#endif /* VERBOSE */ + +static inline void test_pass_pop(void) +{ + test_pass(); + prefix_pop(); +} + #endif --=20 2.34.1 From nobody Sun Apr 19 20:31: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 3815CC43334 for ; Mon, 27 Jun 2022 22:35:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242696AbiF0Wf0 (ORCPT ); Mon, 27 Jun 2022 18:35:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242689AbiF0WfT (ORCPT ); Mon, 27 Jun 2022 18:35:19 -0400 Received: from mail-oi1-x244.google.com (mail-oi1-x244.google.com [IPv6:2607:f8b0:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07778205DB for ; Mon, 27 Jun 2022 15:35:18 -0700 (PDT) Received: by mail-oi1-x244.google.com with SMTP id h65so14805716oia.11 for ; Mon, 27 Jun 2022 15:35:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DfXx6OUKFv9lmYSVpe2VK14vOIkFTYrGx9cnZE6j00U=; b=J5kQgTgr6JSUUD7EGHpxiWOH7eDrhB/0cYKpphBted9OFDOSVWq5OmmA22fOUQta7j 4uHphCqZlx40CJMFDvbBv3yLC4AXVl1hVvOmfjnFdlEEeT2A/YAnI2RZnoZoCoA7WlDL N4sRXor2rpzDkndOc9sgw8Ya9PMsRFDwLBsjh0UTUXnRwcsm/yeH3JOm2HJwmGD9tpwe RM6EBB71MxsgRdoCBntQtN/2xFzgq3GIhzDIHgPyi5WQr//5FRTyeOV/DZ/AEpVNuH3/ PhpTwLGnpkluxF4wH1bYv2klCYmN3TScTFp4eybapuzkAiFvK/OIddei3Q2x38WNKjMv C/RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DfXx6OUKFv9lmYSVpe2VK14vOIkFTYrGx9cnZE6j00U=; b=R2QowHRK12UC/YgLfF8HrdOWBL30/dfjfeg/BEolx3uxTKTvy3kmmyz1DUyvcXaPoq 98P19QGWoGtOVrDvASLOndkHM1JD2KAe0a7n1we3pNVs41Li6P91RoZDKmkZSl6r2wwY YHWBIW0sU0WNWRokVIjFpqz0EiWNDX4cw/hCPpPIs9lKSXouucN2vuS4lVe4IKtsMdci a/g6T1e2lln/ZqPyqsKKE+OfO6EtNOcMYqg18rBy5F4c7jhZh1Y735XZSGZc9piRnG9q bo5CFk/G+8v8dlMI9t+nA5764M1qmAn7yeCkYLN/akrtLBPHdn8Xp/71dyX5OLeqUJ5c k61Q== X-Gm-Message-State: AJIora8AcMXLbLi9pRso7KUezPKQz+ndEhWzeefcR9wVljp1Gi1iKeMd ncSaN1wGuYlFsQLx4R3NBws= X-Google-Smtp-Source: AGRyM1v7C/R3OZltTwTg3XDCHKk/ykfKaSvmQOv0yaVjZNT3Ft/473i7VabYc47Jbm920piZQjIhSg== X-Received: by 2002:a05:6808:f03:b0:333:401b:2804 with SMTP id m3-20020a0568080f0300b00333401b2804mr9924301oiw.179.1656369317390; Mon, 27 Jun 2022 15:35:17 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id s8-20020aca4508000000b0033578d53265sm1654990oia.54.2022.06.27.15.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 15:35:17 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v4 3/4] memblock tests: set memblock_debug to enable memblock_dbg() messages Date: Mon, 27 Jun 2022 17:34:29 -0500 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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" If Memblock simulator was compiled with MEMBLOCK_DEBUG=3D1, set memblock_debug to 1 so that memblock_dbg() will print debug information when memblock functions are tested in Memblock simulator. Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/internal.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/int= ernal.h index 94b52a8718b5..c2a492c05e0c 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -2,6 +2,13 @@ #ifndef _MM_INTERNAL_H #define _MM_INTERNAL_H =20 +/* + * Enable memblock_dbg() messages + */ +#ifdef MEMBLOCK_DEBUG +static int memblock_debug =3D 1; +#endif + struct page {}; =20 void memblock_free_pages(struct page *page, unsigned long pfn, --=20 2.34.1 From nobody Sun Apr 19 20:31: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 2AE2AC43334 for ; Mon, 27 Jun 2022 22:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242720AbiF0Wf3 (ORCPT ); Mon, 27 Jun 2022 18:35:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242703AbiF0WfU (ORCPT ); Mon, 27 Jun 2022 18:35:20 -0400 Received: from mail-oi1-x244.google.com (mail-oi1-x244.google.com [IPv6:2607:f8b0:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 548FF18B02 for ; Mon, 27 Jun 2022 15:35:19 -0700 (PDT) Received: by mail-oi1-x244.google.com with SMTP id w83so14868126oiw.1 for ; Mon, 27 Jun 2022 15:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hDwC4vjOEjWZbqEneYaa93PfkH0X3bD2FesquY/4DR0=; b=R40+st7n8bK+eV4IFBb9tHvqyBFduB4ioLmqU3xul880XnefKDhtRaR04BQTpmeKeL yBanLZidYKjfSZvfskhgkEjPZ0BmIOOLWdh0chrSAqBQQ/SschgLY1MOVZGPLTAblMFT sUgUIU65pAGllcGy8ETb7TOHmJoWzI+Oq6cI3sxHiBYXU2gC+puKq1E56KPQ0PoklB+K rifFfzTPNpnPEor7bIPAh2h9U5SipnO56wWhBe+XcKm+T3RCYUCIggXiz2bVa5RO02KG FBA2cbEXqf9CyYxgCC59E7V7Jq8Z5tDN6lnLTmRuLuD3JM9t5k6lIwTmuKaQ9+svKjwd f0kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hDwC4vjOEjWZbqEneYaa93PfkH0X3bD2FesquY/4DR0=; b=2/30USeUE3vlgPtq34nUR1k5DgZabCTQaGrN6ALdD5DWjIvBj7bOfP9vmzH3nNVYlp ZNR5BwcSA+TOXVPhAZSPkx5PB0fjFZWRvj5XgIRQPYAsaSnjtmFf418okQogqJPgaF8k eZKNJlW74RoY3MG8q7BTMh6dTvwfffgW4PYR672bmaK585DE79bycBbYkrahXZk88ZqN bSz4sUTTgYd0dayBrBjFq9TMqbkgMZLnufLy0plJ7thOtxkSnaJVylZo/Txf3mSOIO0u oLRPrzZLAgFh1ER70O4aFgIJHYXBM+J52uXyp2sX1uaY1vD96tV/+Zv7+ExuU/ydtOPR kM+g== X-Gm-Message-State: AJIora8J5JgOauvW+XOgX1V3w2yLlRJJGE1D/JCyxDjh4w+SqhqBFdjp 11gxzj2nCLk0ICE9T0SeBUg= X-Google-Smtp-Source: AGRyM1uGuzpSHGJe6Y+NuWr5CrNhOjdG5PNR1gTZzBQdCC2/JmehuDVkihCx98yC7PxdYO3hHzNP+Q== X-Received: by 2002:a05:6808:f8b:b0:335:7cb9:f6df with SMTP id o11-20020a0568080f8b00b003357cb9f6dfmr2903741oiw.105.1656369318707; Mon, 27 Jun 2022 15:35:18 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id f19-20020a056830057300b0060bd2d06a1csm7140772otc.47.2022.06.27.15.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 15:35:18 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v4 4/4] memblock tests: remove completed TODO items Date: Mon, 27 Jun 2022 17:34:30 -0500 Message-Id: <3f2da4dc9ed0d30cf0fb8041077ed640886152d8.1656368930.git.remckee0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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" Remove completed items from TODO list. Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/TODO | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/testing/memblock/TODO b/tools/testing/memblock/TODO index cd1a30d5acc9..33044c634ea7 100644 --- a/tools/testing/memblock/TODO +++ b/tools/testing/memblock/TODO @@ -1,25 +1,17 @@ TODO =3D=3D=3D=3D=3D =20 -1. Add verbose output (e.g., what is being tested and how many tests cases= are - passing) - -2. Add flags to Makefile: - + verbosity level - + enable memblock_dbg() messages (i.e. pass "-D CONFIG_DEBUG_MEMORY_INI= T" - flag) - -3. Add tests trying to memblock_add() or memblock_reserve() 129th region. +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. =20 -4. Add test cases using this functions (implement them for both directions= ): +2. 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 -5. Add tests for memblock_alloc_node() to check if the correct NUMA node i= s set +3. Add tests for memblock_alloc_node() to check if the correct NUMA node i= s set for the new region --=20 2.34.1