linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Mel Gorman <mgorman@suse.de>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Linux-MM <linux-mm@kvack.org>,
	LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@suse.de>
Subject: [PATCH 03/16] mm: numa: Account for THP numa hinting faults on the correct node
Date: Thu, 11 Jul 2013 10:46:47 +0100	[thread overview]
Message-ID: <1373536020-2799-4-git-send-email-mgorman@suse.de> (raw)
In-Reply-To: <1373536020-2799-1-git-send-email-mgorman@suse.de>

THP NUMA hinting fault on pages that are not migrated are being
accounted for incorrectly. Currently the fault will be counted as if the
task was running on a node local to the page which is not necessarily
true.

Signed-off-by: Mel Gorman <mgorman@suse.de>
---
 mm/huge_memory.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e2f7f5aa..e4a79fa 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1293,7 +1293,7 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	struct page *page;
 	unsigned long haddr = addr & HPAGE_PMD_MASK;
 	int target_nid;
-	int current_nid = -1;
+	int src_nid = -1;
 	bool migrated;
 
 	spin_lock(&mm->page_table_lock);
@@ -1302,9 +1302,9 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
 	page = pmd_page(pmd);
 	get_page(page);
-	current_nid = page_to_nid(page);
+	src_nid = numa_node_id();
 	count_vm_numa_event(NUMA_HINT_FAULTS);
-	if (current_nid == numa_node_id())
+	if (src_nid == page_to_nid(page))
 		count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
 
 	target_nid = mpol_misplaced(page, vma, haddr);
@@ -1346,8 +1346,8 @@ clear_pmdnuma:
 	update_mmu_cache_pmd(vma, addr, pmdp);
 out_unlock:
 	spin_unlock(&mm->page_table_lock);
-	if (current_nid != -1)
-		task_numa_fault(current_nid, HPAGE_PMD_NR, false);
+	if (src_nid != -1)
+		task_numa_fault(src_nid, HPAGE_PMD_NR, false);
 	return 0;
 }
 
-- 
1.8.1.4

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2013-07-11  9:47 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11  9:46 [PATCH 0/16] Basic scheduler support for automatic NUMA balancing V4 Mel Gorman
2013-07-11  9:46 ` [PATCH 01/16] mm: numa: Document automatic NUMA balancing sysctls Mel Gorman
2013-07-11  9:46 ` [PATCH 02/16] sched: Track NUMA hinting faults on per-node basis Mel Gorman
2013-07-11  9:46 ` Mel Gorman [this message]
2013-07-11  9:46 ` [PATCH 04/16] mm: numa: Do not migrate or account for hinting faults on the zero page Mel Gorman
2013-07-11 11:21   ` Peter Zijlstra
2013-07-11 12:42     ` Mel Gorman
2013-07-11  9:46 ` [PATCH 05/16] sched: Select a preferred node with the most numa hinting faults Mel Gorman
2013-07-11 11:23   ` Peter Zijlstra
2013-07-11 12:53     ` Mel Gorman
2013-07-11  9:46 ` [PATCH 06/16] sched: Update NUMA hinting faults once per scan Mel Gorman
2013-07-11  9:46 ` [PATCH 07/16] sched: Favour moving tasks towards the preferred node Mel Gorman
2013-07-11  9:46 ` [PATCH 08/16] sched: Reschedule task on preferred NUMA node once selected Mel Gorman
2013-07-11 12:30   ` Peter Zijlstra
2013-07-11 13:03     ` Mel Gorman
2013-07-11 13:11       ` Peter Zijlstra
2013-07-11 14:09         ` Mel Gorman
2013-07-12 10:14           ` Peter Zijlstra
2013-07-12 10:28             ` Mel Gorman
2013-07-11  9:46 ` [PATCH 09/16] sched: Add infrastructure for split shared/private accounting of NUMA hinting faults Mel Gorman
2013-07-11  9:46 ` [PATCH 10/16] sched: Increase NUMA PTE scanning when a new preferred node is selected Mel Gorman
2013-07-11  9:46 ` [PATCH 11/16] sched: Check current->mm before allocating NUMA faults Mel Gorman
2013-07-11  9:46 ` [PATCH 12/16] sched: Set the scan rate proportional to the size of the task being scanned Mel Gorman
2013-07-11  9:46 ` [PATCH 13/16] mm: numa: Scan pages with elevated page_mapcount Mel Gorman
2013-07-11  9:46 ` [PATCH 14/16] sched: Remove check that skips small VMAs Mel Gorman
2013-07-11  9:46 ` [PATCH 15/16] sched: Set preferred NUMA node based on number of private faults Mel Gorman
2013-07-11  9:47 ` [PATCH 16/16] sched: Select least loaded CPU on preferred NUMA node Mel Gorman
2013-07-11 12:39   ` Peter Zijlstra
2013-07-11 13:24     ` Mel Gorman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373536020-2799-4-git-send-email-mgorman@suse.de \
    --to=mgorman@suse.de \
    --cc=a.p.zijlstra@chello.nl \
    --cc=aarcange@redhat.com \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mingo@kernel.org \
    --cc=srikar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox