From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE1FDC43334 for ; Thu, 23 Jun 2022 06:30:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 077938E012B; Thu, 23 Jun 2022 02:30:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 028888E0115; Thu, 23 Jun 2022 02:30:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0BD68E012B; Thu, 23 Jun 2022 02:30:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CEFB98E0115 for ; Thu, 23 Jun 2022 02:30:44 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A0B8721590 for ; Thu, 23 Jun 2022 06:30:44 +0000 (UTC) X-FDA: 79608527208.12.660D238 Received: from mail-oa1-f67.google.com (mail-oa1-f67.google.com [209.85.160.67]) by imf17.hostedemail.com (Postfix) with ESMTP id 36D564001C for ; Thu, 23 Jun 2022 06:30:44 +0000 (UTC) Received: by mail-oa1-f67.google.com with SMTP id 586e51a60fabf-f2a4c51c45so25381558fac.9 for ; Wed, 22 Jun 2022 23:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=OHUqu3uiTH5k20lesFs+yOO4/P24En0BSTW5y2O8uV0=; b=mgiLVWvdmEhQSQmlEeMJR/dxFVJ7YXC1vBayafzySC5xvt56qglh2tGzIpUf556bzc IFae/rkrNzOgGdcog/y2GAewpIRXkhwDRLwhtX9KmqNSJq1HvdedIe0boUjNBxS9wVkV qGAfaemevVKqpRYa1Dn27FW4fKH5MpgCCd7sV3E/sqXrJ+l1lmckmrYuBxmlG/baNHKd kvR86bij9u7qZ/7Lsb7PtJ45nB2fc5F3Pr107lXkGgizGk7YDCw81+3zQ073aGdWRoRY dHJYhlaUILV/eCy2wGLIZIvU0pMOnKEAB9HWaSNiGe8eQW8Mhd+N0xmQ6zEpJ6buiwNx XSIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=OHUqu3uiTH5k20lesFs+yOO4/P24En0BSTW5y2O8uV0=; b=xkIsm5kugB/D3YgI1QmAeYV4n9nBHoyEImucBmTBwKtK2tGtIxVAuEZ6B6I8UGAYYt b3wB9cRb7Qnpss5YY4e40tY+8dbhGycfBZEJkwFmsdxKn+445av3e9qdYpewIdcJNyon uLMjJGDZ923S01uYpsadxGzVzBegzY79FC0s9uvf/hk5+/BEWU5dQHPLc+IEUd0ItZDz 6LYov6Pn24mjBGK/uJsk81w+WojcYABolKtqqgKmAv0YwGETMSJhX6WoQzNiAW7YAWzU Pw2R3nujEYqiqwn7vQ2X4wkpQJYORIdvmZbaIYs5cXUhoZx2TCOI8Y0zgKmsmD9PxI6+ oEEg== X-Gm-Message-State: AJIora+iAw082Wov+YEp/bGqhwb2xy2tvHwassu/ezJJQD9fEQmg9mP+ 98iJmXjLbPoYlAZEN4ay68A= X-Google-Smtp-Source: AGRyM1vwmkBbryL4LpyXE55sidYEPWBAwlm29SUpAttUrWXE4HURaaep8Z24+p9VPXssEI31PbL3Qw== X-Received: by 2002:a05:6870:5819:b0:101:f651:99a2 with SMTP id r25-20020a056870581900b00101f65199a2mr1531563oap.167.1655965843302; Wed, 22 Jun 2022 23:30:43 -0700 (PDT) Received: from bertie (072-190-140-117.res.spectrum.com. [72.190.140.117]) by smtp.gmail.com with ESMTPSA id r25-20020a05683001d900b0060c10396c82sm12170287ota.58.2022.06.22.23.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jun 2022 23:30:43 -0700 (PDT) Date: Thu, 23 Jun 2022 01:30:42 -0500 From: Rebecca Mckeever To: Mike Rapoport Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand Subject: Re: [PATCH v3 2/4] memblock tests: add verbose output to memblock tests Message-ID: References: <004e021cc3cb7be8749361b3b1cb324459b9cb9f.1655889641.git.remckee0@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mgiLVWvd; spf=pass (imf17.hostedemail.com: domain of remckee0@gmail.com designates 209.85.160.67 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655965844; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OHUqu3uiTH5k20lesFs+yOO4/P24En0BSTW5y2O8uV0=; b=70UCr7XZO35TLsFkoW5GgfjW+TOIb/7O+GtFh5nY2Ba0Kj8attDjGQHdYWKdU1pOlYUnS7 aVjha83iHl/RxfG3NX2EPOMjRHKhEljnCvVWuLWNyUBy6lh8cGVK+KGMotgG6dIb89YIEe J8k+yWzOmSYtVRzLUWdD4KViqQ4VHCI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655965844; a=rsa-sha256; cv=none; b=IvTMdoBS936EhtnYiSbPTmI8v9OteKvKuWYfRUGhvBg7+UHAGHgqvuep3oVc6400b2/dMj nptnfb4xJLFN0laOE3/r83Frt9KsD0HjUZQaeobEyFZQS53vtIJAXs9qXCCRuVT+hG98rz bdTmsrkbvD/8Sdq/mWXg58Z97Hy5OpA= X-Stat-Signature: tui78fce8cc8e4axux164scsx7za5hnr X-Rspam-User: X-Rspamd-Server: rspam07 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mgiLVWvd; spf=pass (imf17.hostedemail.com: domain of remckee0@gmail.com designates 209.85.160.67 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Queue-Id: 36D564001C X-HE-Tag: 1655965844-50927 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Jun 22, 2022 at 11:30:10PM -0500, Mike Rapoport wrote: > On Wed, Jun 22, 2022 at 04:29:07AM -0500, Rebecca Mckeever wrote: > > Add and use functions for printing verbose testing output. > > > > If the Memblock simulator was compiled with VERBOSE=1: > > 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=1, 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 | 58 +++ > > tools/testing/memblock/tests/common.h | 54 +++ > > 6 files changed, 880 insertions(+), 344 deletions(-) > > > > diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c > > index d1aa7e15c18d..96df033d4300 100644 > > --- a/tools/testing/memblock/tests/alloc_api.c > > +++ b/tools/testing/memblock/tests/alloc_api.c > > ... > > > @@ -729,6 +820,12 @@ static int alloc_no_memory_check(void) > > > > int memblock_alloc_checks(void) > > { > > + static const char func_testing[] = "memblock_alloc"; > > + > > + prefix_reset(); > > + prefix_push(func_testing); > > + test_print("Running %s tests...\n", func_testing); > > Why not > > test_print("Running memblock_alloc tests...\n"); > > ? > > (applies to other cases below) Both prefix_push() and test_print() are using that string, and I thought it made sense to use a constant instead of hard coding the string in both places. Is it better to hard code the string in this case? > > > + > > reset_memblock_attributes(); > > dummy_physical_memory_init(); > > ... > > > diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/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 > > ... > > > @@ -378,6 +423,12 @@ static int alloc_from_min_addr_cap_check(void) > > > > int memblock_alloc_helpers_checks(void) > > { > > + static const char func_testing[] = "memblock_alloc_from"; > > + > > + prefix_reset(); > > + prefix_push(func_testing); > > + test_print("Running %s tests...\n", func_testing); > > + > > reset_memblock_attributes(); > > dummy_physical_memory_init(); > > > > diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/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 > > ... > > > @@ -1150,6 +1263,12 @@ static int alloc_try_nid_low_max_check(void) > > > > int memblock_alloc_nid_checks(void) > > { > > + static const char func_testing[] = "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(); > > > > @@ -1170,5 +1289,7 @@ int memblock_alloc_nid_checks(void) > > > > dummy_physical_memory_cleanup(); > > > > + prefix_pop(); > > + > > return 0; > > } > > diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/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" > > > > #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" > > > > static int memblock_initialization_check(void) > > { > > - assert(memblock.memory.regions); > > - assert(memblock.memory.cnt == 1); > > - assert(memblock.memory.max == EXPECTED_MEMBLOCK_REGIONS); > > - assert(strcmp(memblock.memory.name, "memory") == 0); > > + prefix_push(__func__); > > > > - assert(memblock.reserved.regions); > > - assert(memblock.reserved.cnt == 1); > > - assert(memblock.memory.max == EXPECTED_MEMBLOCK_REGIONS); > > - assert(strcmp(memblock.reserved.name, "reserved") == 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); > > > > - assert(!memblock.bottom_up); > > - assert(memblock.current_limit == 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(); > > > > return 0; > > } > > @@ -40,14 +49,19 @@ static int memblock_add_simple_check(void) > > .size = SZ_4M > > }; > > > > + prefix_push(__func__); > > + > > reset_memblock_regions(); > > memblock_add(r.base, r.size); > > > > - assert(rgn->base == r.base); > > - assert(rgn->size == 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); > > > > - assert(memblock.memory.cnt == 1); > > - assert(memblock.memory.total_size == r.size); > > + test_pass(); > > + prefix_pop(); > > > > return 0; > > } > > @@ -69,18 +83,27 @@ static int memblock_add_node_simple_check(void) > > .size = SZ_16M > > }; > > > > + prefix_pop(); > > + prefix_push("memblock_add_node"); > > + prefix_push(__func__); > > I think there is no need to change the prefix from memblock_add to > memblock_add_node here. > > ok 3 : memblock_add: memblock_add_node_simple_check: passed > > provides enough information. > Will do. > > + > > reset_memblock_regions(); > > memblock_add_node(r.base, r.size, 1, MEMBLOCK_HOTPLUG); > > > > - assert(rgn->base == r.base); > > - assert(rgn->size == r.size); > > + ASSERT_EQ(rgn->base, r.base); > > + ASSERT_EQ(rgn->size, r.size); > > #ifdef CONFIG_NUMA > > - assert(rgn->nid == 1); > > + ASSERT_EQ(rgn->nid, 1); > > #endif > > - assert(rgn->flags == MEMBLOCK_HOTPLUG); > > + ASSERT_EQ(rgn->flags, MEMBLOCK_HOTPLUG); > > + > > + ASSERT_EQ(memblock.memory.cnt, 1); > > + ASSERT_EQ(memblock.memory.total_size, r.size); > > > > - assert(memblock.memory.cnt == 1); > > - assert(memblock.memory.total_size == r.size); > > + test_pass(); > > + prefix_pop(); > > + prefix_pop(); > > + prefix_push(FUNC_ADD); > > > > return 0; > > } > > -- > Sincerely yours, > Mike. Thanks, Rebecca