From 5119c6beb8618b4e89976c0a023aedcf964c408e Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 2 Jan 2024 19:26:21 +0000 Subject: [PATCH] Revert "ANDROID: Revert "mm: handle read faults under the VMA lock"" Revert submission 2889106 Reason for revert: Fix is merged upstream into mm-hotfixes-stable: https://lore.kernel.org/all/20231229190730.F1D80C433C8@smtp.kernel.org/ Reverted changes: /q/submissionid:2889106 Bug: 317385399 Test: atest drop_caches_test Change-Id: I516f9dc70f2bceffd4b8ffefcdf87b564342cfef --- mm/memory.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 86814fd53d28..8c942da437e4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4622,10 +4622,9 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf) return ret; } - if (vmf->flags & FAULT_FLAG_VMA_LOCK) { - vma_end_read(vmf->vma); - return VM_FAULT_RETRY; - } + ret = vmf_can_call_fault(vmf); + if (ret) + return ret; ret = __do_fault(vmf); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))