mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
FROMLIST: mm: enable speculative fault handling in do_numa_page()
Change handle_pte_fault() to allow speculative fault execution to proceed through do_numa_page(). do_swap_page() does not implement speculative execution yet, so it needs to abort with VM_FAULT_RETRY in that case. Signed-off-by: Michel Lespinasse <michel@lespinasse.org> Link: https://lore.kernel.org/all/20220128131006.67712-22-michel@lespinasse.org/ Bug: 161210518 Signed-off-by: Suren Baghdasaryan <surenb@google.com> Change-Id: I0390331facc9ecd37534012abdd9f255ab5bbb12
This commit is contained in:
committed by
Todd Kjos
parent
fedc4d513e
commit
009020e3d1
15
mm/memory.c
15
mm/memory.c
@@ -3578,6 +3578,11 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
|
||||
vm_fault_t ret = 0;
|
||||
void *shadow = NULL;
|
||||
|
||||
if (vmf->flags & FAULT_FLAG_SPECULATIVE) {
|
||||
pte_unmap(vmf->pte);
|
||||
return VM_FAULT_RETRY;
|
||||
}
|
||||
|
||||
if (!pte_unmap_same(vma->vm_mm, vmf->pmd, vmf->pte, vmf->orig_pte))
|
||||
goto out;
|
||||
|
||||
@@ -4613,17 +4618,17 @@ static vm_fault_t handle_pte_fault(struct vm_fault *vmf)
|
||||
return do_fault(vmf);
|
||||
}
|
||||
|
||||
if (vmf->flags & FAULT_FLAG_SPECULATIVE) {
|
||||
pte_unmap(vmf->pte);
|
||||
return VM_FAULT_RETRY;
|
||||
}
|
||||
|
||||
if (!pte_present(vmf->orig_pte))
|
||||
return do_swap_page(vmf);
|
||||
|
||||
if (pte_protnone(vmf->orig_pte) && vma_is_accessible(vmf->vma))
|
||||
return do_numa_page(vmf);
|
||||
|
||||
if (vmf->flags & FAULT_FLAG_SPECULATIVE) {
|
||||
pte_unmap(vmf->pte);
|
||||
return VM_FAULT_RETRY;
|
||||
}
|
||||
|
||||
vmf->ptl = pte_lockptr(vmf->vma->vm_mm, vmf->pmd);
|
||||
spin_lock(vmf->ptl);
|
||||
entry = vmf->orig_pte;
|
||||
|
||||
Reference in New Issue
Block a user