From patchwork Thu Apr 22 07:50:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 12217871 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 24BEBC433B4 for ; Thu, 22 Apr 2021 07:52:06 +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 8107861445 for ; Thu, 22 Apr 2021 07:52:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8107861445 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=biBifHJu++uU/rroEhCng2fbgkrY1w/aJP2nUotRZxQ=; b=i1IPi8cL7eT2Qpgvmu1qb2ADKU npGWBgbv8yg21Cu+fdGZiekVwXKmybbm9HRfRyjlx/BHNdUKElDiA74dR35Isuabw4GU0OnSb5Qkx zYVkkI37r0Xov9P4y6P10ngNBk8wRi3C3E1M5EnH7Uuiw9qJxwEwCja+r+meTEpXPwIx22W21b9Eb 0wzmUo+JKX96/6ygh/0762eaW/pf2gDiB+B94EhOxJEITPKuHj+HosfNzY6poPCHRnHLrGbvhJFgS kTsZQUJTbU/lHIrC5lcflumy12xgO9phGXclX0BFcKL81ttG5+oWQ3tEuQDSuarvbFdV9usGNnvki bKQkVdWg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZU61-00GB1I-Nv; Thu, 22 Apr 2021 07:49:57 +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 1lZU5u-00GB0W-Jd for linux-arm-kernel@desiato.infradead.org; Thu, 22 Apr 2021 07:49:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=PgJNW7MhzskDb/MHE7Zq1/hWzDVA5SWPnllqVPOrhbc=; b=W0GpDXwnWeF/6rh9p8YXeeVg/a QW4EjpsBz9LJUrUiaLDu+KEjLzCnB9kqRza7hDM2LZ0+08cBYHElqiDB/BTyL3LMgdwcd+nksGBUg qVe1sG6rMN1Vccc+xIHk/rcp1+fG//sZ4Y4oNHarYI2GAvDA8jYMdzjzrAgXCWfvOSxC4GanR4VTq 9runWqdLDyyr7XZmE3hgZUgh5iCAO5XPREYYpy5nCalGLiC91N6fFbtkFE3KManvr9jnB+i9c1rd9 OGOlvU7o5fDQPM1siiq5dO8YUvuzttD06zNog8G9xBi4Bct0nSLTawjTEdih3OhBrGXg9y0kfkDa4 pglMoYBQ==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZU5r-00DT5M-3N for linux-arm-kernel@lists.infradead.org; Thu, 22 Apr 2021 07:49:49 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CEBD611D4; Thu, 22 Apr 2021 00:49:43 -0700 (PDT) Received: from p8cg001049571a15.arm.com (unknown [10.163.75.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B3CB03F774; Thu, 22 Apr 2021 00:49:40 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org Cc: david@redhat.com, rppt@kernel.org, akpm@linux-foundation.org, Anshuman Khandual , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC V2] mm: Enable generic pfn_valid() to handle early sections with memmap holes Date: Thu, 22 Apr 2021 13:20:23 +0530 Message-Id: <1619077823-3819-1-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20210422061902.21614-1-rppt@kernel.org> References: <20210422061902.21614-1-rppt@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_004947_243148_E9060DE0 X-CRM114-Status: GOOD ( 27.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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Platforms like arm and arm64 have redefined pfn_valid() because their early memory sections might have contained memmap holes after freeing parts of it during boot, which should be skipped while validating a pfn for struct page backing. This scenario on certain platforms where memmap is not continuous, could be captured with a new option CONFIG_HAVE_EARLY_SECTION_MEMMAP_HOLES. Then the generic pfn_valid() can be improved to accommodate such platforms. This reduces overall code footprint and also improves maintainability. free_unused_memmap() and pfn_to_online_page() have been updated to include such cases. This also exports memblock_is_memory() for all drivers that use pfn_valid() but lack required visibility. After the new config is in place, drop CONFIG_HAVE_ARCH_PFN_VALID from arm64 platforms. Cc: Catalin Marinas Cc: Will Deacon Cc: Andrew Morton Cc: Mike Rapoport Cc: David Hildenbrand Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Suggested-by: David Hildenbrand Signed-off-by: Anshuman Khandual Signed-off-by: Anshuman Khandual Acked-by: Mike Rapoport Acked-by: David Hildenbrand --- This patch applies on the latest mainline kernel after Mike's series regarding arm64 based pfn_valid(). https://lore.kernel.org/linux-mm/20210422061902.21614-1-rppt@kernel.org/T/#t Changes in RFC V2: - Dropped support for arm (32 bit) - Replaced memblock_is_map_memory() check with memblock_is_memory() - MEMBLOCK_NOMAP memory are no longer skipped for pfn_valid() - Updated pfn_to_online_page() per David - Updated free_unused_memmap() to preserve existing semantics per Mike - Exported memblock_is_memory() instead of memblock_is_map_memory() Changes in RFC V1: - https://patchwork.kernel.org/project/linux-mm/patch/1615174073-10520-1-git-send-email-anshuman.khandual@arm.com/ arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/page.h | 1 - arch/arm64/mm/init.c | 41 ----------------------------------- include/linux/mmzone.h | 18 ++++++++++++++- mm/Kconfig | 9 ++++++++ mm/memblock.c | 8 +++++-- mm/memory_hotplug.c | 5 +++++ 7 files changed, 38 insertions(+), 46 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b4a9b493ce72..4cdc3570ffa9 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -144,7 +144,6 @@ config ARM64 select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT - select HAVE_ARCH_PFN_VALID select HAVE_ARCH_PREL32_RELOCATIONS select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_STACKLEAK @@ -167,6 +166,7 @@ config ARM64 if $(cc-option,-fpatchable-function-entry=2) select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \ if DYNAMIC_FTRACE_WITH_REGS + select HAVE_EARLY_SECTION_MEMMAP_HOLES select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_FAST_GUP select HAVE_FTRACE_MCOUNT_RECORD diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h index 75ddfe671393..fcbef3eec4b2 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -37,7 +37,6 @@ void copy_highpage(struct page *to, struct page *from); typedef struct page *pgtable_t; -int pfn_valid(unsigned long pfn); int pfn_is_map_memory(unsigned long pfn); #include diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f431b38d0837..5731a11550d8 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -217,47 +217,6 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) free_area_init(max_zone_pfns); } -int pfn_valid(unsigned long pfn) -{ - phys_addr_t addr = PFN_PHYS(pfn); - - /* - * Ensure the upper PAGE_SHIFT bits are clear in the - * pfn. Else it might lead to false positives when - * some of the upper bits are set, but the lower bits - * match a valid pfn. - */ - if (PHYS_PFN(addr) != pfn) - return 0; - -#ifdef CONFIG_SPARSEMEM -{ - struct mem_section *ms; - - if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) - return 0; - - ms = __pfn_to_section(pfn); - if (!valid_section(ms)) - return 0; - - /* - * ZONE_DEVICE memory does not have the memblock entries. - * memblock_is_memory() check for ZONE_DEVICE based - * addresses will always fail. Even the normal hotplugged - * memory will never have MEMBLOCK_NOMAP flag set in their - * memblock entries. Skip memblock search for all non early - * memory sections covering all of hotplug memory including - * both normal and ZONE_DEVICE based. - */ - if (!early_section(ms)) - return pfn_section_valid(ms, pfn); -} -#endif - return memblock_is_memory(addr); -} -EXPORT_SYMBOL(pfn_valid); - int pfn_is_map_memory(unsigned long pfn) { phys_addr_t addr = PFN_PHYS(pfn); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 961f0eeefb62..18bf71665211 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1421,10 +1421,22 @@ static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn) * * Return: 1 for PFNs that have memory map entries and 0 otherwise */ +bool memblock_is_memory(phys_addr_t addr); + static inline int pfn_valid(unsigned long pfn) { + phys_addr_t addr = PFN_PHYS(pfn); struct mem_section *ms; + /* + * Ensure the upper PAGE_SHIFT bits are clear in the + * pfn. Else it might lead to false positives when + * some of the upper bits are set, but the lower bits + * match a valid pfn. + */ + if (PHYS_PFN(addr) != pfn) + return 0; + if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) return 0; ms = __nr_to_section(pfn_to_section_nr(pfn)); @@ -1434,7 +1446,11 @@ static inline int pfn_valid(unsigned long pfn) * Traditionally early sections always returned pfn_valid() for * the entire section-sized span. */ - return early_section(ms) || pfn_section_valid(ms, pfn); + if (early_section(ms)) + return IS_ENABLED(CONFIG_HAVE_EARLY_SECTION_MEMMAP_HOLES) ? + memblock_is_memory(pfn << PAGE_SHIFT) : 1; + + return pfn_section_valid(ms, pfn); } #endif diff --git a/mm/Kconfig b/mm/Kconfig index 24c045b24b95..db7128111874 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -135,6 +135,15 @@ config HAVE_FAST_GUP config ARCH_KEEP_MEMBLOCK bool +config HAVE_EARLY_SECTION_MEMMAP_HOLES + depends on ARCH_KEEP_MEMBLOCK && SPARSEMEM_VMEMMAP + def_bool n + help + Early sections on certain platforms might have some memory ranges that + are not backed with struct page mappings. When subscribed, this option + enables special handling for those memory ranges in certain situations + such as pfn_valid(). + # Keep arch NUMA mapping infrastructure post-init. config NUMA_KEEP_MEMINFO bool diff --git a/mm/memblock.c b/mm/memblock.c index 3abf2c3fea7f..93f8a9c8428d 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1740,6 +1740,7 @@ bool __init_memblock memblock_is_memory(phys_addr_t addr) { return memblock_search(&memblock.memory, addr) != -1; } +EXPORT_SYMBOL(memblock_is_memory); bool __init_memblock memblock_is_map_memory(phys_addr_t addr) { @@ -1931,8 +1932,11 @@ static void __init free_unused_memmap(void) unsigned long start, end, prev_end = 0; int i; - if (!IS_ENABLED(CONFIG_HAVE_ARCH_PFN_VALID) || - IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) + if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) + return; + + if (!IS_ENABLED(CONFIG_HAVE_EARLY_SECTION_MEMMAP_HOLES) && + !IS_ENABLED(CONFIG_HAVE_ARCH_PFN_VALID)) return; /* diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0cdbbfbc5757..8c78b6a3d888 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -309,6 +309,11 @@ struct page *pfn_to_online_page(unsigned long pfn) * Save some code text when online_section() + * pfn_section_valid() are sufficient. */ + if (IS_ENABLED(CONFIG_HAVE_EARLY_SECTION_MEMMAP_HOLES)) { + if (early_section(ms) && !memblock_is_memory(PFN_PHYS(pfn))) + return NULL; + } + if (IS_ENABLED(CONFIG_HAVE_ARCH_PFN_VALID) && !pfn_valid(pfn)) return NULL;