Skip to content

Commit 4cd7ba1

Browse files
Ram Tummalaakpm00
Ram Tummala
authored andcommitted
mm: fix old/young bit handling in the faulting path
Commit 3bd786f ("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 which caused the PTE for the faulting address to be marked as old instead of young. 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 check will incorrectly mark the PTE old rather than young. On some architectures this will cause a double fault to mark it young when the access is retried. 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 will then be correctly marked young in handle_pte_fault() itself. Due to this bug, performance degradation in the fault handling path will be observed due to unnecessary double faulting. Link: https://lkml.kernel.org/r/[email protected] Fixes: 3bd786f ("mm: convert do_set_pte() to set_pte_range()") Signed-off-by: Ram Tummala <[email protected]> Reviewed-by: Yin Fengwei <[email protected]> Cc: Alistair Popple <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Yin Fengwei <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 34e526f commit 4cd7ba1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/memory.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4780,7 +4780,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio,
47804780
{
47814781
struct vm_area_struct *vma = vmf->vma;
47824782
bool write = vmf->flags & FAULT_FLAG_WRITE;
4783-
bool prefault = in_range(vmf->address, addr, nr * PAGE_SIZE);
4783+
bool prefault = !in_range(vmf->address, addr, nr * PAGE_SIZE);
47844784
pte_t entry;
47854785

47864786
flush_icache_pages(vma, page, nr);

0 commit comments

Comments
 (0)