Skip to content

Commit 7686762

Browse files
svens-s390hcahca
authored andcommitted
s390/mm: fix per vma lock fault handling
With per-vma locks, handle_mm_fault() may return non-fatal error flags. In this case the code should reset the fault flags before returning. Fixes: e06f47a ("s390/mm: try VMA lock-based page fault handling first") Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent fdf0eaf commit 7686762

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/s390/mm/fault.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
421421
vma_end_read(vma);
422422
if (!(fault & VM_FAULT_RETRY)) {
423423
count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
424+
if (likely(!(fault & VM_FAULT_ERROR)))
425+
fault = 0;
424426
goto out;
425427
}
426428
count_vm_vma_lock_event(VMA_LOCK_RETRY);

0 commit comments

Comments
 (0)