mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed.patch removed from -mm tree
The quilt patch titled
Subject: mm: drop per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED
has been removed from the -mm tree. Its filename was
mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Suren Baghdasaryan <[email protected]>
Subject: mm: drop per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED
Date: Fri, 30 Jun 2023 14:19:54 -0700
handle_mm_fault returning VM_FAULT_RETRY or VM_FAULT_COMPLETED means mmap_lock has been released. However with per-VMA locks behavior is different and the caller should still release it. To make the rules consistent for the caller, drop the per-VMA lock when returning VM_FAULT_RETRY or VM_FAULT_COMPLETED. Currently the only path returning VM_FAULT_RETRY under per-VMA locks is do_swap_page and no path returns VM_FAULT_COMPLETED for now.
---
arch/arm64/mm/fault.c | 3 ++- arch/powerpc/mm/fault.c | 3 ++- arch/riscv/mm/fault.c | 3 ++- arch/s390/mm/fault.c | 3 ++- arch/x86/mm/fault.c | 3 ++- mm/memory.c | 12 ++++++++++++ 6 files changed, 22 insertions(+), 5 deletions(-)
arch/arm64/mm/fault.c renamed from arch/arm64/mm/fault.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +2 -1
@@ -599,7 +599,8 @@ static int __kprobes do_page_fault(unsig goto lock_mmap; } fault =handle_mm_fault (vma, addr, mm_flags |FAULT_FLAG_VMA_LOCK , regs); -vma_end_read (vma); +if (!(fault & (VM_FAULT_RETRY |VM_FAULT_COMPLETED ))) +vma_end_read (vma);if (!(fault &VM_FAULT_RETRY )) {count_vm_vma_lock_event (VMA_LOCK_SUCCESS );
arch/powerpc/mm/fault.c renamed from arch/powerpc/mm/fault.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +2 -1
@@ -488,7 +488,8 @@ static int ___do_page_fault(struct pt_re } fault =handle_mm_fault (vma, address, flags |FAULT_FLAG_VMA_LOCK , regs); -vma_end_read (vma); +if (!(fault & (VM_FAULT_RETRY |VM_FAULT_COMPLETED ))) +vma_end_read (vma);if (!(fault &VM_FAULT_RETRY )) {count_vm_vma_lock_event (VMA_LOCK_SUCCESS );
arch/riscv/mm/fault.c renamed from arch/riscv/mm/fault.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +2 -1
@@ -296,7 +296,8 @@ void handle_page_fault(struct pt_regs *r } fault =handle_mm_fault (vma, addr, flags |FAULT_FLAG_VMA_LOCK , regs); -vma_end_read (vma); +if (!(fault & (VM_FAULT_RETRY |VM_FAULT_COMPLETED ))) +vma_end_read (vma);if (!(fault &VM_FAULT_RETRY )) {count_vm_vma_lock_event (VMA_LOCK_SUCCESS );
arch/s390/mm/fault.c renamed from arch/s390/mm/fault.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +2 -1
@@ -417,7 +417,8 @@ static inline vm_fault_t do_exception(st goto lock_mmap; } fault =handle_mm_fault (vma, address, flags |FAULT_FLAG_VMA_LOCK , regs); -vma_end_read (vma); +if (!(fault & (VM_FAULT_RETRY |VM_FAULT_COMPLETED ))) +vma_end_read (vma);if (!(fault &VM_FAULT_RETRY )) {count_vm_vma_lock_event (VMA_LOCK_SUCCESS );if (likely (!(fault &VM_FAULT_ERROR )))
arch/x86/mm/fault.c renamed from arch/x86/mm/fault.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +2 -1
@@ -1340,7 +1340,8 @@ void do_user_addr_fault(struct pt_regs * goto lock_mmap; } fault =handle_mm_fault (vma, address, flags |FAULT_FLAG_VMA_LOCK , regs); -vma_end_read (vma); +if (!(fault & (VM_FAULT_RETRY |VM_FAULT_COMPLETED ))) +vma_end_read (vma);if (!(fault &VM_FAULT_RETRY )) {count_vm_vma_lock_event (VMA_LOCK_SUCCESS );
mm/memory.c renamed from mm/memory.c~mm-drop-per-vma-lock-when-returning-vm_fault_retry-or-vm_fault_completed +12 -0
@@ -3747,6 +3747,7 @@ vm_fault_t do_swap_page(struct vm_faultif (vmf->flags &FAULT_FLAG_VMA_LOCK ) { ret =VM_FAULT_RETRY ; +vma_end_read (vma); goto out; }
@@ -5248,6 +5249,17 @@ static vm_fault_t sanitize_fault_flags(s !is_cow_mapping(vma->vm_flags)))return VM_FAULT_SIGSEGV ; } +#ifdef CONFIG_PER_VMA_LOCK +/* +* Per-VMA locks can't be used with FAULT_FLAG_RETRY_NOWAIT because of +* the assumption that lock is dropped on VM_FAULT_RETRY. +*/ +if (WARN_ON_ONCE ((*flags & + (FAULT_FLAG_VMA_LOCK |FAULT_FLAG_RETRY_NOWAIT )) == + (FAULT_FLAG_VMA_LOCK |FAULT_FLAG_RETRY_NOWAIT ))) +return VM_FAULT_SIGSEGV ; +#endif +return 0 ; }
_
Patches currently in -mm which might be from [email protected] are