From patchwork Tue Aug 30 01:49:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Shaoqin" X-Patchwork-Id: 12958596 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 C9D8FECAAD2 for ; Tue, 30 Aug 2022 01:51:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CD58940008; Mon, 29 Aug 2022 21:51:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47D286B0074; Mon, 29 Aug 2022 21:51:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31D0D940008; Mon, 29 Aug 2022 21:51:18 -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 23E506B0073 for ; Mon, 29 Aug 2022 21:51:18 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E3599140B90 for ; Tue, 30 Aug 2022 01:51:17 +0000 (UTC) X-FDA: 79854581394.04.9D1C94A Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf11.hostedemail.com (Postfix) with ESMTP id 305C540002 for ; Tue, 30 Aug 2022 01:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661824277; x=1693360277; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QVIKac2TXXwtCKl68qr2q3XupTvP7bG4gHMbUWl00rA=; b=elqzq1zXf0F6Ap4CxqNo7r/dI8DVJsQsR3TSKN5438yBXy1l/5d4j9Gi bh9TwHI4cDkvFt63CszbBJmzzwZQ2hu9/DucGj46qPcsc5LnAcRzZ5aAY yupJ5vzZwBRRraAJhLBVCWGNfChDReBi8t2Q+MqjXlzZkPGPW84qxQrl4 DV0BVQ1dA0O82sFgKdYqy7KvavTo/bdUvjdrX7BpxL78TJh1izVHTEIMM TfAj07IOHfxTkJtUaHmuh3rlPKxO87wvvYD7J0y87OUep6honwGjMPo4K HJqflPeLd0czRknyCCuG/+4pO6FQjHfb66GNA6V9tVW3IaHcw4ibDUEj0 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="321177920" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="321177920" 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:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641167067" Received: from q.bj.intel.com ([10.238.154.102]) by orsmga008.jf.intel.com with ESMTP; 29 Aug 2022 18:51:14 -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 2/3] memblock test: Add test to memblock_reserve() 129th region Date: Tue, 30 Aug 2022 09:49:18 +0800 Message-Id: <20220830014925.162718-3-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=elqzq1zX; 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=1661824277; a=rsa-sha256; cv=none; b=0wegXyKkClB94dstvrpUmEbvzoLqaUWzruMtfP3PLTQFf3c+gnu3cAnG7XgYLGVhdTZg6n tm7niJ/F5JDeuqicrGscotFNzIMb+X+Z/pwyXQaUfRQXVJIHWBWWJ/1i3GlR/UktfZLLRO qegL0ajX/Ouaio5k8WCTCl+B+8ThvtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661824277; 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=5Zb9ZmQRaeUHvNWIPnwBfcKvFWkG8hWFUQnwJTNy3kE=; b=KoswIRXWzwk7XNn+UYcJ1JZiTdVRHNWzzM8XHm6hjNsDBY8IYKZrN1VAZi3VYDEdQFGOSE fwJctIrky8dsOplUcI4qlhJBdeKzeEpdo2hRFybNFIXkkfLz6ywEaymIZ6pRB1LoJ+CKkK 4kl7icH5EaH4LgH5Xa6xmVuCyE2noKc= Authentication-Results: imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=elqzq1zX; 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: z55xo9dokp4sitdp537jg1941pgiri8x X-Rspamd-Queue-Id: 305C540002 X-HE-Tag: 1661824277-877691 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 | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index c8e201156cdc..d8defc9866cb 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -686,6 +686,92 @@ static int memblock_reserve_twice_check(void) return 0; } +/* + * A test that tries 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 = MEM_SIZE, + }; + 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((phys_addr_t)get_memory_block_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 + 1 + 1); + 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); + + /* The base is very small, so it should be insert to the first region. */ + 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 + 2 + 1); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 2) * MEM_SIZE + + new_reserved_regions_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(); @@ -698,6 +784,7 @@ static int memblock_reserve_checks(void) memblock_reserve_overlap_bottom_check(); memblock_reserve_within_check(); memblock_reserve_twice_check(); + memblock_reserve_many_check(); prefix_pop();