Revert "Revert "arm64: hugetlb: partial revert of 66b3923a1a0f"" (6ae979ab) · Commits · 戴 / test

The use of the contiguous bit by our hugetlb implementation violates the break-before-make requirements of the architecture and can lead to silent data corruption or TLB conflict aborts. Once again, disable these hugetlb sizes whilst it gets worked out. This reverts commit . Conflicts: arch/arm64/mm/hugetlbpage.c Signed-off-by:

Will Deacon <will.deacon@arm.com>

arch/arm64/mm/hugetlbpage.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -294,10 +294,6 @@ static __init int setup_hugepagesz(char *opt)
		hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);
		} else if (ps == PUD_SIZE) {
		hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);
		} else if (ps == (PAGE_SIZE * CONT_PTES)) {
		hugetlb_add_hstate(CONT_PTE_SHIFT);
		} else if (ps == (PMD_SIZE * CONT_PMDS)) {
		hugetlb_add_hstate((PMD_SHIFT + CONT_PMD_SHIFT) - PAGE_SHIFT);
		} else {
		hugetlb_bad_size();
		pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10);
		@@ -306,13 +302,3 @@ static __init int setup_hugepagesz(char *opt)
		return 1;
		}
		__setup("hugepagesz=", setup_hugepagesz);

		#ifdef CONFIG_ARM64_64K_PAGES
		static __init int add_default_hugepagesz(void)
		{
		if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL)
		hugetlb_add_hstate(CONT_PTE_SHIFT);
		return 0;
		}
		arch_initcall(add_default_hugepagesz);
		#endif

Admin message