From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754596Ab3CON2m (ORCPT ); Fri, 15 Mar 2013 09:28:42 -0400 Received: from mga02.intel.com ([134.134.136.20]:36968 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753551Ab3CON2l (ORCPT ); Fri, 15 Mar 2013 09:28:41 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,850,1355126400"; d="scan'208";a="279998609" From: "Kirill A. Shutemov" To: Hillf Danton Cc: "Kirill A. Shutemov" , Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> <1363283435-7666-24-git-send-email-kirill.shutemov@linux.intel.com> Subject: Re: [PATCHv2, RFC 23/30] thp: prepare zap_huge_pmd() to uncharge file pages Content-Transfer-Encoding: 7bit Message-Id: <20130315133020.2722BE0085@blue.fi.intel.com> Date: Fri, 15 Mar 2013 15:30:20 +0200 (EET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hillf Danton wrote: > On Fri, Mar 15, 2013 at 1:50 AM, Kirill A. Shutemov > wrote: > > From: "Kirill A. Shutemov" > > > > Uncharge pages from correct counter. > > > > Signed-off-by: Kirill A. Shutemov > > --- > > mm/huge_memory.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index a23da8b..34e0385 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -1368,10 +1368,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, > > spin_unlock(&tlb->mm->page_table_lock); > > put_huge_zero_page(); > > } else { > > + int counter; > s/counter/item/ ? I saw 'member' in other place, so I'll rename it to 'member'. > > page = pmd_page(orig_pmd); > > page_remove_rmap(page); > > VM_BUG_ON(page_mapcount(page) < 0); > > - add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR); > > + counter = PageAnon(page) ? MM_ANONPAGES : MM_FILEPAGES; > > + add_mm_counter(tlb->mm, counter, -HPAGE_PMD_NR); > > VM_BUG_ON(!PageHead(page)); > > tlb->mm->nr_ptes--; > > spin_unlock(&tlb->mm->page_table_lock); > > -- > > 1.7.10.4 > > -- Kirill A. Shutemov From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kirill A. Shutemov" Subject: Re: [PATCHv2, RFC 23/30] thp: prepare zap_huge_pmd() to uncharge file pages Date: Fri, 15 Mar 2013 15:30:20 +0200 (EET) Message-ID: <20130315133020.2722BE0085@blue.fi.intel.com> References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> <1363283435-7666-24-git-send-email-kirill.shutemov@linux.intel.com> Content-Transfer-Encoding: 7bit Cc: "Kirill A. Shutemov" , Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Hillf Danton Return-path: In-Reply-To: Sender: owner-linux-mm@kvack.org List-Id: linux-fsdevel.vger.kernel.org Hillf Danton wrote: > On Fri, Mar 15, 2013 at 1:50 AM, Kirill A. Shutemov > wrote: > > From: "Kirill A. Shutemov" > > > > Uncharge pages from correct counter. > > > > Signed-off-by: Kirill A. Shutemov > > --- > > mm/huge_memory.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index a23da8b..34e0385 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -1368,10 +1368,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, > > spin_unlock(&tlb->mm->page_table_lock); > > put_huge_zero_page(); > > } else { > > + int counter; > s/counter/item/ ? I saw 'member' in other place, so I'll rename it to 'member'. > > page = pmd_page(orig_pmd); > > page_remove_rmap(page); > > VM_BUG_ON(page_mapcount(page) < 0); > > - add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR); > > + counter = PageAnon(page) ? MM_ANONPAGES : MM_FILEPAGES; > > + add_mm_counter(tlb->mm, counter, -HPAGE_PMD_NR); > > VM_BUG_ON(!PageHead(page)); > > tlb->mm->nr_ptes--; > > spin_unlock(&tlb->mm->page_table_lock); > > -- > > 1.7.10.4 > > -- Kirill A. Shutemov -- 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: email@kvack.org