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 55F1EC433FE for ; Wed, 2 Feb 2022 11:04:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBCD16B031C; Wed, 2 Feb 2022 06:04:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E465B6B031D; Wed, 2 Feb 2022 06:04:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C23AD6B031E; Wed, 2 Feb 2022 06:04:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0116.hostedemail.com [216.40.44.116]) by kanga.kvack.org (Postfix) with ESMTP id AAC686B031C for ; Wed, 2 Feb 2022 06:04:04 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 725AE95B13 for ; Wed, 2 Feb 2022 11:04:04 +0000 (UTC) X-FDA: 79097555208.28.D06A00B Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by imf04.hostedemail.com (Postfix) with ESMTP id 1B9B04000B for ; Wed, 2 Feb 2022 11:04:03 +0000 (UTC) Received: by mail-lf1-f46.google.com with SMTP id f10so13332262lfu.8 for ; Wed, 02 Feb 2022 03:04:03 -0800 (PST) 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=N4kQ7fCJQ83r9kjg6pIOnmCnBUnFX1leJDY6JkaRj+I=; b=VCWp1/CXErfDv2Si1Pb/0PNFj0BpYEAaoZj/+jKibP0b5cXP2y1E/YqFS0UBPQVp1g VECS2+1yJsPv5eJX3WlFnzEV7abFllvb16b0DSENlnUItUUIN0XJWqlPUaV3zF/TLAVQ BHoIuOxr9ytZrBiPPrSTozaI2/URo9Smr5x3zqP4E8JHHuHDH1r3G9sUKR7xsUqiKw+i XAVBxTjbyF4kN2F3SQVxTuLCvisSBXXop5VhHA6BPEAZg/G9d10GdacFF9+Ux3DgWEBu gvrJi/6VSZ8w0LXRHCssuKYCvLsA1NuVCC0a7UwN1BbeXf+MzZYh8oL/ZEio03Dtc3iH x1UQ== 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=N4kQ7fCJQ83r9kjg6pIOnmCnBUnFX1leJDY6JkaRj+I=; b=vATw/PFSdSQUx1sV/mjnOblqmhM3wcs6Ie7cTpa5UliwwHDvzb8P2aSxQZZdQe0Xr8 at05pAXeZJrQSrxzvEWJL6QAmxd+49XtLVCsyDwDIEnwIVnrKdqEja1H9R3lv6T9QBXh 7cEU5NGivcVmo34JBVVfbI4rZJ129vrIYuuHD6jDjdnjjcU8iJyT61TGlmGt6/hccKnf xOvi1zl5Q6OI/wf+8jIFuEuq1a5r0zTVKi35KvzEtuWN50eDDYs/RoNZWPIOvIzWhYS+ FGrnMwPKw3xwJXxOTjxid5N949BdiWGwPO4B056NDIw0eGRFazYuPMuMGJEMbhSn3RDd 8bfQ== X-Gm-Message-State: AOAM533/aDzop0Hm292e8t4oKw+Icf0IVi9fNSw9gGTvQZEi20fwwmUx NaaZUsvKZUkp95fj3V6BQ7QOlvqt6nE= X-Google-Smtp-Source: ABdhPJyCsJagbftgFxK2KvEqWWcPAQVBWfOi40WcO5VfiKDerxcwIHDP/STqsOYl6D6jHgRCJGdr5A== X-Received: by 2002:a05:6512:31d3:: with SMTP id j19mr24517829lfe.112.1643799842782; Wed, 02 Feb 2022 03:04:02 -0800 (PST) Received: from localhost.localdomain (staticline-31-183-164-222.toya.net.pl. [31.183.164.222]) by smtp.gmail.com with ESMTPSA id r14sm4503937lfr.129.2022.02.02.03.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 03:04:02 -0800 (PST) From: Karolina Drobnik To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, rppt@kernel.org, linux-kernel@vger.kernel.org, Karolina Drobnik Subject: [PATCH v2 11/16] memblock tests: Add memblock reset function Date: Wed, 2 Feb 2022 12:03:10 +0100 Message-Id: <8c185aa7e0dd68c2c7e937c9a06c90ae413e240f.1643796665.git.karolinadrobnik@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 1B9B04000B X-Stat-Signature: e9kwrpy9ebofw9ftxtxrdd45auxaqxun Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="VCWp1/CX"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of karolinadrobnik@gmail.com designates 209.85.167.46 as permitted sender) smtp.mailfrom=karolinadrobnik@gmail.com X-Rspam-User: nil X-HE-Tag: 1643799843-815365 Content-Transfer-Encoding: quoted-printable 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: Memblock simulator needs to be able to reset memblock data structures between different test cases. Add a function that sets all fields to their default values. Add a test checking if memblock is being initialized to expected values. Signed-off-by: Karolina Drobnik --- tools/testing/memblock/Makefile | 4 ++- tools/testing/memblock/main.c | 2 ++ tools/testing/memblock/tests/basic_api.c | 32 ++++++++++++++++++++++++ tools/testing/memblock/tests/basic_api.h | 10 ++++++++ tools/testing/memblock/tests/common.c | 27 ++++++++++++++++++++ tools/testing/memblock/tests/common.h | 15 +++++++++++ 6 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 tools/testing/memblock/tests/basic_api.c create mode 100644 tools/testing/memblock/tests/basic_api.h create mode 100644 tools/testing/memblock/tests/common.c create mode 100644 tools/testing/memblock/tests/common.h diff --git a/tools/testing/memblock/Makefile b/tools/testing/memblock/Mak= efile index e43ed9de9bcf..29715327a2d3 100644 --- a/tools/testing/memblock/Makefile +++ b/tools/testing/memblock/Makefile @@ -6,7 +6,9 @@ CFLAGS +=3D -I. -I../../include -Wall -O2 -fsanitize=3Dad= dress \ -fsanitize=3Dundefined -D CONFIG_PHYS_ADDR_T_64BIT LDFLAGS +=3D -fsanitize=3Daddress -fsanitize=3Dundefined TARGETS =3D main -OFILES =3D main.o memblock.o lib/slab.o mmzone.o slab.o +TEST_OFILES =3D tests/basic_api.o tests/common.o +DEP_OFILES =3D memblock.o lib/slab.o mmzone.o slab.o +OFILES =3D main.o $(DEP_OFILES) $(TEST_OFILES) EXTR_SRC =3D ../../../mm/memblock.c =20 ifeq ($(BUILD), 32) diff --git a/tools/testing/memblock/main.c b/tools/testing/memblock/main.= c index 62958da35d0f..da65b0adee91 100644 --- a/tools/testing/memblock/main.c +++ b/tools/testing/memblock/main.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later +#include "tests/basic_api.h" =20 int main(int argc, char **argv) { + memblock_basic_checks(); return 0; } diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/mem= block/tests/basic_api.c new file mode 100644 index 000000000000..7f2597b3dd4d --- /dev/null +++ b/tools/testing/memblock/tests/basic_api.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include +#include "basic_api.h" + +#define EXPECTED_MEMBLOCK_REGIONS 128 + +static int memblock_initialization_check(void) +{ + reset_memblock(); + + 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); + + 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(!memblock.bottom_up); + assert(memblock.current_limit =3D=3D MEMBLOCK_ALLOC_ANYWHERE); + + return 0; +} + +int memblock_basic_checks(void) +{ + memblock_initialization_check(); + return 0; +} diff --git a/tools/testing/memblock/tests/basic_api.h b/tools/testing/mem= block/tests/basic_api.h new file mode 100644 index 000000000000..1ceecfca1f47 --- /dev/null +++ b/tools/testing/memblock/tests/basic_api.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _MEMBLOCK_BASIC_H +#define _MEMBLOCK_BASIC_H + +#include +#include "common.h" + +int memblock_basic_checks(void); + +#endif diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblo= ck/tests/common.c new file mode 100644 index 000000000000..03de6eab0c3c --- /dev/null +++ b/tools/testing/memblock/tests/common.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include "tests/common.h" +#include + +#define INIT_MEMBLOCK_REGIONS 128 +#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS + +void reset_memblock(void) +{ + memset(memblock.memory.regions, 0, + memblock.memory.cnt * sizeof(struct memblock_region)); + memset(memblock.reserved.regions, 0, + memblock.reserved.cnt * sizeof(struct memblock_region)); + + memblock.memory.cnt =3D 1; + memblock.memory.max =3D INIT_MEMBLOCK_REGIONS; + memblock.memory.name =3D "memory"; + memblock.memory.total_size =3D 0; + + memblock.reserved.cnt =3D 1; + memblock.reserved.max =3D INIT_MEMBLOCK_RESERVED_REGIONS; + memblock.reserved.name =3D "reserved"; + memblock.reserved.total_size =3D 0; + + memblock.bottom_up =3D false; + memblock.current_limit =3D MEMBLOCK_ALLOC_ANYWHERE; +} diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblo= ck/tests/common.h new file mode 100644 index 000000000000..48efc4270ea1 --- /dev/null +++ b/tools/testing/memblock/tests/common.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _MEMBLOCK_TEST_H +#define _MEMBLOCK_TEST_H + +#include +#include + +struct region { + phys_addr_t base; + phys_addr_t size; +}; + +void reset_memblock(void); + +#endif --=20 2.30.2