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 83EA6C433EF for ; Thu, 23 Jun 2022 14:40:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF2198E0155; Thu, 23 Jun 2022 10:40:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA2418E0144; Thu, 23 Jun 2022 10:40:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 942388E0155; Thu, 23 Jun 2022 10:40:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8296F8E0144 for ; Thu, 23 Jun 2022 10:40:38 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B5D8891 for ; Thu, 23 Jun 2022 14:40:38 +0000 (UTC) X-FDA: 79609761756.07.3B8AB97 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id D1B95400A9 for ; Thu, 23 Jun 2022 14:40:37 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D8F2D61E2B; Thu, 23 Jun 2022 14:40:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B12AFC3411B; Thu, 23 Jun 2022 14:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655995236; bh=QTh4VJKoPdetDohawIGRYaT5G1zEoM3tktb6JFTNEuQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JWNH4lwzrShYeHr8BR7kAJzIGB9rslj3Vpq8mnUH2muVIyK63kkpTWi65SsqfDBhe TXBaNsiZGn+G7SZ/Sw/LLwv2c5nJia0JStnO16f6uMACi4Smx1RJi1FUBvgSyDX4lq jiIg0IuyQ3cGrEDrSHldAPSJtR8keISut6vHeOAO4szpyQybK7+j+el6y2WbMSBE5L 8IX5TT/SJ4LHqoTmihK32Q0GhgJ70ERauJ1lwcZELDmY7aZtlkMgJSEA5MnFYZLZP1 ++y1+5HvS+45+ejzPL3MaFFje0xUZrfCw1dqEY+42/pCW9fmZzWdI/H6aiKhZMAbg8 ljg2F1hrv5y3g== Date: Thu, 23 Jun 2022 09:40:30 -0500 From: Mike Rapoport To: Rebecca Mckeever 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655995238; a=rsa-sha256; cv=none; b=SBp/mH4u00toUW6tffHENKOYR2yyVjPAQfO9LU0Psi/pCgaQN9pq7o19xXTkAAHCrWcM2Y 2jnLMqLsj0IbFrJY4kZ0MNHG/Woz9moxu8rhDRrc/GxXgslg07q/Ni2Wdiugu3/+1FBXBW R+zvi3fktJ+QMoxtS8vFeYRDh5/J0os= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JWNH4lwz; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655995238; 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=wdLev/YMGjWkUnWFz50IzOkA9ToRZ1y4Q/WsJ4pWRnM=; b=O5g7tKlUaThOjkj7COZjzVq6eAXSBW8N5gwMcY8INEc2QTOY2D6nEWjhTDuGFGgRlcjwh8 KqC89KCRIcwTFbMjbWUPpNC8WBOWBJj2pV1ECaiQXRWnKtJwTfZg2+tJK9Olw+yz9pHHW4 7ZcWsHo299R1+PM+1RRz97dlNX1M5jk= X-Rspamd-Queue-Id: D1B95400A9 X-Rspam-User: Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JWNH4lwz; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Rspamd-Server: rspam03 X-Stat-Signature: fbz7zuij7cd8g9dj3yoxbzmzz4uh85s8 X-HE-Tag: 1655995237-910832 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 Thu, Jun 23, 2022 at 01:30:42AM -0500, Rebecca Mckeever wrote: > 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? Oh, missed that. I'd drop static, it doesn't really matter here. > > > + > > > 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 -- Sincerely yours, Mike.