Re: [PATCHv2, RFC 23/30] thp: prepare zap_huge_pmd() to uncharge filepages

From: Kirill A. Shutemov
Date: Fri Mar 15 2013 - 09:28:45 EST


Hillf Danton wrote:
> On Fri, Mar 15, 2013 at 1:50 AM, Kirill A. Shutemov
> <kirill.shutemov@xxxxxxxxxxxxxxx> wrote:
> > From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
> >
> > Uncharge pages from correct counter.
> >
> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
> > ---
> > 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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/