Commit ae7efa50 authored Apr 15, 2015 by Kirill A. Shutemov Committed by Linus Torvalds Apr 15, 2015

thp: do not adjust zone water marks if khugepaged is not started



set_recommended_min_free_kbytes() adjusts zone water marks to be suitable
for khugepaged. We avoid doing this if khugepaged is disabled, but don't
catch the case when khugepaged is failed to start.

Let's address this by checking khugepaged_thread instead of
khugepaged_enabled() in set_recommended_min_free_kbytes().
It's NULL if the kernel thread is stopped or failed to start.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 65ebb64f

mm/huge_memory.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,8 @@ static int set_recommended_min_free_kbytes(void)
		int nr_zones = 0;
		unsigned long recommended_min;

		if (!khugepaged_enabled())
		/* khugepaged thread has stopped to failed to start */
		if (!khugepaged_thread)
		return 0;

		for_each_populated_zone(zone)

Admin message