From patchwork Tue Oct 11 06:21:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Shaoqin" X-Patchwork-Id: 13003665 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 F1010C433FE for ; Tue, 11 Oct 2022 06:21:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46A7F6B0074; Tue, 11 Oct 2022 02:21:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 418E06B0075; Tue, 11 Oct 2022 02:21:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E1BF6B0078; Tue, 11 Oct 2022 02:21:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0F44C6B0074 for ; Tue, 11 Oct 2022 02:21:20 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C330216040B for ; Tue, 11 Oct 2022 06:21:19 +0000 (UTC) X-FDA: 80007671478.14.8D82357 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf17.hostedemail.com (Postfix) with ESMTP id 3360C40027 for ; Tue, 11 Oct 2022 06:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665469278; x=1697005278; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0qxV4gyJ/ejlW/tPGTWrK8Ih4YPly+7yJn9Z1PGkJMw=; b=eViQHIFcmuCAyMdjF61b+3C0TMVLo6BPTStvXp5ampv0oFJ5DRMH1k7S TffdLivIWN0kU9gyrxgOJxJvLmO/aE5aYm51kkVoZTFfl64RKy+9pxMam rhaLMRAwcuN1CnNGdycDT46Bi3p2M/lJRFopdMHaGcvv7HGWCvMw3Q5xw fke21SuAelUuz8h1pcqNZkXuvWJNCHRB0ieIxHjjzGDPg8l2iEYWWBqP6 KXGBzjKXM6bjyl4iH5H0DGKz04Kzw0qYGtNM62tILHJLFbd9oxDB2Zsw4 GS0v3Q5IuDVg3bDsd+kThnQ/QsJpUXzAilM4opvPa3Pahdfz03E6X35Qn Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10496"; a="390727645" X-IronPort-AV: E=Sophos;i="5.95,175,1661842800"; d="scan'208";a="390727645" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 23:21:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10496"; a="577321977" X-IronPort-AV: E=Sophos;i="5.95,175,1661842800"; d="scan'208";a="577321977" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga003.jf.intel.com with ESMTP; 10 Oct 2022 23:21:14 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Rebecca Mckeever , Karolina Drobnik , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] memblock test: Add test to memblock_add() 129th region Date: Tue, 11 Oct 2022 14:21:20 +0800 Message-Id: <20221011062128.49359-2-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011062128.49359-1-shaoqin.huang@intel.com> References: <20221011062128.49359-1-shaoqin.huang@intel.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1665469278; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9oi6Cq+hzFzy3/JewRZeljWs2KJZrXMq1bs08sFiWw0=; b=nvH9v9fSawJE8jS9eTGtwDZ5T5Mymqk4I5RHGsSuaQu3PMq0gQzWNB9kK7hODLM0EfKKai HtFISNNurIwFJ+2OjSlj1KSB3blHLh+RrLCCDdnSbjMCoTSlzZQZSObuRA4YT37vXEjmKj +coA4W/cv0SPC1GKHCRVFqxSqZwZeVk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=eViQHIFc; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf17.hostedemail.com: domain of shaoqin.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=shaoqin.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665469278; a=rsa-sha256; cv=none; b=RF7XoYVsfyTK7bU6XgKXQJTgy74sCXLIEhS8H5VobWzLqBoZaUdX+KlMsdt7OYKW/wXc/l ug/PeHMIr9MeR67C8YwoXcAgkKjUz45sKLEj1GaeTvGd8nCCq5msGRtTUWapVlmpOv7Vdk EIQlVHXdOZLlse+6Nxmd0+XAufm8Ic8= Authentication-Results: imf17.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=eViQHIFc; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf17.hostedemail.com: domain of shaoqin.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=shaoqin.huang@intel.com X-Stat-Signature: aziyxwq4znmhpwe6joz49uqf54rqi7do X-Rspamd-Queue-Id: 3360C40027 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1665469278-549010 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: From: Shaoqin Huang Add 129th region into the memblock, and this will trigger the memblock_double_array() function, this needs valid memory regions. So using dummy_physical_memory_init() to allocate a large enough memory region, and split it into a large enough memory which can be choosed by memblock_double_array(), and the left memory will be split into small memory region, and add them into the memblock. It make sure the memblock_double_array() will always choose the valid memory region that is allocated by the dummy_physical_memory_init(). So memblock_double_array() must success. Another thing should be done is to restore the memory.regions after memblock_double_array(), due to now the memory.regions is pointing to a memory region allocated by dummy_physical_memory_init(). And it will affect the subsequent tests if we don't restore the memory region. So simply record the origin region, and restore it after the test. Signed-off-by: Shaoqin Huang --- tools/testing/memblock/tests/basic_api.c | 93 ++++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +- tools/testing/memblock/tests/common.h | 6 +- 3 files changed, 103 insertions(+), 3 deletions(-) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index a13a57ba0815..4d61a4b474be 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -423,6 +423,98 @@ static int memblock_add_near_max_check(void) return 0; } +/* + * A test that trying to add the 129th memory block. + * Expect to trigger memblock_double_array() to double the + * memblock.memory.max, find a new valid memory as + * memory.regions. + */ +static int memblock_add_many_check(void) +{ + int i; + void *orig_region; + struct region r = { + .base = SZ_16K, + .size = SZ_16K, + }; + phys_addr_t new_memory_regions_size; + phys_addr_t base, size = SZ_64; + phys_addr_t gap_size = SZ_64; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + dummy_physical_memory_init(); + /* + * We allocated enough memory by using dummy_physical_memory_init(), and + * split it into small block. First we split a large enough memory block + * as the memory region which will be choosed by memblock_double_array(). + */ + base = PAGE_ALIGN(dummy_physical_memory_base()); + new_memory_regions_size = PAGE_ALIGN(INIT_MEMBLOCK_REGIONS * 2 * + sizeof(struct memblock_region)); + memblock_add(base, new_memory_regions_size); + + /* This is the base of small memory block. */ + base += new_memory_regions_size + gap_size; + + orig_region = memblock.memory.regions; + + for (i = 0; i < INIT_MEMBLOCK_REGIONS; i++) { + /* + * Add these small block to fulfill the memblock. We keep a + * gap between the nearby memory to avoid being merged. + */ + memblock_add(base, size); + base += size + gap_size; + + ASSERT_EQ(memblock.memory.cnt, i + 2); + ASSERT_EQ(memblock.memory.total_size, new_memory_regions_size + + (i + 1) * size); + } + + /* + * At there, memblock_double_array() has been succeed, check if it + * update the memory.max. + */ + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + /* memblock_double_array() will reserve the memory it used. Check it. */ + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, new_memory_regions_size); + + /* + * Now memblock_double_array() works fine. Let's check after the + * double_array(), the memblock_add() still works as normal. + */ + memblock_add(r.base, r.size); + ASSERT_EQ(memblock.memory.regions[0].base, r.base); + ASSERT_EQ(memblock.memory.regions[0].size, r.size); + + ASSERT_EQ(memblock.memory.cnt, INIT_MEMBLOCK_REGIONS + 2); + ASSERT_EQ(memblock.memory.total_size, INIT_MEMBLOCK_REGIONS * size + + new_memory_regions_size + + r.size); + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + dummy_physical_memory_cleanup(); + + /* + * The current memory.regions is occupying a range of memory that + * allocated from dummy_physical_memory_init(). After free the memory, + * we must not use it. So restore the origin memory region to make sure + * the tests can run as normal and not affected by the double array. + */ + memblock.memory.regions = orig_region; + memblock.memory.cnt = INIT_MEMBLOCK_REGIONS; + + test_pass_pop(); + + return 0; +} + static int memblock_add_checks(void) { prefix_reset(); @@ -438,6 +530,7 @@ static int memblock_add_checks(void) memblock_add_twice_check(); memblock_add_between_check(); memblock_add_near_max_check(); + memblock_add_many_check(); prefix_pop(); diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock/tests/common.c index 3f795047bbe1..f43b6f414983 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -5,8 +5,6 @@ #include #include -#define INIT_MEMBLOCK_REGIONS 128 -#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS #define PREFIXES_MAX 15 #define DELIM ": " #define BASIS 10000 @@ -115,6 +113,11 @@ void dummy_physical_memory_cleanup(void) free(memory_block.base); } +phys_addr_t dummy_physical_memory_base(void) +{ + return (phys_addr_t)memory_block.base; +} + static void usage(const char *prog) { BUILD_BUG_ON(ARRAY_SIZE(help_opts) != ARRAY_SIZE(long_opts) - 1); diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h index d6bbbe63bfc3..cc82b85151b6 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -10,9 +10,12 @@ #include #include <../selftests/kselftest.h> -#define MEM_SIZE SZ_16K +#define MEM_SIZE SZ_32K #define NUMA_NODES 8 +#define INIT_MEMBLOCK_REGIONS 128 +#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS + enum test_flags { /* No special request. */ TEST_F_NONE = 0x0, @@ -124,6 +127,7 @@ void setup_memblock(void); void setup_numa_memblock(const unsigned int node_fracs[]); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); +phys_addr_t dummy_physical_memory_base(void); void parse_args(int argc, char **argv); void test_fail(void);