From patchwork Tue Aug 30 01:49:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Shaoqin" X-Patchwork-Id: 12958595 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 4E987ECAAD4 for ; Tue, 30 Aug 2022 01:51:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BAAD56B0072; Mon, 29 Aug 2022 21:51:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5A34940009; Mon, 29 Aug 2022 21:51:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FB32940008; Mon, 29 Aug 2022 21:51:15 -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 92DBA6B0072 for ; Mon, 29 Aug 2022 21:51:15 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6A4D6A0C02 for ; Tue, 30 Aug 2022 01:51:15 +0000 (UTC) X-FDA: 79854581310.06.085DA82 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf11.hostedemail.com (Postfix) with ESMTP id D274E4000D for ; Tue, 30 Aug 2022 01:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661824274; x=1693360274; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OHdeZU3zCE5Y6OYgb7a7NyVSc9y1tganA4G2YOsk2Ec=; b=K9uu9ASx2YNU3yucmlnsqElPVLdkjl1u5x1CzR7BoEml39oqyUS2Hvc+ 8Nql07raZnoz6uxpT5P2ozE/RUQc9AQWHnXnAQzot1E6HWRjn5ubgVM+f LagiF723krlnz+YE2t0JYTSjct7qxfpRouDAn9yC3A4IYVDsCJL5lCq6Q E67j0lXES9DfUmMcGZlGxxZTuL4d7g6UGJtILhpss2F2aN0NMFvl/kt/Q zyQX8tXQH2e3CBZXSLj8y4SjMbcRm3XEBwz1zSgT/xxTKiUFjL+HFqcm3 LLZBCYfOV8b9QN4ZgKX9tmpdHQPYXP8srMc6oZN1UmUQcV1fyA4kXNjYO Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="321177904" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="321177904" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2022 18:51:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641167057" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga008.jf.intel.com with ESMTP; 29 Aug 2022 18:51:10 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Karolina Drobnik , David Hildenbrand , Rebecca Mckeever , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] memblock test: Add test to memblock_add() 129th region Date: Tue, 30 Aug 2022 09:49:17 +0800 Message-Id: <20220830014925.162718-2-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830014925.162718-1-shaoqin.huang@intel.com> References: <20220830014925.162718-1-shaoqin.huang@intel.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=K9uu9ASx; spf=softfail (imf11.hostedemail.com: 192.55.52.88 is neither permitted nor denied by domain of shaoqin.huang@intel.com) smtp.mailfrom=shaoqin.huang@intel.com; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661824275; a=rsa-sha256; cv=none; b=braRcDn/dT3lA6gE3fdVuKYeRml4KnF18hbFY9Yf13E5G72g5GJUKIhlByi2SqMrFBIrlF u3iwQ9mNfmVin3PZXVHSnI70970kAhzJ9ZCyGQ4dVXsW+vCo8yBUiPy8knrS9BQx/S6iGY 4Lj4lvPFHCrlaO50b5RDylF+y3Ap+ek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661824275; 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=7ccsdM8TCAB5nVH5MNFh73DdxwCOWkBrEchD0FUWri4=; b=wDDGBE60sue0VB7m6BcaxY2NL7x4dL2+dBdzdZzwDVXGHEsmTq0/8AtWRXptCzNjmK+cdd T1LlUTR8daOodsXru5j5uMU/IGYIqvG3O/seXAiJgE1/ZiXXX/urhsk/Jm4lY+TLq0rc4d lQElJhSB5ggh7FoUjHtN3g/t5jrXYmE= Authentication-Results: imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=K9uu9ASx; spf=softfail (imf11.hostedemail.com: 192.55.52.88 is neither permitted nor denied by domain of shaoqin.huang@intel.com) smtp.mailfrom=shaoqin.huang@intel.com; dmarc=fail reason="No valid SPF" header.from=intel.com (policy=none) X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: ing53wr666uzxb15jxrqfxfy6jg3utp5 X-Rspamd-Queue-Id: D274E4000D X-HE-Tag: 1661824274-309578 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 valid memory region, and fake the other memory region, so 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 | 82 ++++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +- tools/testing/memblock/tests/common.h | 3 + 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index 66f46f261e66..c8e201156cdc 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -326,6 +326,87 @@ static int memblock_add_twice_check(void) return 0; } +/* + * A test that tries 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 = MEM_SIZE, + }; + phys_addr_t memory_base = SZ_128K; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + /* + * Add one valid memory region, this will be choosed to be the memory + * that new memory.regions occupied. + */ + dummy_physical_memory_init(); + memblock_add((phys_addr_t)get_memory_block_base(), MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, MEM_SIZE); + + for (i = 1; i < INIT_MEMBLOCK_REGIONS; i++) { + /* Add some fakes memory region to fulfill the memblock. */ + memblock_add(memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, i + 1); + ASSERT_EQ(memblock.memory.total_size, (i + 1) * MEM_SIZE); + + /* Keep the gap so these memory region will not be merged. */ + memory_base += MEM_SIZE * 2; + } + + orig_region = memblock.memory.regions; + + /* This adds the 129 memory_region, and makes it double array. */ + memblock_add((phys_addr_t)memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.memory.cnt, INIT_MEMBLOCK_REGIONS + 1); + ASSERT_EQ(memblock.memory.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_SIZE); + ASSERT_EQ(memblock.memory.max, INIT_MEMBLOCK_REGIONS * 2); + + ASSERT_EQ(memblock.reserved.cnt, 1); + /* This is the size used by new memory.regions. Check it. */ + ASSERT_EQ(memblock.reserved.total_size, PAGE_ALIGN(INIT_MEMBLOCK_REGIONS * 2 * + sizeof(struct memblock_region))); + + /* The base is very small, so it should be insert to the first region. */ + 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 + 2) * MEM_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(); @@ -339,6 +420,7 @@ static int memblock_add_checks(void) memblock_add_overlap_bottom_check(); memblock_add_within_check(); memblock_add_twice_check(); + memblock_add_many_check(); prefix_pop(); diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock/tests/common.c index 76a8ad818f3a..96fabd96ff31 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 ": " @@ -77,6 +75,11 @@ void dummy_physical_memory_cleanup(void) free(memory_block.base); } +void *get_memory_block_base(void) +{ + return 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 d396e5423a8e..d56af621c543 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -11,6 +11,8 @@ #include <../selftests/kselftest.h> #define MEM_SIZE SZ_16K +#define INIT_MEMBLOCK_REGIONS 128 +#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS /** * ASSERT_EQ(): @@ -73,6 +75,7 @@ void reset_memblock_attributes(void); void setup_memblock(void); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); +void *get_memory_block_base(void); void parse_args(int argc, char **argv); void test_fail(void);