From patchwork Tue Oct 11 06:21:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Shaoqin" X-Patchwork-Id: 13003666 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 CCA5FC433F5 for ; Tue, 11 Oct 2022 06:21:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46A8C6B0078; Tue, 11 Oct 2022 02:21:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F2A56B007B; Tue, 11 Oct 2022 02:21:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 293896B007D; Tue, 11 Oct 2022 02:21:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 140C96B0078 for ; Tue, 11 Oct 2022 02:21:22 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E69991206FF for ; Tue, 11 Oct 2022 06:21:21 +0000 (UTC) X-FDA: 80007671562.27.8F8EA84 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf17.hostedemail.com (Postfix) with ESMTP id 3E73240027 for ; Tue, 11 Oct 2022 06:21:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665469281; x=1697005281; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OlGIODpv04YEUz28eV6/esNGVmMut18UL3VgBHg/Gxc=; b=fcnYUOS7a2EPO2gY5Zw4Xx7MleNfypqWdKJXZde40iBV9eCW4azpjQHo TVYtzbze0IlY8tDk/CccNThXS0fNZsbB+qubr5UVzxY9IWbYAFTAQJXU8 5S5HAy2duiLOvmJoXxs31oBb7LMsi/Ye+mLMM62bdZctSGwPd3f8XDDDR T76aYSgtBn9/0wx91b9C0WUCFED9LDYhS0A2fR/iG4fwhSRy4pMDbFSpF 4psVBTJ2gAihQ9dTBMlPzaHi6V3MVR53ujPgxd6FWOyuJ3aXVl/6zd9C4 ZDjhDMA/g/GYQZ78kUuA939UV0dEnvUVehzHnUIwIXvgaFYon/8Gw3kIa w==; X-IronPort-AV: E=McAfee;i="6500,9779,10496"; a="390727652" X-IronPort-AV: E=Sophos;i="5.95,175,1661842800"; d="scan'208";a="390727652" 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:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10496"; a="577321991" X-IronPort-AV: E=Sophos;i="5.95,175,1661842800"; d="scan'208";a="577321991" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga003.jf.intel.com with ESMTP; 10 Oct 2022 23:21:18 -0700 From: shaoqin.huang@intel.com To: rppt@kernel.org Cc: Shaoqin Huang , Karolina Drobnik , Rebecca Mckeever , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] memblock test: Add test to memblock_reserve() 129th region Date: Tue, 11 Oct 2022 14:21:21 +0800 Message-Id: <20221011062128.49359-3-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=1665469281; 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=dUt3tJb2OYIfAxz7jv8jQWHh7b94TyYbQK8fuSEm1q8=; b=dNfXj0WEvD3YR07jQa3hNImMIZ0Atle2WPaY5KS9hJqhrceNhd8dMTrD+Ofq8lP+ivHlD4 pG+x9TESnv3Vtnq351w1B+QU+aKxvOj0IwXnEH5Yv4n2NLT7ayNDZaMz28CFuPNih3TAHC urqGETt+vUhqGdn+w7ZIgJnk6Ohc6ck= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=fcnYUOS7; 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=1665469281; a=rsa-sha256; cv=none; b=rAfG34jvUZWTHURIqTU9z5YiPCh+UZXYEt9h/wF1cY6ozI7gmqJ1Muk6CpEHaMVDpT6Pfh Bf/vIo9n9ps2wDVvMcfAQMAojfoCpb3JGf9gFnE314noMnLURUWsKTzyZ8+UX5f8QIo2fq u+QU3sLlLRQpACGEQlVdoqkeRHaXSiQ= Authentication-Results: imf17.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=fcnYUOS7; 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: eo96oo4t5oeesw6oyi4xrp4j48tr3mpj X-Rspamd-Queue-Id: 3E73240027 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1665469281-733262 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 Reserve 129th region in 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. At the same time, reserve 128 faked memory region, and make sure these reserved region not intersect with the valid memory region. So memblock_double_array() will choose the valid memory region, and it will success. Also need to restore the reserved.regions after memblock_double_array(), to make sure the subsequent tests can run as normal. Signed-off-by: Shaoqin Huang --- tools/testing/memblock/tests/basic_api.c | 91 ++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index 4d61a4b474be..c07a1ab0f19b 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -892,6 +892,96 @@ static int memblock_reserve_near_max_check(void) return 0; } +/* + * A test that trying to reserve the 129th memory block. + * Expect to trigger memblock_double_array() to double the + * memblock.memory.max, find a new valid memory as + * reserved.regions. + */ +static int memblock_reserve_many_check(void) +{ + int i; + void *orig_region; + struct region r = { + .base = SZ_16K, + .size = SZ_16K, + }; + phys_addr_t memory_base = SZ_128K; + phys_addr_t new_reserved_regions_size; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_allow_resize(); + + /* Add a valid memory region used by double_array(). */ + dummy_physical_memory_init(); + memblock_add(dummy_physical_memory_base(), MEM_SIZE); + + for (i = 0; i < INIT_MEMBLOCK_REGIONS; i++) { + /* Reserve some fakes memory region to fulfill the memblock. */ + memblock_reserve(memory_base, MEM_SIZE); + + ASSERT_EQ(memblock.reserved.cnt, i + 1); + ASSERT_EQ(memblock.reserved.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.reserved.regions; + + /* This reserve the 129 memory_region, and makes it double array. */ + memblock_reserve(memory_base, MEM_SIZE); + + /* + * This is the memory region size used by the doubled reserved.regions, + * and it has been reserved due to it has been used. The size is used to + * calculate the total_size that the memblock.reserved have now. + */ + new_reserved_regions_size = PAGE_ALIGN((INIT_MEMBLOCK_REGIONS * 2) * + sizeof(struct memblock_region)); + /* + * The double_array() will find a free memory region as the new + * reserved.regions, and the used memory region will be reserved, so + * there will be one more region exist in the reserved memblock. And the + * one more reserved region's size is new_reserved_regions_size. + */ + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 2); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_SIZE + + new_reserved_regions_size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + /* + * Now memblock_double_array() works fine. Let's check after the + * double_array(), the memblock_reserve() still works as normal. + */ + memblock_reserve(r.base, r.size); + ASSERT_EQ(memblock.reserved.regions[0].base, r.base); + ASSERT_EQ(memblock.reserved.regions[0].size, r.size); + + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 3); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_SIZE + + new_reserved_regions_size + + r.size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + dummy_physical_memory_cleanup(); + + /* + * The current reserved.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.reserved.regions = orig_region; + memblock.reserved.cnt = INIT_MEMBLOCK_REGIONS; + + test_pass_pop(); + + return 0; +} + static int memblock_reserve_checks(void) { prefix_reset(); @@ -906,6 +996,7 @@ static int memblock_reserve_checks(void) memblock_reserve_twice_check(); memblock_reserve_between_check(); memblock_reserve_near_max_check(); + memblock_reserve_many_check(); prefix_pop();