Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932818Ab2HVPCL (ORCPT ); Wed, 22 Aug 2012 11:02:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53428 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757214Ab2HVPBb (ORCPT ); Wed, 22 Aug 2012 11:01:31 -0400 From: Andrea Arcangeli To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Hillf Danton , Dan Smith , 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 23/36] autonuma: retain page last_nid information in khugepaged Date: Wed, 22 Aug 2012 16:59:07 +0200 Message-Id: <1345647560-30387-24-git-send-email-aarcange@redhat.com> In-Reply-To: <1345647560-30387-1-git-send-email-aarcange@redhat.com> References: <1345647560-30387-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: 1551 Lines: 45 When pages are collapsed try to keep the last_nid information from one of the original pages. Signed-off-by: Andrea Arcangeli --- mm/huge_memory.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a65590f..0d2a12f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1829,6 +1829,9 @@ static bool __collapse_huge_page_copy(pte_t *pte, struct page *page, { pte_t *_pte; bool mknuma = false; +#ifdef CONFIG_AUTONUMA + int autonuma_last_nid = -1; +#endif for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++) { pte_t pteval = *_pte; struct page *src_page; @@ -1838,6 +1841,17 @@ static bool __collapse_huge_page_copy(pte_t *pte, struct page *page, add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); } else { src_page = pte_page(pteval); +#ifdef CONFIG_AUTONUMA + /* pick the first one, better than nothing */ + if (autonuma_last_nid < 0) { + autonuma_last_nid = + ACCESS_ONCE(src_page-> + autonuma_last_nid); + if (autonuma_last_nid >= 0) + ACCESS_ONCE(page->autonuma_last_nid) = + autonuma_last_nid; + } +#endif copy_user_highpage(page, src_page, address, vma); VM_BUG_ON(page_mapcount(src_page) != 1); VM_BUG_ON(page_count(src_page) != 0); -- 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/