Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756073Ab2F1M66 (ORCPT ); Thu, 28 Jun 2012 08:58:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755415Ab2F1M6z (ORCPT ); Thu, 28 Jun 2012 08:58:55 -0400 From: Andrea Arcangeli To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Hillf Danton , Dan Smith , Peter Zijlstra , Linus Torvalds , Andrew Morton , Thomas Gleixner , Ingo Molnar , Paul Turner , Suresh Siddha , Mike Galbraith , "Paul E. McKenney" , Lai Jiangshan , Bharata B Rao , Lee Schermerhorn , Rik van Riel , Johannes Weiner , Srivatsa Vaddagiri , Christoph Lameter , Alex Shi , Mauricio Faria de Oliveira , Konrad Rzeszutek Wilk , Don Morris , Benjamin Herrenschmidt Subject: [PATCH 28/40] autonuma: make khugepaged pte_numa aware Date: Thu, 28 Jun 2012 14:56:08 +0200 Message-Id: <1340888180-15355-29-git-send-email-aarcange@redhat.com> In-Reply-To: <1340888180-15355-1-git-send-email-aarcange@redhat.com> References: <1340888180-15355-1-git-send-email-aarcange@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2321 Lines: 75 If any of the ptes that khugepaged is collapsing was a pte_numa, the resulting trans huge pmd will be a pmd_numa too. Signed-off-by: Andrea Arcangeli --- mm/huge_memory.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 55fc72d..094f82b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1799,12 +1799,13 @@ out: return isolated; } -static void __collapse_huge_page_copy(pte_t *pte, struct page *page, +static bool __collapse_huge_page_copy(pte_t *pte, struct page *page, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl) { pte_t *_pte; + bool mknuma = false; for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++) { pte_t pteval = *_pte; struct page *src_page; @@ -1832,11 +1833,15 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, page_remove_rmap(src_page); spin_unlock(ptl); free_page_and_swap_cache(src_page); + + mknuma |= pte_numa(pteval); } address += PAGE_SIZE; page++; } + + return mknuma; } static void collapse_huge_page(struct mm_struct *mm, @@ -1854,6 +1859,7 @@ static void collapse_huge_page(struct mm_struct *mm, spinlock_t *ptl; int isolated; unsigned long hstart, hend; + bool mknuma = false; VM_BUG_ON(address & ~HPAGE_PMD_MASK); #ifndef CONFIG_NUMA @@ -1972,7 +1978,8 @@ static void collapse_huge_page(struct mm_struct *mm, */ anon_vma_unlock(vma->anon_vma); - __collapse_huge_page_copy(pte, new_page, vma, address, ptl); + mknuma = pmd_numa(_pmd); + mknuma |= __collapse_huge_page_copy(pte, new_page, vma, address, ptl); pte_unmap(pte); __SetPageUptodate(new_page); pgtable = pmd_pgtable(_pmd); @@ -1982,6 +1989,8 @@ static void collapse_huge_page(struct mm_struct *mm, _pmd = mk_pmd(new_page, vma->vm_page_prot); _pmd = maybe_pmd_mkwrite(pmd_mkdirty(_pmd), vma); _pmd = pmd_mkhuge(_pmd); + if (mknuma) + _pmd = pmd_mknuma(_pmd); /* * spin_lock() below is not the equivalent of smp_wmb(), so -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/