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 7EE54C00140 for ; Tue, 16 Aug 2022 02:39:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E66A08D0002; Mon, 15 Aug 2022 22:39:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E15DA8D0001; Mon, 15 Aug 2022 22:39:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB63F8D0002; Mon, 15 Aug 2022 22:39:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B89BE8D0001 for ; Mon, 15 Aug 2022 22:39:54 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 849A31A054B for ; Tue, 16 Aug 2022 02:39:54 +0000 (UTC) X-FDA: 79803900708.21.CEA183B Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf09.hostedemail.com (Postfix) with ESMTP id 165F81401BF for ; Tue, 16 Aug 2022 02:39:53 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id w18so2307270qki.8 for ; Mon, 15 Aug 2022 19:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=zWOSu0AQyXMllOf0K9uNlKMi3D8DQnHUUK1GVgxJZ4M=; b=WPwIu1bLc1jBO7d/x5vuzw2Rek/uuqQvmJUTNQEVSnw1++9OlfDgjTZJZXjN4cy9+s QNyU/Ptphn+FrPf45STtTViwb+NlPqpSRByd20Viv0RJWaMaqIug09W45UOXaL8sWQNO o2rsOBWoMV9yx0HbXeGkapbmhYssK9InMxCu0lnt2du6d+5SjI4tR4kAVFi7d0vUTPB2 HU2DRdF9QBAGz59xApU+YENHi38xhbLSbWgvJBOqGqeGf+ADtxedEeg8DrcdY/PocYFd MI+/Y31IeCqqwG1eYALcZGZ2+KhnsyvV8VCGjs9PsNRn+isaB3WDiVXAJAa/kOpbd9DG e/+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=zWOSu0AQyXMllOf0K9uNlKMi3D8DQnHUUK1GVgxJZ4M=; b=pCsM9Cg06rZSxECzl7t9jfVdyPftbAllzVbBFb0ZASNqeuqmOaCgWwUZ2jcvF0BdK+ LTTbkdYxmmchAD0JMgmy/z4tU2+J0HJLcgB3yoeUuDzMzQ3F4KUgIbZ7lQfJ2EraxmfZ PtC4KXMzy9XjUZ0W2838ikhEflWbEfwCwWgVxzZvY9tXlYjhJEuPQj6csOE/rSfb9TQW ErAVo4Cl1iMFTQ6QPEW6l5TAcC6xxMs4Tv78wS/BoDYPDLkJnpi4gLrPFQh1yeTYAdz+ EqPYo0QOkk7FNHbJvrdp+K/eiL3JaLkDNlYDDVO60UW8nyBEFFbjcv+VBjfdvv6J4O6b JdDA== X-Gm-Message-State: ACgBeo3vxJ3A36gneHvHweuFpjZI7hQ8u8W4Tpjl6onIvgIvP9j9YsKo tD8EmDSQQEtRtd+7CXhRM3M= X-Google-Smtp-Source: AA6agR6e178nfpwK8qG+OXgwESC+DMixmFzsLVLG3OW6FDmKJ/O9TeuTbFp1QSyYBsXo1xWtbQXVKg== X-Received: by 2002:a05:620a:1906:b0:6b8:ac92:1f1c with SMTP id bj6-20020a05620a190600b006b8ac921f1cmr13475286qkb.633.1660617593178; Mon, 15 Aug 2022 19:39:53 -0700 (PDT) Received: from sophie ([185.156.46.184]) by smtp.gmail.com with ESMTPSA id j17-20020ac86651000000b003436103df40sm9183739qtp.8.2022.08.15.19.39.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 19:39:52 -0700 (PDT) Date: Mon, 15 Aug 2022 21:39:51 -0500 From: Rebecca Mckeever To: "Huang, Shaoqin" Cc: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand Subject: Re: [PATCH 3/8] memblock tests: add labels to verbose output for generic alloc tests Message-ID: <20220816023951.GB3590@sophie> References: <63e9e964-021e-e141-00f8-afd7feb774fb@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <63e9e964-021e-e141-00f8-afd7feb774fb@intel.com> ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WPwIu1bL; spf=pass (imf09.hostedemail.com: domain of remckee0@gmail.com designates 209.85.222.194 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660617594; a=rsa-sha256; cv=none; b=XA9QwelTwSk39fv5YQsmRRO2P+x6nxMzBOQ+mCcXWNiajZBg8OR0IrJ5E/s9fmydZ+cmvr zlEpLGFDXRZhFoe2hoO0wMsbMV8B8LRePZWfFPTkDXVTuVNDWMCJH33aScKlhk8LwFjrpv XGUzw+pBEVYRi3/xJg6nZpJ6O5PE2Kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660617594; 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=zWOSu0AQyXMllOf0K9uNlKMi3D8DQnHUUK1GVgxJZ4M=; b=NXFVRCDLcpRLivZCHkdFaqphH6ehbEuCj0Z3/tvw9b1nOhWZAvAfCcYsn5Yf/0EjQ6Rbvc j69pmD+MPw/bFN18CLLXgt9q9Eyn+5KVEieUoBbtGeFS4zD5d4AZR9TRPsj4W3urh8Sp+2 FGTZKho3Pha2V5MxkZwl1vPyy20kGNY= X-Stat-Signature: chcaoxbjmn796in7stpnfnyrswaij5k3 X-Rspamd-Queue-Id: 165F81401BF X-Rspamd-Server: rspam08 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WPwIu1bL; spf=pass (imf09.hostedemail.com: domain of remckee0@gmail.com designates 209.85.222.194 as permitted sender) smtp.mailfrom=remckee0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-HE-Tag: 1660617593-693657 X-Bogosity: Ham, tests=bogofilter, spamicity=0.004856, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Aug 15, 2022 at 05:15:47PM +0800, Huang, Shaoqin wrote: > I found original some of test function has the prefix `top_down` and > `bottom_up`, and some of test function didn't have the prefix. > > In this patch, it just modified these functions which didn't have the prefix > `top_down` or `bottom_up`, and now there are two style about these test > functions in the code. > > One is: > run_top_down(alloc_in_between_generic_check); > run_bottom_up(alloc_in_between_generic_check); > > Another one is: > memblock_set_bottom_up(false); > alloc_top_down_before_check(); > memblock_set_bottom_up(true); > alloc_bottom_up_before_check(); > > Thus there gonna be two output style, here is an example: > ok 89 : memblock_alloc_from: top-down: alloc_from_simple_generic_check: > passed > ok 90 : memblock_alloc_from: bottom-up: alloc_from_simple_generic_check: > passed > > ok 99 : memblock_alloc_try_nid: alloc_try_nid_top_down_simple_check: passed > ok 100 : memblock_alloc_try_nid: alloc_try_nid_bottom_up_simple_check: > passed > > It may make confuse if one is printed between the colon and one is inside > the function name. > > So maybe make the style consistent is more make sense. And I think this can > be done by modify all these function name which with `top_down` and > `bottom_up` inside, and replace them with your new run_top_down() and > run_bottom_up() functions. > So you're saying use run_top_down() and run_bottom_up() even for functions with `top_down` and `bottom_up` in the name, but don't change the names? > On 8/14/2022 1:53 PM, Rebecca Mckeever wrote: > > Generic tests for memblock_alloc*() functions do not use separate > > functions for testing top-down and bottom-up allocation directions. > > Therefore, the function name that is displayed in the verbose testing > > output does not include the allocation direction. > > > > Add an additional prefix when running generic tests for > > memblock_alloc*() functions that indicates which allocation direction is > > set. The prefix will be displayed when the tests are run in verbose mode. > > > > Signed-off-by: Rebecca Mckeever > > --- > > tools/testing/memblock/tests/alloc_api.c | 36 +++++++------------ > > .../memblock/tests/alloc_helpers_api.c | 12 +++---- > > tools/testing/memblock/tests/alloc_nid_api.c | 36 +++++++------------ > > tools/testing/memblock/tests/common.h | 16 +++++++++ > > 4 files changed, 44 insertions(+), 56 deletions(-) > > > > diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c > > index 71c89cb9b2a8..73c2c43e702a 100644 > > --- a/tools/testing/memblock/tests/alloc_api.c > > +++ b/tools/testing/memblock/tests/alloc_api.c > > @@ -752,10 +752,8 @@ static int alloc_after_check(void) > > 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); > > - alloc_in_between_generic_check(); > > + run_top_down(alloc_in_between_generic_check); > > + run_bottom_up(alloc_in_between_generic_check); > > return 0; > > } > > @@ -774,10 +772,8 @@ static int alloc_second_fit_check(void) > > 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); > > - alloc_small_gaps_generic_check(); > > + run_top_down(alloc_small_gaps_generic_check); > > + run_bottom_up(alloc_small_gaps_generic_check); > > return 0; > > } > > @@ -785,10 +781,8 @@ static int alloc_small_gaps_check(void) > > 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); > > - alloc_all_reserved_generic_check(); > > + run_top_down(alloc_all_reserved_generic_check); > > + run_bottom_up(alloc_all_reserved_generic_check); > > return 0; > > } > > @@ -796,10 +790,8 @@ static int alloc_all_reserved_check(void) > > 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); > > - alloc_no_space_generic_check(); > > + run_top_down(alloc_no_space_generic_check); > > + run_bottom_up(alloc_no_space_generic_check); > > return 0; > > } > > @@ -807,10 +799,8 @@ static int alloc_no_space_check(void) > > 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); > > - alloc_limited_space_generic_check(); > > + run_top_down(alloc_limited_space_generic_check); > > + run_bottom_up(alloc_limited_space_generic_check); > > return 0; > > } > > @@ -818,10 +808,8 @@ static int alloc_limited_space_check(void) > > 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); > > - alloc_no_memory_generic_check(); > > + run_top_down(alloc_no_memory_generic_check); > > + run_bottom_up(alloc_no_memory_generic_check); > > return 0; > > } > > diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c > > index 796527cf3bd2..1ccf02639ad6 100644 > > --- a/tools/testing/memblock/tests/alloc_helpers_api.c > > +++ b/tools/testing/memblock/tests/alloc_helpers_api.c > > @@ -357,10 +357,8 @@ static int alloc_from_bottom_up_min_addr_cap_check(void) > > 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); > > - alloc_from_simple_generic_check(); > > + run_top_down(alloc_from_simple_generic_check); > > + run_bottom_up(alloc_from_simple_generic_check); > > return 0; > > } > > @@ -368,10 +366,8 @@ static int alloc_from_simple_check(void) > > 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); > > - alloc_from_misaligned_generic_check(); > > + run_top_down(alloc_from_misaligned_generic_check); > > + run_bottom_up(alloc_from_misaligned_generic_check); > > return 0; > > } > > diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c > > index 71b7beb35526..82fa8ea36320 100644 > > --- a/tools/testing/memblock/tests/alloc_nid_api.c > > +++ b/tools/testing/memblock/tests/alloc_nid_api.c > > @@ -1142,10 +1142,8 @@ static int alloc_try_nid_cap_min_check(void) > > 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); > > - alloc_try_nid_min_reserved_generic_check(); > > + run_top_down(alloc_try_nid_min_reserved_generic_check); > > + run_bottom_up(alloc_try_nid_min_reserved_generic_check); > > return 0; > > } > > @@ -1153,10 +1151,8 @@ static int alloc_try_nid_min_reserved_check(void) > > 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); > > - alloc_try_nid_max_reserved_generic_check(); > > + run_top_down(alloc_try_nid_max_reserved_generic_check); > > + run_bottom_up(alloc_try_nid_max_reserved_generic_check); > > return 0; > > } > > @@ -1164,10 +1160,8 @@ static int alloc_try_nid_max_reserved_check(void) > > 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); > > - alloc_try_nid_exact_address_generic_check(); > > + run_top_down(alloc_try_nid_exact_address_generic_check); > > + run_bottom_up(alloc_try_nid_exact_address_generic_check); > > return 0; > > } > > @@ -1175,10 +1169,8 @@ static int alloc_try_nid_exact_address_check(void) > > 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); > > - alloc_try_nid_reserved_full_merge_generic_check(); > > + run_top_down(alloc_try_nid_reserved_full_merge_generic_check); > > + run_bottom_up(alloc_try_nid_reserved_full_merge_generic_check); > > return 0; > > } > > @@ -1186,10 +1178,8 @@ static int alloc_try_nid_reserved_full_merge_check(void) > > 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); > > - alloc_try_nid_reserved_all_generic_check(); > > + run_top_down(alloc_try_nid_reserved_all_generic_check); > > + run_bottom_up(alloc_try_nid_reserved_all_generic_check); > > return 0; > > } > > @@ -1197,10 +1187,8 @@ static int alloc_try_nid_reserved_all_check(void) > > 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); > > - alloc_try_nid_low_max_generic_check(); > > + run_top_down(alloc_try_nid_low_max_generic_check); > > + run_bottom_up(alloc_try_nid_low_max_generic_check); > > return 0; > > } > > diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h > > index 7a16a7dc8f2c..e0dd5b410099 100644 > > --- a/tools/testing/memblock/tests/common.h > > +++ b/tools/testing/memblock/tests/common.h > > @@ -101,4 +101,20 @@ static inline void test_pass_pop(void) > > prefix_pop(); > > } > > +static inline void run_top_down(int (*func)()) > > +{ > > + memblock_set_bottom_up(false); > > + prefix_push("top-down"); > > + func(); > > + prefix_pop(); > > +} > > + > > +static inline void run_bottom_up(int (*func)()) > > +{ > > + memblock_set_bottom_up(true); > > + prefix_push("bottom-up"); > > + func(); > > + prefix_pop(); > > +} > > + > > #endif