Unverified Commit 835e5ac3 authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Fix huge_ptep_set_wrprotect when PTE is a NAPOT 



We need to avoid inconsistencies across the PTEs that form a NAPOT
region, so when we write protect such a region, we should clear and flush
all the PTEs to make sure that any of those PTEs is not cached which would
result in such inconsistencies (arm64 does the same).

Fixes: 82a1a1f3 ("riscv: mm: support Svnapot in hugetlb page")
Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20230428120120.21620-1-alexghiti@rivosinc.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9a7e8ec0

arch/riscv/mm/hugetlbpage.c

+5 −1
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, 
{

	pte_t pte = ptep_get(ptep);

	unsigned long order;

	pte_t orig_pte;

	int i, pte_num;



	if (!pte_napot(pte)) {
@@ -228,9 +229,12 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, 
	order = napot_cont_order(pte);

	pte_num = napot_pte_num(order);

	ptep = huge_pte_offset(mm, addr, napot_cont_size(order));

	orig_pte = get_clear_contig_flush(mm, addr, ptep, pte_num);



	orig_pte = pte_wrprotect(orig_pte);



	for (i = 0; i < pte_num; i++, addr += PAGE_SIZE, ptep++)

		ptep_set_wrprotect(mm, addr, ptep);

		set_pte_at(mm, addr, ptep, orig_pte);

}



pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,