A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

BACKPORT: mm/hmm: do not call hmm_vma_walk_hole() while holding a spinlock

Browse source 
This eventually calls into handle_mm_fault() which is a sleeping function.
Release the lock first.

hmm_vma_walk_hole() does not touch the contents of the PUD, so it does not
need the lock.
Moto-CRs-Fixed:(CR)

Link: https://lore.kernel.org/r/20200311183506.3997-4-jgg@ziepe.ca/
Fixes: 3afc423632a1 ("mm: pagewalk: add p4d_entry() and pgd_entry()")
Cc: Steven Price <steven.price@arm.com>
Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Change-Id: I4dd851a2fcf242877ae7acd082f3521e7202d258
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
(cherry picked from commit 05fc1df95e5dc09802813bab9c1e718f1e419d93)
Bug: 261052246
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Reviewed-on: https://gerrit.mot.com/2491784
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Jason Gunthorpe 2020-03-02 15:26:44 -04:00 • committed by Xiaojun Ji
commit 87ee083dbc
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mm/hmm.c
View file

@ -671,8 +671,8 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end,
pud = READ_ONCE(*pudp);
if (pud_none(pud)) {
ret = hmm_vma_walk_hole(start, end, walk);
goto out_unlock;
spin_unlock(ptl);
return hmm_vma_walk_hole(start, end, walk);
}
if (pud_huge(pud) && pud_devmap(pud)) {
@ -681,8 +681,8 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end,
bool fault, write_fault;
if (!pud_present(pud)) {
ret = hmm_vma_walk_hole(start, end, walk);
goto out_unlock;
spin_unlock(ptl);
return hmm_vma_walk_hole(start, end, walk);
}
i = (addr - range->start) >> PAGE_SHIFT;
@ -693,9 +693,9 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end,
hmm_range_need_fault(hmm_vma_walk, pfns, npages,
cpu_flags, &fault, &write_fault);
if (fault || write_fault) {
ret = hmm_vma_walk_hole_(addr, end, fault,
write_fault, walk);
goto out_unlock;
spin_unlock(ptl);
return hmm_vma_walk_hole_(addr, end, fault, write_fault,
walk);
}
pfn = pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT);