Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa41b900 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm/thp: do not wait for lock_page() in deferred_split_scan() 

deferred_split_scan() gets called from reclaim path.  Waiting for page
lock may lead to deadlock there.

Replace lock_page() with trylock_page() and skip the page if we failed
to lock it.  We will get to the page on the next scan.

Link: http://lkml.kernel.org/r/20180315150747.31945-1-kirill.shutemov@linux.intel.com


Fixes: 9a982250 ("thp: introduce deferred_split_huge_page()")
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fece2029

mm/huge_memory.c

+3 −1
Original line number Diff line number Diff line
@@ -2783,11 +2783,13 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, 


	list_for_each_safe(pos, next, &list) {

		page = list_entry((void *)pos, struct page, mapping);

		lock_page(page);

		if (!trylock_page(page))

			goto next;

		/* split_huge_page() removes page from list on success */

		if (!split_huge_page(page))

			split++;

		unlock_page(page);

next:

		put_page(page);

	}