tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: Revert "mm: handle read faults under the VMA lock""

Browse Source 
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
This commit is contained in:
Suren Baghdasaryan
2024-01-02 19:26:21 +00:00
parent 7b33d5fab9
commit 5119c6beb8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/memory.c
+3 -4
View File
@@ -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)))