From mboxrd@z Thu Jan 1 00:00:00 1970 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 41E38C54EE9 for ; Sun, 18 Sep 2022 09:25:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5F8580007; Sun, 18 Sep 2022 05:25:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0DED940007; Sun, 18 Sep 2022 05:25:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D55880007; Sun, 18 Sep 2022 05:25:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 89A47940007 for ; Sun, 18 Sep 2022 05:25:43 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 42F6440ECD for ; Sun, 18 Sep 2022 09:25:43 +0000 (UTC) X-FDA: 79924673766.16.F3552E6 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf12.hostedemail.com (Postfix) with ESMTP id CC7A24001B for ; Sun, 18 Sep 2022 09:25:42 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 121E9B80E64; Sun, 18 Sep 2022 09:25:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F6B3C433D6; Sun, 18 Sep 2022 09:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663493139; bh=xsYQXX+3z6ZOqy0rzAyXKTUg2RN7nDHsbt0z33Xuv3w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=izsiYwUCrvppPE1pNtbTqMcY44nP5bfW26j4n5aUG4xo7g3hjhFFePfk7EKLX7uVy tgZvrJKS3ML7ibaYgipcLASDPvGe+p/7p51wajaYH+hcBnkgDyTo1PuYMhkuMZNxpI Ng98WMbsDrBYWQ6PAMXMn+9MuzwCU1oSSGu1BwIunIuVv184EF5NAQhU9H/QxlMoB7 0SC6SY8MQeGXC10Ndm12eDmPBrnfxZRFk4mF9+moyolUIsLSMkix+tm9rjv4JfSw08 ZY80IPlas/v9/5wQP6vinTkuIpFRdLn3UspWYkQrKjnL7QbR03P84uhGymrnSq9IsN MbX3RETOgsCPg== Date: Sun, 18 Sep 2022 12:25:25 +0300 From: Mike Rapoport To: shaoqin.huang@intel.com Cc: Karolina Drobnik , Rebecca Mckeever , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 1/3] memblock test: Add test to memblock_add() 129th region Message-ID: References: <20220913064138.407601-1-shaoqin.huang@intel.com> <20220913064138.407601-2-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220913064138.407601-2-shaoqin.huang@intel.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663493143; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pe7LVx7FiudPCczXPi0lhGEoHdCnBZjv7ZwyBbu4rN8=; b=G8JKjwhHItvAQ1/gj3iV0fALe+FHeQdGXPoUsEsk2Hk37V7x4WyETF25wiaHf792UUdrmc J1OYBrm+2HqESsAC9oC01G9Io+DneNuhcAQ/ecrZoKBdfkEhjNyQBbQ9l8o1vAnP2BDP2b PRZGxFAbXoXClyghc8dqZcB7pnAaq0w= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=izsiYwUC; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663493143; a=rsa-sha256; cv=none; b=pcEcT9nTM2zxdSGsFYpDrPHc9Wy7/AhjFEAKwLTcLjx6MMwpPYOgYRRjXMQsEiacRd1Mkd OMwBYJ70i6AFNj0g/PWqS0j/LjfWaQywGcBy5Ctt0erqjOxPTdvcDU4pC7/MswuetqCgen Cn7eenuFvJexva6hPpmO0tpxc2eed5Q= X-Rspamd-Queue-Id: CC7A24001B Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=izsiYwUC; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspam-User: X-Rspamd-Server: rspam01 X-Stat-Signature: pf88pokjoxwzjqkbw59p3j3ii43wyyc5 X-HE-Tag: 1663493142-749699 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: On Tue, Sep 13, 2022 at 02:41:30PM +0800, shaoqin.huang@intel.com wrote: > 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 | 96 ++++++++++++++++++++++++ > tools/testing/memblock/tests/common.c | 7 +- > tools/testing/memblock/tests/common.h | 3 + > 3 files changed, 104 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c > index a13a57ba0815..7120fd8e47b1 100644 > --- a/tools/testing/memblock/tests/basic_api.c > +++ b/tools/testing/memblock/tests/basic_api.c > @@ -423,6 +423,101 @@ 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 = MEM_SIZE, > + }; > + phys_addr_t new_memory_regions_size; > + phys_addr_t base, size, block_size; > + > + 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); Why don't you simply increase MEM_SIZE, to say 1M? This will make all the calculations here way simpler. > + > + /* > + * For the left memory, we split them into small block and add them into > + * memblock later. > + */ > + base += new_memory_regions_size; > + size = MEM_SIZE - new_memory_regions_size; > + block_size = size / (INIT_MEMBLOCK_REGIONS * 2); > + > + orig_region = memblock.memory.regions; > + > + for (i = 0; i < INIT_MEMBLOCK_REGIONS; i++) { > + /* > + * Add these small block to fulfill the memblock. We keep an > + * interval between the nearby memory to avoid being merged. > + */ > + memblock_add(base + block_size * (2 * i + 1), block_size); > + > + ASSERT_EQ(memblock.memory.cnt, i + 2); > + ASSERT_EQ(memblock.memory.total_size, new_memory_regions_size + > + (i + 1) * block_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 * block_size + > + new_memory_regions_size + > + 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(); > @@ -438,6 +533,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 eec6901081af..2de6a2b6efd2 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 ": " > > @@ -84,6 +82,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 78128e109a95..ba14dc989ae9 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 > > enum test_flags { > /* No special request. */ > @@ -104,6 +106,7 @@ void reset_memblock_attributes(void); > void setup_memblock(void); > 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); > -- > 2.34.1 > > -- Sincerely yours, Mike.