[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101214173824.GJ5638@random.random>
Date: Tue, 14 Dec 2010 18:38:24 +0100
From: Andrea Arcangeli <aarcange@...hat.com>
To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: linux-mm@...ck.org, Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org,
Marcelo Tosatti <mtosatti@...hat.com>,
Adam Litke <agl@...ibm.com>, Avi Kivity <avi@...hat.com>,
Hugh Dickins <hugh.dickins@...cali.co.uk>,
Rik van Riel <riel@...hat.com>, Mel Gorman <mel@....ul.ie>,
Dave Hansen <dave@...ux.vnet.ibm.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Ingo Molnar <mingo@...e.hu>, Mike Travis <travis@....com>,
Christoph Lameter <cl@...ux-foundation.org>,
Chris Wright <chrisw@...s-sol.org>, bpicco@...hat.com,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
Balbir Singh <balbir@...ux.vnet.ibm.com>,
"Michael S. Tsirkin" <mst@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Johannes Weiner <hannes@...xchg.org>,
Daisuke Nishimura <nishimura@....nes.nec.co.jp>,
Chris Mason <chris.mason@...cle.com>,
Borislav Petkov <bp@...en8.de>
Subject: Re: [PATCH 39 of 66] memcg huge memory
On Fri, Nov 19, 2010 at 10:19:38AM +0900, KAMEZAWA Hiroyuki wrote:
> On Wed, 03 Nov 2010 16:28:14 +0100
> Andrea Arcangeli <aarcange@...hat.com> wrote:
> > @@ -402,9 +408,15 @@ static int do_huge_pmd_wp_page_fallback(
> > for (i = 0; i < HPAGE_PMD_NR; i++) {
> > pages[i] = alloc_page_vma(GFP_HIGHUSER_MOVABLE,
> > vma, address);
> > - if (unlikely(!pages[i])) {
> > - while (--i >= 0)
> > + if (unlikely(!pages[i] ||
> > + mem_cgroup_newpage_charge(pages[i], mm,
> > + GFP_KERNEL))) {
> > + if (pages[i])
> > put_page(pages[i]);
> > + while (--i >= 0) {
> > + mem_cgroup_uncharge_page(pages[i]);
> > + put_page(pages[i]);
> > + }
>
> Maybe you can use batched-uncharge here.
> ==
> mem_cgroup_uncharge_start()
> {
> do loop;
> }
> mem_cgroup_uncharge_end();
> ==
> Then, many atomic ops can be reduced.
Cute!
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -413,10 +413,12 @@ static int do_huge_pmd_wp_page_fallback(
GFP_KERNEL))) {
if (pages[i])
put_page(pages[i]);
+ mem_cgroup_uncharge_start();
while (--i >= 0) {
mem_cgroup_uncharge_page(pages[i]);
put_page(pages[i]);
}
+ mem_cgroup_uncharge_end();
kfree(pages);
ret |= VM_FAULT_OOM;
goto out;
>
>
> > kfree(pages);
> > ret |= VM_FAULT_OOM;
> > goto out;
> > @@ -455,8 +467,10 @@ out:
> >
> > out_free_pages:
> > spin_unlock(&mm->page_table_lock);
> > - for (i = 0; i < HPAGE_PMD_NR; i++)
> > + for (i = 0; i < HPAGE_PMD_NR; i++) {
> > + mem_cgroup_uncharge_page(pages[i]);
> > put_page(pages[i]);
> > + }
>
> here, too.
This is actually a very unlikely path handling a thread race
condition, but I'll add it any way.
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -469,10 +469,12 @@ out:
out_free_pages:
spin_unlock(&mm->page_table_lock);
+ mem_cgroup_uncharge_start();
for (i = 0; i < HPAGE_PMD_NR; i++) {
mem_cgroup_uncharge_page(pages[i]);
put_page(pages[i]);
}
+ mem_cgroup_uncharge_end();
kfree(pages);
goto out;
}
> Hmm...it seems there are no codes for move_account() hugepage in series.
> I think it needs some complicated work to walk page table.
Agreed.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists