summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2016-12-13 03:44:47 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-16 12:59:09 +0300
commit700344f145069ea7535c57d8ad2cef881d7bb7da (patch)
tree9d7604de4fb8b111051a002fcf6dcb31249c0202
parentbd875c16654051bcbfbbdeba116b0477f785a6a0 (diff)
downloadlinux-700344f145069ea7535c57d8ad2cef881d7bb7da.tar.xz
mm: add cond_resched() in gather_pte_stats()
commit a66c0410b97c07a5708881198528ce724f7a3226 upstream. The other pagetable walks in task_mmu.c have a cond_resched() after walking their ptes: add a cond_resched() in gather_pte_stats() too, for reading /proc/<id>/numa_maps. Only pagemap_pmd_range() has a cond_resched() in its (unusually expensive) pmd_trans_huge case: more should probably be added, but leave them unchanged for now. Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1612052157400.13021@eggly.anvils Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: David Rientjes <rientjes@google.com> Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Reported-by: Chen si <cici.cs@alibaba-inc.com> Signed-off-by: Baoyou Xie <baoyou.xie@aliyun.com> Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> Signed-off-by: Zijiang Huang <zijiang.hzj@alibaba-inc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/proc/task_mmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 4b207b10db03..e6c8eadfaa80 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1609,6 +1609,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
} while (pte++, addr += PAGE_SIZE, addr != end);
pte_unmap_unlock(orig_pte, ptl);
+ cond_resched();
return 0;
}
#ifdef CONFIG_HUGETLB_PAGE