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=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 A580BC433ED for ; Tue, 18 May 2021 15:54:53 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3132E6113C for ; Tue, 18 May 2021 15:54:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3132E6113C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VYMuTaLsgdRjhrWdcqI9+JcLIar1gIzQxUN/VCBj71A=; b=jZO9lkyc9oPNQZ8jYWnQdE73g Wu8/cxUfSytmgFvMGBz83arYR9KHaIBossV/nhwGED9jj4205x6itYn0OWzwR+w0yph29TibF2vkS ExFTPg3t6UVCB4i0tG/G+zL56i+UQgddF3/S2hXLcWvmxuxWFFoicX5sK+tntrsSBcOFVUtYXY0fm KO+NRw9xaAVWwCQrFkcxtba8qOEMScXqKQJrlyaV8A1dc3UjL3csUmWi05ym/qIPIAZp0w2HTFjtE Avj3zFAVbuwy1cfBgBFXbexQ091sAQ7AO8o3bVPNWKnXiPQlpXmsl5v+cJx1AWaPIeMKHQeHLijd5 KhCyFgSXQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lj21v-001Ecy-Ov; Tue, 18 May 2021 15:53:11 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lj21o-001Ebc-Lm for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 15:53:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=MK4f8bRbm8rdB4QZcCScbYMY+KbrDlh37Fo3yhZL8XQ=; b=lLfSMEDdhHY+/K8jarM4utl5mT MVAGl8wM2MaomIxZAIhMwvhHV9fUk/rmmLBDLkEAlhUxGGygz5KRLZEBwjGJXVPDt4iQnzBejTho9 Lyj8LKeSDP/xjmOgq71draS2chL41/eTCikO3ncfCQr6SASmItHyQG5A0PRV38DKbpo/oau2Wvphi 55cKIrwiqvgIcU/qDxCJrRw1cmi5gIUTL7u1ie6dslRZRuOglUxLDOVsYQLV+47ftumeR3gayV6j5 lMF6yjPda234YxihPEFBvzr/z0SLs8jrAdyiXSig95cx013MvruB0JhsoZe17LUQr7sSdBrRk0yJp +g4FlV/g==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lj21m-00EmLq-1x for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 15:53:03 +0000 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-Disposition: inline In-Reply-To: <2d34f990-c609-88aa-1dc0-f8e9e9623fc3@huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_085302_157564_068C083C X-CRM114-Status: GOOD ( 25.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel