mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
mm: run the fault-around code under the VMA lock
The map_pages fs method should be safe to run under the VMA lock instead of the mmap lock. This should have a measurable reduction in contention on the mmap lock. Link: https://lkml.kernel.org/r/20230724185410.1124082-9-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Suren Baghdasaryan <surenb@google.com> Cc: Arjun Roy <arjunroy@google.com> Cc: Eric Dumazet <edumazet@google.com> Cc: Punit Agrawal <punit.agrawal@bytedance.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
61a4b8d320
commit
f5617ffeb4
1 changed files with 5 additions and 5 deletions
10
mm/memory.c
10
mm/memory.c
|
@ -4533,11 +4533,6 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf)
|
||||||
vm_fault_t ret = 0;
|
vm_fault_t ret = 0;
|
||||||
struct folio *folio;
|
struct folio *folio;
|
||||||
|
|
||||||
if (vmf->flags & FAULT_FLAG_VMA_LOCK) {
|
|
||||||
vma_end_read(vmf->vma);
|
|
||||||
return VM_FAULT_RETRY;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Let's call ->map_pages() first and use ->fault() as fallback
|
* Let's call ->map_pages() first and use ->fault() as fallback
|
||||||
* if page by the offset is not ready to be mapped (cold cache or
|
* if page by the offset is not ready to be mapped (cold cache or
|
||||||
|
@ -4549,6 +4544,11 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (vmf->flags & FAULT_FLAG_VMA_LOCK) {
|
||||||
|
vma_end_read(vmf->vma);
|
||||||
|
return VM_FAULT_RETRY;
|
||||||
|
}
|
||||||
|
|
||||||
ret = __do_fault(vmf);
|
ret = __do_fault(vmf);
|
||||||
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
|
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue