From patchwork Tue Sep 13 06:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Shaoqin" X-Patchwork-Id: 12974469 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 5FFD5C6FA82 for ; Tue, 13 Sep 2022 06:42:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0219B6B0074; Tue, 13 Sep 2022 02:42:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F13898D0002; Tue, 13 Sep 2022 02:42:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDAFE8D0001; Tue, 13 Sep 2022 02:42:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CF2986B0074 for ; Tue, 13 Sep 2022 02:42:26 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B161241067 for ; Tue, 13 Sep 2022 06:42:26 +0000 (UTC) X-FDA: 79906118292.28.A6BFBDE Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf21.hostedemail.com (Postfix) with ESMTP id E527F1C00AB for ; Tue, 13 Sep 2022 06:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663051346; x=1694587346; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C4y1rYIKX4fqF3zCci/fAjCkU8Jw0wyitSdCTFzi5Ss=; b=NUVD3yQxvt+RUm07mp37bofqNvmiRF3kzL+RmcB2r5NsNTU2dI+d1qeo HMUyX8qeWbExqyZkaqwi/TRMOs1OEWFM3Y6jMfuPGRzEyDLR8id6fbTDJ JIRPbPFS4EbeM9GD3dijkOkbUrJnS/639qxhCjGogkt4iTJBz4KLNPu09 2pjLLvvc/6svZJ1SAWoLF9RzETkwveU/GDVvvsfVM0+gG4QoZ3tERtCBx P16/iRCTTdndzvBD/8lxsiWQf1azvS3ofcoPQmzS0sLEpjfa8MLgTb37z LjWfMth7fJ10q6YKTS3c5qhpP6KqDTXpJYRRjlCehsJ5vIuL7TPEFOTl2 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10468"; a="298851564" X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="298851564" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2022 23:41:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,312,1654585200"; d="scan'208";a="678428866" Received: from q.bj.intel.com ([10.238.154.102]) by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2022 23:41:53 -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 v3 2/3] memblock test: Add test to memblock_reserve() 129th region Date: Tue, 13 Sep 2022 14:41:31 +0800 Message-Id: <20220913064138.407601-3-shaoqin.huang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220913064138.407601-1-shaoqin.huang@intel.com> References: <20220913064138.407601-1-shaoqin.huang@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663051346; a=rsa-sha256; cv=none; b=XroBa1fpD1Yf/IXucVDedKdwa4lYDIydrcihA7EB37vOr7KXauiL1m/gaRomC4XVLlbnmh O1792FiPSRT2upKa+LGl0+GH5ChiTN+ywGtIG7UzeAgZYECTl+i598yohw5OdM0sWDe5KP G/bUDEmt2M5rJZqEMqDG33mPYNT7jo4= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=NUVD3yQx; spf=pass (imf21.hostedemail.com: domain of shaoqin.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=shaoqin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663051346; 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=pJenFHZXpxsGZfzrz2zgmSc14M4pruSICBjnUVpGTTg=; b=q395KcPQZhx9G+FDZ/QB5qZFGs3FxDbBCJnqMOqYMbbgTVEH4LlV7UdcBosotQTnpbd3tG TXOVwkchW8w7xo1ILSx9NpCXsyVb6krkwqWl7abeL3GV+dMxnPTgAqnBy/5RqtIiF9+IYt wVGOGgHkIJ4zg5EtekH6b7LvY0y6LwM= X-Stat-Signature: qq8txk4i8unj1qza4qjb6k9zfhr9qjmx X-Rspamd-Queue-Id: E527F1C00AB Authentication-Results: imf21.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=NUVD3yQx; spf=pass (imf21.hostedemail.com: domain of shaoqin.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=shaoqin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1663051345-650131 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 | 90 ++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index 7120fd8e47b1..1924524ad868 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -895,6 +895,95 @@ 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 = 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(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 + 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(); @@ -909,6 +998,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();