Commit 16c9afc7 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

arm64/mm: drop HAVE_ARCH_PFN_VALID 

CONFIG_SPARSEMEM_VMEMMAP is now the only available memory model on arm64
platforms and free_unused_memmap() would just return without creating any
holes in the memmap mapping.  There is no need for any special handling in
pfn_valid() and HAVE_ARCH_PFN_VALID can just be dropped.  This also moves
the pfn upper bits sanity check into generic pfn_valid().

Link: https://lkml.kernel.org/r/1621947349-25421-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Mike Rapoport <rppt@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a7d9f306

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,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_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP_FILTER

arch/arm64/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -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 <asm/memory.h>

arch/arm64/mm/init.c

+0 −37
Original line number Diff line number Diff line
@@ -219,43 +219,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);

	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 = __pfn_to_section(pfn);

	if (!valid_section(ms))

		return 0;



	/*

	 * ZONE_DEVICE memory does not have the memblock entries.

	 * memblock_is_map_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);



	return memblock_is_memory(addr);

}

EXPORT_SYMBOL(pfn_valid);



int pfn_is_map_memory(unsigned long pfn)

{

	phys_addr_t addr = PFN_PHYS(pfn);

include/linux/mmzone.h

+9 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,15 @@ static inline int pfn_valid(unsigned long 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(PFN_PHYS(pfn)) != pfn)

		return 0;



	if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)

		return 0;

	ms = __nr_to_section(pfn_to_section_nr(pfn));