From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965469Ab3HHOIc (ORCPT ); Thu, 8 Aug 2013 10:08:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44461 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965400Ab3HHOAq (ORCPT ); Thu, 8 Aug 2013 10:00:46 -0400 From: Mel Gorman To: Peter Zijlstra , Rik van Riel Cc: Srikar Dronamraju , Ingo Molnar , Andrea Arcangeli , Johannes Weiner , Linux-MM , LKML , Mel Gorman Subject: [PATCH 03/27] mm: numa: Account for THP numa hinting faults on the correct node Date: Thu, 8 Aug 2013 15:00:15 +0100 Message-Id: <1375970439-5111-4-git-send-email-mgorman@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1375970439-5111-1-git-send-email-mgorman@suse.de> References: <1375970439-5111-1-git-send-email-mgorman@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 45ef9dc..e52c131 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