Commit 0c3a775e authored Oct 07, 2013 by Mel Gorman Committed by Ingo Molnar Oct 09, 2013

mm: numa: Do not account for a hinting fault if we raced



If another task handled a hinting fault in parallel then do not double
account for it.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1381141781-10992-5-git-send-email-mgorman@suse.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent c69307d5

mm/huge_memory.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1325,8 +1325,11 @@ int do_huge_pmd_numa_page(struct mm_struct mm, struct vm_area_struct vma,

		check_same:
		spin_lock(&mm->page_table_lock);
		if (unlikely(!pmd_same(pmd, *pmdp)))
		if (unlikely(!pmd_same(pmd, *pmdp))) {
		/* Someone else took our fault */
		current_nid = -1;
		goto out_unlock;
		}
		clear_pmdnuma:
		pmd = pmd_mknonnuma(pmd);
		set_pmd_at(mm, haddr, pmdp, pmd);