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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CB73C38A2D for ; Mon, 24 Oct 2022 19:25:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232280AbiJXTZJ (ORCPT ); Mon, 24 Oct 2022 15:25:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232229AbiJXTXE (ORCPT ); Mon, 24 Oct 2022 15:23:04 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E51CA486A for ; Mon, 24 Oct 2022 10:57:39 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 30811CE186D for ; Mon, 24 Oct 2022 15:36:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5E4BC433D7; Mon, 24 Oct 2022 15:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666625786; bh=El8e7d2mtZWlvBNo1yCMDZvQ6c5tz1jbnni0IGkge3c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vFSAqYcE6dggjBEEZGUnVQ2er+BndKy0z8VlK+BvWAGv90qUVx/uk4O9wp8x7DYV2 8vpNperRpu+kk1WDBjcaVnccil4eM73nau6YsvQwYl9YZ/MXskCuuqIzTcKcambjPm ce1+Uz/v16AbL15E9QjC0g1e9/GlIW9LQLhZIjAQCwTvyxvDuj8pLDjAPneBFTJcYQ EXOeBXDWdiMJb66IjuXNe0/sMqaDnwx8aFB+5tUmkcSyb9FWi7oWwNMCYlJ/VkpPIL /NSRNZf3w1zg/VwR+zDI0YaoevpS8ghGJv1GUeXtDvg53WxsHi3qwFy2kRxcYL+8LA dOTnpIbu1Lp1A== Date: Mon, 24 Oct 2022 18:36:13 +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 v4 2/3] memblock test: Add test to memblock_reserve() 129th region Message-ID: References: <20221011062128.49359-1-shaoqin.huang@intel.com> <20221011062128.49359-3-shaoqin.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221011062128.49359-3-shaoqin.huang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 11, 2022 at 02:21:21PM +0800, shaoqin.huang@intel.com wrote: > 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; Should be INIT_MEMBLOCK_RESERVED_REGIONS. I can fix this myself while applying. > + > + 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(); > > -- > 2.34.1 > -- Sincerely yours, Mike.