powerpc/hugetlb/cma: Allocate gigantic hugetlb pages using CMA
Subsystems (2)
PATCH 1/2 powerpc/hugetlb/cma: Allocate gigantic hugetlb pages using CMA
commit: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma") added support for allocating gigantic hugepages using CMA. This patch enables the same for powerpc
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/include/asm/hugetlb.h | 7 +++++++ arch/powerpc/kernel/setup-common.c | 3 +++ arch/powerpc/mm/hugetlbpage.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+)
arch/powerpc/include/asm/hugetlb.h +7 -0
@@ -57,6 +57,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte, int dirty); +void gigantic_hugetlb_cma_reserve (void )__init ;#include <asm-generic/hugetlb.h> #else /* ! CONFIG_HUGETLB_PAGE */
@@ -71,6 +72,12 @@ static inline pte_t *hugepte_offset(hugepd_t hpd, unsigned long addr, {return NULL ; } + + +static inline void __init gigantic_hugetlb_cma_reserve (void ) +{ +} +#endif /* CONFIG_HUGETLB_PAGE */ #endif /* _ASM_POWERPC_HUGETLB_H */
arch/powerpc/kernel/setup-common.c +3 -0
@@ -928,6 +928,9 @@ void __init setup_arch(char **cmdline_p)/* Reserve large chunks of memory for use by CMA for KVM. */ kvm_cma_reserve (); +/* Reserve large chunks of memory for us by CMA for hugetlb */ +gigantic_hugetlb_cma_reserve (); +klp_init_thread_info (&init_task); init_mm.start_code = (unsigned long )_stext;
arch/powerpc/mm/hugetlbpage.c +18 -0
@@ -684,3 +684,21 @@ void flush_dcache_icache_hugepage(struct page *page) } } } + +void __init gigantic_hugetlb_cma_reserve (void ) +{ +unsigned long order =0 ; + +if (radix_enabled ()) + order =PUD_SHIFT -PAGE_SHIFT ; +else if (!firmware_has_feature (FW_FEATURE_LPAR ) && mmu_psize_defs[MMU_PAGE_16G ].shift) +/* +* For pseries we do use ibm,expected#pages for reserving 16G pages. +*/ + order =mmu_psize_to_shift (MMU_PAGE_16G ) -PAGE_SHIFT ; + +if (order) { +VM_WARN_ON (order <MAX_ORDER ); +hugetlb_cma_reserve (order); + } +}
Signature · 1 line
2.26.2
PATCH 2/2 powerpc/kvm/cma: Improve kernel log during boot
Current kernel gives:
[ 0.000000] cma: Reserved 26224 MiB at 0x0000007959000000 [ 0.000000] hugetlb_cma: reserve 65536 MiB, up to 16384 MiB per node [ 0.000000] cma: Reserved 16384 MiB at 0x0000001800000000
With the fix
[ 0.000000] kvm_cma_reserve: reserving 26214 MiB for global area [ 0.000000] cma: Reserved 26224 MiB at 0x0000007959000000 [ 0.000000] hugetlb_cma: reserve 65536 MiB, up to 16384 MiB per node [ 0.000000] cma: Reserved 16384 MiB at 0x0000001800000000
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv_builtin.c +1 -1
@@ -113,7 +113,7 @@ void __init kvm_cma_reserve(void) selected_size = (selected_size * kvm_cma_resv_ratio /100 ) <<PAGE_SHIFT ;if (selected_size) { -pr_debug ("%s: reserving %ld MiB for global area\n" , __func__, +pr_info ("%s: reserving %ld MiB for global area\n" , __func__, (unsigned long )selected_size /SZ_1M ); align_size =HPT_ALIGN_PAGES <<PAGE_SHIFT ; cma_declare_contiguous(0, selected_size, 0, align_size,
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 3 lines · Aneesh Kumar K.V
commit:
cf11e85fc08c("mm: hugetlb: optionally allocate gigantic hugepages using cma") added support for allocating gigantic hugepages using CMA. This patch enables the same for powerpc
Applied to powerpc/next.
[1/2] powerpc/hugetlb/cma: Allocate gigantic hugetlb pages using CMA
https://git.kernel.org/powerpc/c/ef26b76d1af61b90eb0dd3da58ad4f97d8e028f8 [2/2] powerpc/kvm/cma: Improve kernel log during boot https://git.kernel.org/powerpc/c/a5a8b258da7861009240b57687dfef47af91b406
cheers