diff options
author | Mel Gorman <mgorman@suse.de> | 2013-10-07 06:28:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:39:40 -0400 |
commit | 0c3a775e1e0b069bf765f8355b723ce0d18dcc6c (patch) | |
tree | c71bab366ceb81cc198f06b3d492aa8c62ea10cb /mm/huge_memory.c | |
parent | c69307d533d7aa7cc8894dbbb8a274599f8630d7 (diff) |
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>
Diffstat (limited to 'mm/huge_memory.c')
-rw-r--r-- | mm/huge_memory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 19dbb08c64a5..dab2bab9d33e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -1325,8 +1325,11 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
1325 | 1325 | ||
1326 | check_same: | 1326 | check_same: |
1327 | spin_lock(&mm->page_table_lock); | 1327 | spin_lock(&mm->page_table_lock); |
1328 | if (unlikely(!pmd_same(pmd, *pmdp))) | 1328 | if (unlikely(!pmd_same(pmd, *pmdp))) { |
1329 | /* Someone else took our fault */ | ||
1330 | current_nid = -1; | ||
1329 | goto out_unlock; | 1331 | goto out_unlock; |
1332 | } | ||
1330 | clear_pmdnuma: | 1333 | clear_pmdnuma: |
1331 | pmd = pmd_mknonnuma(pmd); | 1334 | pmd = pmd_mknonnuma(pmd); |
1332 | set_pmd_at(mm, haddr, pmdp, pmd); | 1335 | set_pmd_at(mm, haddr, pmdp, pmd); |