Commit 4eb0716e authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Linus Torvalds
Browse files

hugetlb: allow to free gigantic pages regardless of the configuration 

On systems without CONTIG_ALLOC activated but that support gigantic pages,
boottime reserved gigantic pages can not be freed at all.  This patch
simply enables the possibility to hand back those pages to memory
allocator.

Link: http://lkml.kernel.org/r/20190327063626.18421-5-alex@ghiti.fr


Signed-off-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Acked-by: David S. Miller <davem@davemloft.net> [sparc]
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Andy Lutomirsky <luto@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8df995f6

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ config ARM64 
	select ARCH_HAS_FAST_MULTIPLIER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_KEEPINITRD

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

arch/arm64/include/asm/hugetlb.h

+0 −4
Original line number Diff line number Diff line
@@ -70,8 +70,4 @@ extern void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, 


#include <asm-generic/hugetlb.h>



#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE

static inline bool gigantic_page_supported(void) { return true; }

#endif



#endif /* __ASM_HUGETLB_H */

arch/powerpc/include/asm/book3s/64/hugetlb.h

+2 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static inline int hstate_get_psize(struct hstate *hstate) 
	}

}



#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE

static inline bool gigantic_page_supported(void)

#define __HAVE_ARCH_GIGANTIC_PAGE_RUNTIME_SUPPORTED

static inline bool gigantic_page_runtime_supported(void)

{

	/*

	 * We used gigantic page reservation with hypervisor assist in some case.
@@ -49,7 +49,6 @@ static inline bool gigantic_page_supported(void) 


	return true;

}

#endif



/* hugepd entry valid bit */

#define HUGEPD_VAL_BITS		(0x8000000000000000UL)

arch/powerpc/platforms/Kconfig.cputype

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK 
config PPC_RADIX_MMU

	bool "Radix MMU Support"

	depends on PPC_BOOK3S_64 && HUGETLB_PAGE

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select ARCH_HAS_GIGANTIC_PAGE

	select PPC_HAVE_KUEP

	select PPC_HAVE_KUAP

	default y

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config S390 
	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SET_MEMORY

CRA Git | Maintained and supported by SUSTech CRA and CCSE