From patchwork Tue May 18 09:06:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12264247 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=-17.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,USER_AGENT_GIT autolearn=ham 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 EDEF0C433ED for ; Tue, 18 May 2021 09:08:24 +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 BB612610CC for ; Tue, 18 May 2021 09:08:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB612610CC 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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HT0woBlFjUGmVTSNuCDgEMx793NK1+NGm9WRQ+OttvY=; b=Bp/Kf34dmSe6WlQI4YnkGfAnA KWWVPEjObkILBXyEFxToN29hqqYlUvRPWJHqbOLcgGKfJo+B7wMAJESXba/y70FmBbqaUePJ+TuwO qcbMKdok5HNlo83bGy9Pxu9VlZT5xDZqlvslwTvz0tWCi2UZ73tQ84cg30Pjm6/KIt7XV26WKMewG k6V+VmdKgPlYuW/wRiOG3ppIG7pSB/mFR5Ibqrb3OHFf/nxHqUgiNtKxZDfYXdKQsH08k/8vZAP9Q j0JDlGN4Qv9H6T8a2LEKK8zO2953LP/leJ9QP2Y58dQNzhIFIJKnYq8rCvRne/7FPpZ0xowtVIyk6 /KWcn6XMA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1livgp-0002Vi-Mz; Tue, 18 May 2021 09:06:59 +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 1livgP-0002Py-2N for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:06:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=q9CJp87B8gPJYMJvikJXD3+SXfgg2u7NWvQoTze/cjM=; b=WkwhD+Kf+bfwT6F2ZYkM3BgV+4 tcScWg/IZ2/JcxzQZQ8NTfLzlNDyY5qWMKmKGjiq9IK4JLHBpDuKPpgrqTVOh5POwAFGjp4Vy3YC4 9JMJ1NQPCCbtpH6b4gsaPvdYrHoAp111pHqna49JsXKFkBb4i6BEH2yX1+rmrZlzJDx96LBsdAX2Y 5HlOYTht+X2/1hCqD1/tigvqHZPz7vsehgJx84NlX3JYzMNMQAlj35BNdB00havROxzVvu9pQWa6V TI0K8arQV0pipIzjqZABic8DeXNY8nxdvw4q/iz7yJyTwkkSQc0IgLboRxPCm8OegEVvAIpWVR1mN +7iyNz8A==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1livgM-00EUS0-8j for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:06:31 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5C13561209; Tue, 18 May 2021 09:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621328790; bh=9+8VlIrFfLEmzRoxqWF0ylaXDWsmZt0DQAU8LObraoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tum/Yu+aKBsznhRuVylQK1gPSXlk4/7f+dqaXzkFCAWeO/0tZdRrJZtzGTM6D28JO kNXoQsHu8pYcBj4X1N6ufEmYx14mMILc9d/2tIvJVWRyafGupktUOVExadKNVYaMGZ llENDa6we67Ooe34Xi2kSQ/P6XCtnqQ5WnnqX9SoyRCkHAwcWOxOdhZTeF86UzVNxL 04embraLt7uvp7lZ/rLgrZ6w2rjJAcQRUn/cTkCXggepKY2CGsNGa+ScXwBTxXyKTs SBvoaM2ND8iIQF2D7E+02+2ciTrM3HEhoMf5yOI0k+bMMe8zfn6o1H8bWgy6toeWHM gbkuHTV/w6DmA== From: Mike Rapoport To: linux-arm-kernel@lists.infradead.org Cc: Andrew Morton , Kefeng Wang , Mike Rapoport , Mike Rapoport , Russell King , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/3] arm: extend pfn_valid to take into accound freed memory map alignment Date: Tue, 18 May 2021 12:06:13 +0300 Message-Id: <20210518090613.21519-4-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210518090613.21519-1-rppt@kernel.org> References: <20210518090613.21519-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_020630_344129_4E035E9D X-CRM114-Status: GOOD ( 15.38 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Tested-by: Kefeng Wang --- 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; + + return 0; } EXPORT_SYMBOL(pfn_valid); #endif