]> git.baikalelectronics.ru Git - kernel.git/commit
mm, thp: remove cond_resched from __collapse_huge_page_copy
authorDavid Rientjes <rientjes@google.com>
Fri, 23 Jun 2017 22:08:38 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jun 2017 23:15:55 +0000 (16:15 -0700)
commitf06ac30614224e1cda0e5d02d066ec9b6824ea64
treece2dac47780133fee1e18579af6070add62319b5
parent43e1e9994bca8693fda36944102702b8b9969104
mm, thp: remove cond_resched from __collapse_huge_page_copy

This is a partial revert of commit 588c85ec14f6 ("mm, thp: copying user
pages must schedule on collapse") which added a cond_resched() to
__collapse_huge_page_copy().

On x86 with CONFIG_HIGHPTE, __collapse_huge_page_copy is called in
atomic context and thus scheduling is not possible.  This is only a
possible config on arm and i386.

Although need_resched has been shown to be set for over 100 jiffies
while doing the iteration in __collapse_huge_page_copy, this is better
than doing

if (in_atomic())
cond_resched()

to cover only non-CONFIG_HIGHPTE configs.

Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1706191341550.97821@chino.kir.corp.google.com
Signed-off-by: David Rientjes <rientjes@google.com>
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/khugepaged.c