From nobody Mon Apr 20 05:55:26 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 C0F25C43334 for ; Wed, 22 Jun 2022 06:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350894AbiFVGT6 (ORCPT ); Wed, 22 Jun 2022 02:19:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349890AbiFVGT4 (ORCPT ); Wed, 22 Jun 2022 02:19:56 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D203B6385 for ; Tue, 21 Jun 2022 23:19:55 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id bd16so19927892oib.6 for ; Tue, 21 Jun 2022 23:19:55 -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=bAy9ZdzvNSqiyUXWluLmSPaqA8dh70j3sUF3U6zADKk=; b=EgCwz4ToIzmDReUQZu4sgbTH8NVQgNV/mGmgD9Uogk1pUe5LSTCpeYU4oOqXz6Hxwp LvAWt1dbO6XTjENzyGU/yL9v2HBzJ31zoRCXqZqboseI4G+tOFjvDV3FxIdYqmpKviKo U1FXkfHCPZ4Z2Y86F1BbvTxt88xWjgNxjxE6LFl4Pku0wreiVEdj25C1WFch38yvc6XF G93ENQwzCk1vL+gCwIjVHEa+X40FW2XzONNTlwgi5bingDO7ll5Y5J8VFy8lkUai6Sgr fMk1UH9mNxRTiv/IWoTSR2gd0Vukf4CAReiRszmT+6qxKIyPwSanNME4nhvWwrVfxNwV zlmQ== 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=bAy9ZdzvNSqiyUXWluLmSPaqA8dh70j3sUF3U6zADKk=; b=2ybmxvPtny63pwmqGcLD8t0G9ei6Vw5gBO4mP9enO6XVXKERZPCW0lm/WlCncyiTl5 PGBu6ltiX7q2hjMsC03ouG2kgT4v3Xhjg5IlIJosH8YiW/88GRCK20R0a4aeEDhI3jYC HLw2sR66HxpdVmnwxU89XAF01Z5qlljZvS9YnqKrEOR4jUeMzf0lfs3EsNVltVDNNqNp WtvkmRZx5kmzCViHtyMFKTzTIMECEMrXwfOPirLOzjds0pEWyvj+D6d1zuAMMogpHe4c sQOMb867JWsZJcDVSJJGGUr8mePQnbWjaKR3obENAdvIlARLW0KCJHsJW+hL+BGeRvmg WIew== X-Gm-Message-State: AJIora9aBjSThOqpToKCKIhQ5pEbROgZI5MTYTU/z5kO7rIRX8TZZCEg uwpux2NmbwTFPSSFfGV1Zvw= X-Google-Smtp-Source: AGRyM1tlMQqlFeAttobvlVxOJEaTC1uYWNJH7Yn4A+sxt3w8PY1HoPtyx+na2nTWcMh7n41trh4bSw== X-Received: by 2002:a05:6808:ecf:b0:2f9:f0b1:7ee8 with SMTP id q15-20020a0568080ecf00b002f9f0b17ee8mr1007855oiv.225.1655878795148; Tue, 21 Jun 2022 23:19:55 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id s24-20020a4adb98000000b0035eb4e5a6b2sm10835340oou.8.2022.06.21.23.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:19:54 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 1/4] memblock tests: add user-provided arguments to Makefile Date: Wed, 22 Jun 2022 01:19:29 -0500 Message-Id: <7deb3d3d4c05c884d3830325c816862ce927133f.1655878337.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. Signed-off-by: Rebecca Mckeever Reviewed-by: David Hildenbrand --- 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 Mon Apr 20 05:55:26 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 2BB16C433EF for ; Wed, 22 Jun 2022 06:20:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351247AbiFVGUK (ORCPT ); Wed, 22 Jun 2022 02:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351173AbiFVGUE (ORCPT ); Wed, 22 Jun 2022 02:20:04 -0400 Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A92ADE1 for ; Tue, 21 Jun 2022 23:20:01 -0700 (PDT) Received: by mail-oi1-x241.google.com with SMTP id i25so19945623oii.7 for ; Tue, 21 Jun 2022 23:20:01 -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=mWo9XIKeezUY0SN25PqCk22B3MKwAg8wfQXOyogiy5c=; b=fH398viB+IXsvhkEHGhi2OEFasasH2Oz419wehXwa4aAlfLUfaf01C6B/AGqOxp/w2 FuednFGmy60rdzrA0t4L9JcWq+mSEuyBZzjmNozAfq3okjK+0TbLGAJicndEwaoZ98Q0 PUad93xgZeT1sNMERm8NJbtCSpBcFBnw6zTUvsDvuPr/VnfJE7G/GGd2BzJBpdqNc4gl j9ZmWTlh9P2fKLEzdPcVIo4XNd8n5cWaBa2iBOJwsRAlw2W03MBzhOXzM6TRs869Sru0 Wr+QaTScjYFedCgk1qVu/vCQjh3DnFBAp2fNmXWyUn8Tm9Vg6O8LMcJ9mH9D8HHIKYOC U05g== 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=mWo9XIKeezUY0SN25PqCk22B3MKwAg8wfQXOyogiy5c=; b=mYPlGCZoax46WXWSs4G22ecr3S/G2yjRbZ4LCFM6VRNNHEVSLg/ujbYOQEEWvdIsqu rWV14padn0tL7X7CzgpDecWlmxbT1FQHHbt2iI0Hzf30aKSGQkaKEHOwAHJU3TAi6svm bp0sRIoNfrgtop6gGLcXwBr1UIVoCW/7hDLt3EPg4xjmwscPSYQlKB3JdarftnN2yrL1 71uY6onPIA9PJlFj1fWUgvkFcpNIa3TCBtOAbUr2yXzNUIMm/oSPMqGf4yDagitEsML9 oJ9v9SRnEkztEang7gJ0950RU368YhNtweO8PfJBbK36Aq7e1qGYtPNMzyRBXDCXKt+U kXLw== X-Gm-Message-State: AJIora8ioFYesaNnjqNCoYiWBvbFKHdyLGgKDVThNT8d7eJf69stJjPx ITspfN6xOAgUg354FmYHas8= X-Google-Smtp-Source: AGRyM1u/GWNysJ6dmlThCZou2+pMAEjdim9FhbfYGurlkEs39phDPw4WFfHSRZneDZdYT0c9nFAeGA== X-Received: by 2002:a05:6808:10ca:b0:331:4684:7519 with SMTP id s10-20020a05680810ca00b0033146847519mr11493137ois.299.1655878800269; Tue, 21 Jun 2022 23:20:00 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id f21-20020a05680814d500b0032f2ccdafc9sm10806270oiw.3.2022.06.21.23.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:20:00 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 2/4] memblock tests: add verbose output to memblock tests Date: Wed, 22 Jun 2022 01:19:30 -0500 Message-Id: <11a239045cca7b5add6c16c6a5a43a2075d7525f.1655878337.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 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 the test functions. 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. If the Memblock simulator was not compiled with VERBOSE=3D1, these functions 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 --- tools/testing/memblock/tests/alloc_api.c | 241 ++++++++---- .../memblock/tests/alloc_helpers_api.c | 135 +++++-- tools/testing/memblock/tests/alloc_nid_api.c | 371 ++++++++++++------ tools/testing/memblock/tests/basic_api.c | 365 ++++++++++++----- tools/testing/memblock/tests/common.c | 60 +++ tools/testing/memblock/tests/common.h | 54 +++ 6 files changed, 882 insertions(+), 344 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index d1aa7e15c18d..96df033d4300 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(__func__); + phys_addr_t size =3D SZ_2; phys_addr_t expected_start; =20 @@ -19,12 +21,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -55,6 +60,8 @@ static int alloc_top_down_disjoint_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r2_size =3D SZ_16; /* Use custom alignment */ phys_addr_t alignment =3D SMP_CACHE_BYTES * 2; @@ -73,15 +80,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -101,6 +111,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(__func__); + /* * The first region ends at the aligned address to test region merging */ @@ -114,12 +126,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -141,6 +156,8 @@ static int alloc_top_down_after_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r2_size =3D SZ_512; phys_addr_t total_size; =20 @@ -158,12 +175,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -186,6 +206,8 @@ static int alloc_top_down_second_fit_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_1K; phys_addr_t total_size; =20 @@ -204,12 +226,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -231,6 +256,8 @@ static int alloc_in_between_generic_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t r3_size =3D SZ_64; /* @@ -254,12 +281,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -281,6 +311,8 @@ static int alloc_small_gaps_generic_check(void) { void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t region_size =3D SZ_1K; phys_addr_t gap_size =3D SZ_256; phys_addr_t region_end; @@ -296,7 +328,10 @@ 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(); + prefix_pop(); =20 return 0; } @@ -309,6 +344,8 @@ static int alloc_all_reserved_generic_check(void) { void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + setup_memblock(); =20 /* Simulate full memory */ @@ -316,7 +353,10 @@ 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(); + prefix_pop(); =20 return 0; } @@ -338,6 +378,8 @@ static int alloc_no_space_generic_check(void) { void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + setup_memblock(); =20 phys_addr_t available_size =3D SZ_256; @@ -348,7 +390,10 @@ 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(); + prefix_pop(); =20 return 0; } @@ -369,6 +414,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(__func__); + phys_addr_t available_size =3D SZ_256; phys_addr_t reserved_size =3D MEM_SIZE - available_size; =20 @@ -379,12 +426,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -399,14 +449,19 @@ 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(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -421,16 +476,21 @@ 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(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -459,6 +519,8 @@ static int alloc_bottom_up_disjoint_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r2_size =3D SZ_16; /* Use custom alignment */ phys_addr_t alignment =3D SMP_CACHE_BYTES * 2; @@ -477,16 +539,19 @@ 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(); + prefix_pop(); =20 return 0; } @@ -506,6 +571,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(__func__); + 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 +583,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -542,6 +612,8 @@ static int alloc_bottom_up_after_check(void) struct region r1; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r2_size =3D SZ_512; phys_addr_t total_size; =20 @@ -559,12 +631,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -588,6 +663,8 @@ static int alloc_bottom_up_second_fit_check(void) struct region r1, r2; void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_1K; phys_addr_t total_size; =20 @@ -606,12 +683,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -619,6 +699,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 +710,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 +721,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 +732,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 +743,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 +754,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 +765,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 +776,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 +787,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 +798,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 +809,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 +820,12 @@ static int alloc_no_memory_check(void) =20 int memblock_alloc_checks(void) { + static 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 +843,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..f6eaed540427 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(__func__); + phys_addr_t size =3D SZ_16; phys_addr_t min_addr; =20 @@ -31,14 +33,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -64,6 +69,8 @@ static int alloc_from_misaligned_generic_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -75,14 +82,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -110,6 +120,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(__func__); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -120,12 +132,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -151,6 +166,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(__func__); + 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 +182,15 @@ 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); =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(); + prefix_pop(); =20 return 0; } @@ -186,6 +206,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(__func__); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t start_addr; @@ -199,12 +221,15 @@ 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); =20 - assert(memblock.reserved.cnt =3D=3D 1); - assert(memblock.reserved.total_size =3D=3D MEM_SIZE); + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, MEM_SIZE); + + test_pass(); + prefix_pop(); =20 return 0; } @@ -230,6 +255,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(__func__); + phys_addr_t size =3D SZ_32; phys_addr_t min_addr; =20 @@ -240,12 +267,15 @@ 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(); + prefix_pop(); =20 return 0; } @@ -270,6 +300,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(__func__); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t r2_size; @@ -284,12 +316,15 @@ 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); + + 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(); + prefix_pop(); =20 return 0; } @@ -304,6 +339,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(__func__); + phys_addr_t r1_size =3D SZ_64; phys_addr_t min_addr; phys_addr_t start_addr; @@ -315,12 +352,15 @@ 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); + + 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(); + prefix_pop(); =20 return 0; } @@ -328,6 +368,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 +379,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 +390,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 +401,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 +412,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 +423,12 @@ static int alloc_from_min_addr_cap_check(void) =20 int memblock_alloc_helpers_checks(void) { + static 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 diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 6390206e50e1..601f4a7ee30d 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(__func__); + phys_addr_t size =3D SZ_128; phys_addr_t min_addr; phys_addr_t max_addr; @@ -36,15 +38,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -72,6 +77,8 @@ static int alloc_try_nid_top_down_end_misaligned_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_128; phys_addr_t misalign =3D SZ_2; phys_addr_t min_addr; @@ -88,15 +95,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -122,6 +132,8 @@ static int alloc_try_nid_exact_address_generic_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -137,15 +149,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -173,6 +188,8 @@ static int alloc_try_nid_top_down_narrow_range_check(vo= id) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -186,14 +203,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -222,6 +242,8 @@ static int alloc_try_nid_low_max_generic_check(void) { void *allocated_ptr =3D NULL; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -234,7 +256,10 @@ 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(); + prefix_pop(); =20 return 0; } @@ -259,6 +284,8 @@ static int alloc_try_nid_min_reserved_generic_check(voi= d) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + 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 +305,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -310,6 +340,8 @@ static int alloc_try_nid_max_reserved_generic_check(voi= d) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + 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 +359,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -364,6 +399,8 @@ static int alloc_try_nid_top_down_reserved_with_space_c= heck(void) char *b; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_64; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -389,17 +426,20 @@ 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(); + prefix_pop(); =20 return 0; } @@ -427,6 +467,8 @@ static int alloc_try_nid_reserved_full_merge_generic_ch= eck(void) char *b; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_64; phys_addr_t total_size; phys_addr_t max_addr; @@ -451,14 +493,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -489,6 +534,8 @@ static int alloc_try_nid_top_down_reserved_no_space_che= ck(void) char *b; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -514,17 +561,20 @@ 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(); + prefix_pop(); =20 return 0; } @@ -554,6 +604,8 @@ static int alloc_try_nid_reserved_all_generic_check(voi= d) void *allocated_ptr =3D NULL; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t max_addr; @@ -576,7 +628,10 @@ static int alloc_try_nid_reserved_all_generic_check(vo= id) 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(); + prefix_pop(); =20 return 0; } @@ -592,6 +647,8 @@ static int alloc_try_nid_top_down_cap_max_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -605,14 +662,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -628,6 +688,8 @@ static int alloc_try_nid_top_down_cap_min_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -641,14 +703,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -673,6 +738,8 @@ static int alloc_try_nid_bottom_up_simple_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_128; phys_addr_t min_addr; phys_addr_t max_addr; @@ -689,15 +756,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -725,6 +795,8 @@ static int alloc_try_nid_bottom_up_start_misaligned_che= ck(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_128; phys_addr_t misalign =3D SZ_2; phys_addr_t min_addr; @@ -742,15 +814,18 @@ 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(); + prefix_pop(); =20 return 0; } @@ -778,6 +853,8 @@ static int alloc_try_nid_bottom_up_narrow_range_check(v= oid) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -792,14 +869,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -829,6 +909,8 @@ static int alloc_try_nid_bottom_up_reserved_with_space_= check(void) char *b; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_64; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -855,17 +937,20 @@ 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(); + prefix_pop(); =20 return 0; } @@ -899,6 +984,8 @@ static int alloc_try_nid_bottom_up_reserved_no_space_ch= eck(void) char *b; struct region r1, r2; =20 + prefix_push(__func__); + phys_addr_t r3_size =3D SZ_256; phys_addr_t gap_size =3D SMP_CACHE_BYTES; phys_addr_t total_size; @@ -925,20 +1012,23 @@ 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(); + prefix_pop(); =20 return 0; } @@ -954,6 +1044,8 @@ static int alloc_try_nid_bottom_up_cap_max_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_256; phys_addr_t min_addr; phys_addr_t max_addr; @@ -968,14 +1060,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -991,6 +1086,8 @@ static int alloc_try_nid_bottom_up_cap_min_check(void) void *allocated_ptr =3D NULL; char *b; =20 + prefix_push(__func__); + phys_addr_t size =3D SZ_1K; phys_addr_t min_addr; phys_addr_t max_addr; @@ -1005,14 +1102,17 @@ 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(); + prefix_pop(); =20 return 0; } @@ -1020,6 +1120,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 +1131,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 +1142,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 +1153,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 +1164,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 +1175,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 +1186,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 +1197,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 +1208,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 +1219,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 +1230,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 +1241,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 +1252,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 +1263,12 @@ static int alloc_try_nid_low_max_check(void) =20 int memblock_alloc_nid_checks(void) { + static 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 +1289,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..f223a9a57be7 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -4,21 +4,30 @@ #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(__func__); =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(); + prefix_pop(); =20 return 0; } @@ -40,14 +49,19 @@ static int memblock_add_simple_check(void) .size =3D SZ_4M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -69,18 +83,27 @@ static int memblock_add_node_simple_check(void) .size =3D SZ_16M }; =20 + prefix_pop(); + prefix_push("memblock_add_node"); + prefix_push(__func__); + 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(); + prefix_pop(); + prefix_pop(); + prefix_push(FUNC_ADD); =20 return 0; } @@ -113,18 +136,23 @@ static int memblock_add_disjoint_check(void) .size =3D SZ_8K }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -162,17 +190,22 @@ static int memblock_add_overlap_top_check(void) .size =3D SZ_512M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -210,17 +243,22 @@ static int memblock_add_overlap_bottom_check(void) .size =3D SZ_1G }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -255,15 +293,20 @@ static int memblock_add_within_check(void) .size =3D SZ_1M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -279,19 +322,28 @@ static int memblock_add_twice_check(void) .size =3D SZ_2M }; =20 + prefix_push(__func__); + 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(); + prefix_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 +352,8 @@ static int memblock_add_checks(void) memblock_add_within_check(); memblock_add_twice_check(); =20 + prefix_pop(); + return 0; } =20 @@ -320,11 +374,16 @@ static int memblock_reserve_simple_check(void) .size =3D SZ_128M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -356,18 +415,23 @@ static int memblock_reserve_disjoint_check(void) .size =3D SZ_512M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -406,17 +470,22 @@ static int memblock_reserve_overlap_top_check(void) .size =3D SZ_1G }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -455,17 +524,22 @@ static int memblock_reserve_overlap_bottom_check(void) .size =3D SZ_128K }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -502,15 +576,20 @@ static int memblock_reserve_within_check(void) .size =3D SZ_64K }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -527,19 +606,28 @@ static int memblock_reserve_twice_check(void) .size =3D SZ_2M }; =20 + prefix_push(__func__); + 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(); + prefix_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 +635,8 @@ static int memblock_reserve_checks(void) memblock_reserve_within_check(); memblock_reserve_twice_check(); =20 + prefix_pop(); + return 0; } =20 @@ -581,16 +671,21 @@ static int memblock_remove_simple_check(void) .size =3D SZ_4M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -626,15 +721,20 @@ static int memblock_remove_absent_check(void) .size =3D SZ_1G }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -674,6 +774,8 @@ static int memblock_remove_overlap_top_check(void) .size =3D SZ_32M }; =20 + prefix_push(__func__); + r1_end =3D r1.base + r1.size; r2_end =3D r2.base + r2.size; total_size =3D r1_end - r2_end; @@ -682,11 +784,14 @@ 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(); + prefix_pop(); =20 return 0; } @@ -724,17 +829,23 @@ static int memblock_remove_overlap_bottom_check(void) .size =3D SZ_256M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 - assert(memblock.memory.cnt =3D=3D 1); - assert(memblock.memory.total_size =3D=3D total_size); return 0; } =20 @@ -774,6 +885,8 @@ static int memblock_remove_within_check(void) .size =3D SZ_1M }; =20 + prefix_push(__func__); + 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 +895,35 @@ 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(); + prefix_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 +957,21 @@ static int memblock_free_simple_check(void) .size =3D SZ_1M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -880,15 +1007,20 @@ static int memblock_free_absent_check(void) .size =3D SZ_128M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -928,17 +1060,22 @@ static int memblock_free_overlap_top_check(void) .size =3D SZ_8M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -973,17 +1110,22 @@ static int memblock_free_overlap_bottom_check(void) .size =3D SZ_32M }; =20 + prefix_push(__func__); + 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(); + prefix_pop(); =20 return 0; } @@ -1024,6 +1166,8 @@ static int memblock_free_within_check(void) .size =3D SZ_1M }; =20 + prefix_push(__func__); + 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 +1176,35 @@ 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(); + prefix_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..248c214c5216 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -7,6 +7,14 @@ =20 static struct test_memory memory_block; =20 +#ifdef VERBOSE +#define PREFIXES_LEN_MAX 256 +#define DELIM ": " +#define DELIM_LEN strlen(DELIM) + +static char prefixes[PREFIXES_LEN_MAX]; +#endif + void reset_memblock_regions(void) { memset(memblock.memory.regions, 0, @@ -46,3 +54,55 @@ void dummy_physical_memory_cleanup(void) { free(memory_block.base); } + +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; +} diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index 619054d03219..bdddb5f72871 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -7,9 +7,47 @@ #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) + /* * 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 +69,20 @@ 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 */ + #endif --=20 2.34.1 From nobody Mon Apr 20 05:55:26 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 8EDD4C43334 for ; Wed, 22 Jun 2022 06:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349822AbiFVGUO (ORCPT ); Wed, 22 Jun 2022 02:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351231AbiFVGUH (ORCPT ); Wed, 22 Jun 2022 02:20:07 -0400 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D6672F038 for ; Tue, 21 Jun 2022 23:20:06 -0700 (PDT) Received: by mail-oi1-x243.google.com with SMTP id l81so19930556oif.9 for ; Tue, 21 Jun 2022 23:20:06 -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=AGQIifcv8IatjKKtZ3ZMuhDS9M2f66qXt8yHD288muU7dZJUf4BOrGbRfAVqyk6YyC 8uazsNnQH0aC28zkPMZbidyAmunqgVSvMPOto1S5wE3cT1CofMcjgTgVmu16iwG4Ugoe P9wTJgqUdkWoGzQko+bztqQr+kX5pXm0PN1q6m4gZTUjsDy4Zl3wXQ+0vg8zHXlgUlJw z7BMgQmgmYsHqHt4y0VlSPnVrG6pvRd9aSdiDpcIrCulCEXp9xCTPbpU2ABPb19PQ0wG 3oHeSQM4Q2mOr5xbEb3pa8ah/n/CvUWwt9RF1AUIy5nO0r4CVuvezhj/Sj0YfnrROHW/ 4yww== 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=N1QIgdPirMpedGfI1gqwZD1KQHzqiBQz3E2ZsTgxNA2c6bv1sJzNN8uIv2axcYaemw qxET/frFo/8fsc33W+Fk7nZX1pjsuLdHiVDbJSnFEAEj5ENCyUqRdRnat8VgSe85Lffr 4AK8CuFnfBZGnWXydhDbg8ldIvZ9MwLRNeA2/SV7AZ8rrmIb1QHgbn/fe+juDnQMP8VR aKPC9MliVM/+vRMVrRju/xdo/J0DnoBZRQxpz/5Q1rHHmhGU0S+ZUS9fgw5LdWoaK/u6 ebmV2Vp7mqgKut2VBpTG/OlMCDEdAd2XMc3BEVWNBcniuDEZ3q5e/8GR7ZbG010+e2i9 kfTw== X-Gm-Message-State: AOAM532sNYA/fMJAk4TajzIaVtnPBimVkDgWS+GAdmQSdyOsYGWjAwS8 bChVhaC60Arvy0Md02QdKBw= X-Google-Smtp-Source: ABdhPJzCjeLA9cCnRN3/icCZ/qlUASsHUXDJZLuDcSQ8MxM5IWVv6OwxilT7vDLmaYrC42SPOZInRA== X-Received: by 2002:aca:b305:0:b0:32f:17cb:63c0 with SMTP id c5-20020acab305000000b0032f17cb63c0mr19988245oif.142.1655878805547; Tue, 21 Jun 2022 23:20:05 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id n5-20020a4ab345000000b0035eb4e5a6d6sm10961544ooo.44.2022.06.21.23.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:20:05 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 3/4] memblock tests: set memblock_debug to enable memblock_dbg() messages Date: Wed, 22 Jun 2022 01:19:31 -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 Mon Apr 20 05:55:26 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 0F839C43334 for ; Wed, 22 Jun 2022 06:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345555AbiFVGUW (ORCPT ); Wed, 22 Jun 2022 02:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233013AbiFVGUS (ORCPT ); Wed, 22 Jun 2022 02:20:18 -0400 Received: from mail-oi1-x242.google.com (mail-oi1-x242.google.com [IPv6:2607:f8b0:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74BECDE1 for ; Tue, 21 Jun 2022 23:20:17 -0700 (PDT) Received: by mail-oi1-x242.google.com with SMTP id v143so19909371oie.13 for ; Tue, 21 Jun 2022 23:20: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=hDwC4vjOEjWZbqEneYaa93PfkH0X3bD2FesquY/4DR0=; b=V2/CV8aKDk9sr8ejKluPY9R1KLGH8onIXqGVqKEYXKo8eXEhzMgn45JJsR8E5lE/4w VxuUbDpexiHGCLt629SMyNOH4Eu7tFAMpxw6M1qu4Z5iopUIWjknCCdhBE6BOfZcLXza 8Vb4v23S1u6kfbnEbJcNiuSzF0OYQ4QKScr9GrsIFx9ouubyA7Q1nrRkWTNEMdomvZ7v qg/TEuEnlu+VAptdyA7VIZdp8YdvaJSll9AxKym0OiX0v+IRydKOOF9ixycdVH1rH6SJ LqCT5qCa4OLe8i67w+KSx00Op3Nxqa9F4fGlRgUiEZXCOCSCpgnxqArhCV1jA7OQgRPn kICA== 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=zGMJcgCPalBldNGsGIyY0L7W/s6gQL9qNOVlSTVokMhj50pb14offuv2CFv3S94gWC L6hdXZlWhOaliSCbZSub2dZOzdX2dj/JUu3zy6na6xb2Wx1s4kR0Q7Su1jBfvO+zg/eW VTqeUYByIRFiHjpjq+spYOpDk5y6I6woVUxf0djPeT1G8Z8iZI89UF3i8RArBwpNDhqL 6a/jR+RNrmDIMH0evGzz/HWYuQMrfTwGOfFRkpUNTk3fzeWQcXIA+PpD3OGSxr9PlkMY nroJAO7FY4uz6AcLvhNdqNqsrwjLUlGsFL4AQVFwM+dcBvVIScnzZMEPsTRy+CUJc2ww 2M6A== X-Gm-Message-State: AJIora/mB7NuS0znu47nWkpA5mrWWW3BFJTzmweZEotCpmyL5AGXb8s0 qHUh2Xb5Yd9d2EYjea3+y+I= X-Google-Smtp-Source: AGRyM1u/D80v3UnLdx+c+4cEviLDziy0ZfA5UJETq0k0P3+88F1/bSFwpaEC1bH6BaLqjaAvvj5IqA== X-Received: by 2002:a05:6808:1801:b0:330:4385:81c5 with SMTP id bh1-20020a056808180100b00330438581c5mr991506oib.151.1655878816822; Tue, 21 Jun 2022 23:20:16 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id g9-20020a4ab809000000b004255ed1b6d9sm579398oop.27.2022.06.21.23.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:20:16 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 4/4] memblock tests: remove completed TODO items Date: Wed, 22 Jun 2022 01:19:32 -0500 Message-Id: <4a8915ef399c5778d31eab9466d2373b43b3e61a.1655878337.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