From: Greg Kroah-Hartman Date: Wed, 21 Mar 2018 13:15:42 +0000 (+0100) Subject: drop queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page... X-Git-Tag: v4.9.89~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f64680e168d327399c17d1853469117fec5a3fcd;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch --- diff --git a/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch b/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch deleted file mode 100644 index 1e1467408d7..00000000000 --- a/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch +++ /dev/null @@ -1,64 +0,0 @@ -From foo@baz Mon Mar 19 09:58:12 CET 2018 -From: "Aneesh Kumar K.V" -Date: Tue, 21 Mar 2017 22:59:56 +0530 -Subject: powerpc/mm/hugetlb: Filter out hugepage size not supported by page table layout - -From: "Aneesh Kumar K.V" - - -[ Upstream commit a525108cf1cc14651602d678da38fa627a76a724 ] - -Without this if firmware reports 1MB page size support we will crash -trying to use 1MB as hugetlb page size. - -echo 300 > /sys/kernel/mm/hugepages/hugepages-1024kB/nr_hugepages - -kernel BUG at ./arch/powerpc/include/asm/hugetlb.h:19! -..... -.... -[c0000000e2c27b30] c00000000029dae8 .hugetlb_fault+0x638/0xda0 -[c0000000e2c27c30] c00000000026fb64 .handle_mm_fault+0x844/0x1d70 -[c0000000e2c27d70] c00000000004805c .do_page_fault+0x3dc/0x7c0 -[c0000000e2c27e30] c00000000000ac98 handle_page_fault+0x10/0x30 - -With fix, we don't enable 1MB as hugepage size. - -bash-4.2# cd /sys/kernel/mm/hugepages/ -bash-4.2# ls -hugepages-16384kB hugepages-16777216kB - -Signed-off-by: Aneesh Kumar K.V -Signed-off-by: Michael Ellerman -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/mm/hugetlbpage.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - ---- a/arch/powerpc/mm/hugetlbpage.c -+++ b/arch/powerpc/mm/hugetlbpage.c -@@ -828,6 +828,24 @@ static int __init add_huge_page_size(uns - if ((mmu_psize = shift_to_mmu_psize(shift)) < 0) - return -EINVAL; - -+#ifdef CONFIG_PPC_BOOK3S_64 -+ /* -+ * We need to make sure that for different page sizes reported by -+ * firmware we only add hugetlb support for page sizes that can be -+ * supported by linux page table layout. -+ * For now we have -+ * Radix: 2M -+ * Hash: 16M and 16G -+ */ -+ if (radix_enabled()) { -+ if (mmu_psize != MMU_PAGE_2M) -+ return -EINVAL; -+ } else { -+ if (mmu_psize != MMU_PAGE_16M && mmu_psize != MMU_PAGE_16G) -+ return -EINVAL; -+ } -+#endif -+ - BUG_ON(mmu_psize_defs[mmu_psize].shift != shift); - - /* Return if huge page size has already been setup */ diff --git a/queue-4.4/series b/queue-4.4/series index 4eeb56cc157..35a73318747 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -36,7 +36,6 @@ mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch blk-throttle-make-sure-expire-time-isn-t-too-big.patch f2fs-relax-node-version-check-for-victim-data-in-gc.patch bonding-refine-bond_fold_stats-wrap-detection.patch -powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch braille-console-fix-value-returned-by-_braille_console_setup.patch drm-vmwgfx-fixes-to-vmwgfx_fb.patch vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch