Re: [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge

From: Johannes Weiner
Date: Fri Jan 28 2011 - 03:02:22 EST


On Fri, Jan 28, 2011 at 12:27:29PM +0900, KAMEZAWA Hiroyuki wrote:
>
> Thanks to Johanns and Daisuke for suggestion.
> =
> Hugepage allocation shouldn't trigger oom.
> Allocation failure is not fatal.
>
> Orignal-patch-by: Johannes Weiner <hannes@xxxxxxxxxxx>
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> ---
> mm/memcontrol.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Index: mmotm-0125/mm/memcontrol.c
> ===================================================================
> --- mmotm-0125.orig/mm/memcontrol.c
> +++ mmotm-0125/mm/memcontrol.c
> @@ -2369,11 +2369,14 @@ static int mem_cgroup_charge_common(stru
> struct page_cgroup *pc;
> int ret;
> int page_size = PAGE_SIZE;
> + bool oom;
>
> if (PageTransHuge(page)) {
> page_size <<= compound_order(page);
> VM_BUG_ON(!PageTransHuge(page));
> - }
> + oom = false;
> + } else
> + oom = true;

That needs a comment. You can take the one from my patch if you like.
--
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/