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 X-Spam-Level: X-Spam-Status: No, score=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3030C433ED for ; Tue, 18 May 2021 15:53:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 414036117A for ; Tue, 18 May 2021 15:53:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 414036117A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B66446B00DB; Tue, 18 May 2021 11:53:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B17196B00DC; Tue, 18 May 2021 11:53:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B79E8E002F; Tue, 18 May 2021 11:53:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id 6D0C16B00DB for ; Tue, 18 May 2021 11:53:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0080A841B for ; Tue, 18 May 2021 15:53:01 +0000 (UTC) X-FDA: 78154795404.16.9ED7E6A Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf19.hostedemail.com (Postfix) with ESMTP id EA47D90009EA for ; Tue, 18 May 2021 15:52:59 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7738F6113C; Tue, 18 May 2021 15:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621353180; bh=4kv5abT7oiIIz6ju/18dV+Xm4OFZ4dg7wtiIMxBVNrA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lHqvuXdCSTQAybR5GKviZoMp2zbr3jh0AzGIHTEo+mVmumadAVcTmX6KvLiEWKlvH VVMN6YXlKCtqxvOy5fl6pB178SSAowK9hxaATMdpefG+ogxpaEENuASLJnXgMtQbNv eFODP0LHIR+XGAH8tRO1J7Zx4GT1yT+FGVTLO3Lbqh1APd4npnopsZeVGMNJKeb0YA uL1oRiqkx7soA023g/pM0wqKG5/PKczPcS/QBt6Ahe7hs0gMUyAx+pnn1aMR5Yegfg 0KHGNYYZio0R6zOesUXiaZZazYtxiMwYpm5NcOr5b2Q5DjoH6YzFGgi1L+vWxDCLrz usic/dp1IaiJw== Date: Tue, 18 May 2021 18:52:49 +0300 From: Mike Rapoport To: Kefeng Wang Cc: linux-arm-kernel@lists.infradead.org, Andrew Morton , Mike Rapoport , Russell King , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/3] arm: extend pfn_valid to take into accound freed memory map alignment Message-ID: References: <20210518090613.21519-1-rppt@kernel.org> <20210518090613.21519-4-rppt@kernel.org> <2d34f990-c609-88aa-1dc0-f8e9e9623fc3@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2d34f990-c609-88aa-1dc0-f8e9e9623fc3@huawei.com> Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lHqvuXdC; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Stat-Signature: xw7nbjpuxw59z8ujaf4wi7xrxd7q7c8e X-Rspamd-Queue-Id: EA47D90009EA X-Rspamd-Server: rspam02 X-HE-Tag: 1621353179-824651 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, May 18, 2021 at 08:49:43PM +0800, Kefeng Wang wrote: > > > On 2021/5/18 17:06, Mike Rapoport wrote: > > From: Mike Rapoport > > > > When unused memory map is freed the preserved part of the memory map is > > extended to match pageblock boundaries because lots of core mm > > functionality relies on homogeneity of the memory map within pageblock > > boundaries. > > > > Since pfn_valid() is used to check whether there is a valid memory map > > entry for a PFN, make it return true also for PFNs that have memory map > > entries even if there is no actual memory populated there. > > > > Signed-off-by: Mike Rapoport > > --- > > arch/arm/mm/init.c | 15 ++++++++++++++- > > 1 file changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > > index 9d4744a632c6..bb678c0ba143 100644 > > --- a/arch/arm/mm/init.c > > +++ b/arch/arm/mm/init.c > > @@ -125,11 +125,24 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low, > > int pfn_valid(unsigned long pfn) > > { > > phys_addr_t addr = __pfn_to_phys(pfn); > > + unsigned long pageblock_size = PAGE_SIZE * pageblock_nr_pages; > > if (__phys_to_pfn(addr) != pfn) > > return 0; > > - return memblock_is_map_memory(addr); > > + if (memblock_is_map_memory(addr)) > > + return 1; > > + > > + /* > > + * If address less than pageblock_size bytes away from a present > > + * memory chunk there still will be a memory map entry for it > > + * because we round freed memory map to the pageblock boundaries > > + */ > > + if (memblock_is_map_memory(ALIGN(addr + 1, pageblock_size)) || > > + memblock_is_map_memory(ALIGN_DOWN(addr, pageblock_size))) > > + return 1; > > Hi Mike, with patch3, the system won't boot. Hmm, apparently I've miscalculated the ranges... Can you please check with the below patch on top of this series: diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index bb678c0ba143..2fafbbc8e73b 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -138,8 +138,9 @@ int pfn_valid(unsigned long pfn) * memory chunk there still will be a memory map entry for it * because we round freed memory map to the pageblock boundaries */ - if (memblock_is_map_memory(ALIGN(addr + 1, pageblock_size)) || - memblock_is_map_memory(ALIGN_DOWN(addr, pageblock_size))) + if (memblock_overlaps_region(&memblock.memory, + ALIGN_DOWN(addr, pageblock_size), + pageblock_size); return 1; return 0; -- Sincerely yours, Mike.