mm: Fix PTE_AF handling in fault path on architectures with HW AF support
Subsystems (3)
PATCH 1/1 mm: Fix PTE_AF handling in fault path on architectures with HW AF support
Commit 3bd786f76de2 ("mm: convert do_set_pte() to set_pte_range()") replaced do_set_pte() with set_pte_range() and that introduced a regression in the following faulting path of non-anonymous vmas on CPUs with HW AF support.
handle_pte_fault()
do_pte_missing()
do_fault()
do_read_fault() || do_cow_fault() || do_shared_fault()
finish_fault()
set_pte_range()The polarity of prefault calculation is incorrect. This leads to prefault being incorrectly set for the faulting address. The following if check will incorrectly clear the PTE_AF bit instead of setting it and the access will fault again on the same address due to the missing PTE_AF bit.
if (prefault && arch_wants_old_prefaulted_pte())
entry = pte_mkold(entry);On a subsequent fault on the same address, the faulting path will see a non NULL vmf->pte and instead of reaching the do_pte_missing() path, PTE_AF will be correctly set in handle_pte_fault() itself.
Due to this bug, performance degradation in the fault handling path will be observed due to unnecessary double faulting.
--- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memory.c +1 -1
@@ -4781,7 +4781,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, {struct vm_area_struct *vma = vmf->vma;bool write = vmf->flags &FAULT_FLAG_WRITE ; -bool prefault =in_range (vmf->address, addr, nr *PAGE_SIZE ); +bool prefault = !in_range (vmf->address, addr, nr *PAGE_SIZE );pte_t entry;flush_icache_pages (vma, page, nr);
Signature · 1 line
2.34.1
Quoted 3 lines · Ram Tummala
Commit
3bd786f76de2("mm: convertdo_set_pte()toset_pte_range()") replaceddo_set_pte()withset_pte_range()and that introduced a regression in the following faulting path of non-anonymous vmas on CPUs with HW AF
At no point in this do you say what "AF" stands for.
Quoted 6 lines · Matthew Wilcox
Quoted 3 lines · Ram Tummala
Commit
3bd786f76de2("mm: convertdo_set_pte()toset_pte_range()") replaceddo_set_pte()withset_pte_range()and that introduced a regression in the following faulting path of non-anonymous vmas on CPUs with HW AFAt no point in this do you say what "AF" stands for.
It stands for "Access Flag", but that is specific to ARM64. As the fix is in generic architecture independent code it would be better to use that terminology (ie. old/young).
Quoted 7 lines · Ram Tummala
The polarity of prefault calculation is incorrect. This leads to prefault being incorrectly set for the faulting address. The following if check will incorrectly clear the
PTE_AFbit instead of setting it and the access will fault again on the same address due to the missingPTE_AFbit.if (prefault && arch_wants_old_prefaulted_pte()) entry = pte_mkold(entry);
I have same confusion as Matthew about the PTE_AF.
But I think this is a good catch as old code is like:
bool prefault = vmf->address != addr;
Sorry for the issue by me. And
Regards
Yin, Fengwei
Quoted 24 lines · Ram Tummala
Commit
3bd786f76de2("mm: convertdo_set_pte()toset_pte_range()") replaceddo_set_pte()withset_pte_range()and that introduced a regression in the following faulting path of non-anonymous vmas on CPUs with HW AF support.
handle_pte_fault()
do_pte_missing()do_fault() do_read_fault() || do_cow_fault() || do_shared_fault() finish_fault() set_pte_range()The polarity of prefault calculation is incorrect. This leads to prefault being incorrectly set for the faulting address. The following if check will incorrectly clear the
PTE_AFbit instead of setting it and the access will fault again on the same address due to the missingPTE_AFbit.if (prefault && arch_wants_old_prefaulted_pte()) entry = pte_mkold(entry);On a subsequent fault on the same address, the faulting path will see a non NULL
vmf->pteand instead of reaching thedo_pte_missing()path,PTE_AFwill be correctly set inhandle_pte_fault()itself.
Quoted 7 lines
Due to this bug, performance degradation in the fault handling path will be observed due to unnecessary double faulting.
Fixes 3bd786f76de2 ("mm: convert do_set_pte() to set_pte_range()")Signed-off-by Ram Tummala <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb