LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"hannes@cmpxchg.org" <hannes@cmpxchg.org>,
	"nishimura@mxp.nes.nec.co.jp" <nishimura@mxp.nes.nec.co.jp>,
	"balbir@linux.vnet.ibm.com" <balbir@linux.vnet.ibm.com>
Subject: [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge
Date: Fri, 28 Jan 2011 12:27:29 +0900	[thread overview]
Message-ID: <20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com> (raw)
In-Reply-To: <20110128122229.6a4c74a2.kamezawa.hiroyu@jp.fujitsu.com>


Thanks to Johanns and Daisuke for suggestion.
=
Hugepage allocation shouldn't trigger oom.
Allocation failure is not fatal.

Orignal-patch-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
 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;
 
 	pc = lookup_page_cgroup(page);
 	/* can happen at boot */
@@ -2381,7 +2384,7 @@ static int mem_cgroup_charge_common(stru
 		return 0;
 	prefetchw(pc);
 
-	ret = __mem_cgroup_try_charge(mm, gfp_mask, &mem, true, page_size);
+	ret = __mem_cgroup_try_charge(mm, gfp_mask, &mem, oom, page_size);
 	if (ret || !mem)
 		return ret;
 


  parent reply	other threads:[~2011-01-28  3:33 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-28  3:22 [BUGFIX][PATCH 0/4] Fixes for memcg with THP KAMEZAWA Hiroyuki
2011-01-28  3:24 ` [BUGFIX][PATCH 1/4] memcg: fix limit estimation at reclaim for hugepage KAMEZAWA Hiroyuki
2011-01-28  4:40   ` Daisuke Nishimura
2011-01-28  4:49     ` KAMEZAWA Hiroyuki
2011-01-28  4:58     ` KAMEZAWA Hiroyuki
2011-01-28  5:36       ` Daisuke Nishimura
2011-01-28  8:04       ` Minchan Kim
2011-01-28  8:17         ` Johannes Weiner
2011-01-28  8:25           ` Minchan Kim
2011-01-28  8:36             ` KAMEZAWA Hiroyuki
2011-01-30  2:26               ` Minchan Kim
2011-01-28  8:41             ` Johannes Weiner
2011-01-28  8:24         ` KAMEZAWA Hiroyuki
2011-01-28  8:37           ` Minchan Kim
2011-01-28  7:52   ` Johannes Weiner
2011-01-28  8:06     ` KAMEZAWA Hiroyuki
2011-01-28  3:26 ` [BUGFIX][PATCH 2/4] memcg: fix charge path for THP and allow early retirement KAMEZAWA Hiroyuki
2011-01-28  5:37   ` Daisuke Nishimura
2011-01-28  7:57   ` Johannes Weiner
2011-01-28  8:14     ` KAMEZAWA Hiroyuki
2011-01-28  9:02       ` Johannes Weiner
2011-01-28  9:16         ` KAMEZAWA Hiroyuki
2011-01-28  3:27 ` KAMEZAWA Hiroyuki [this message]
2011-01-28  5:39   ` [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge Daisuke Nishimura
2011-01-28  5:50     ` KAMEZAWA Hiroyuki
2011-01-28  8:02   ` Johannes Weiner
2011-01-28  8:21     ` KAMEZAWA Hiroyuki
2011-01-31  7:41       ` Balbir Singh
2011-01-28  3:28 ` [BUGFIX][PATCH 4/4] memcg: fix khugepaged should skip busy memcg KAMEZAWA Hiroyuki
2011-01-28  8:20   ` Daisuke Nishimura
2011-01-28  8:30     ` KAMEZAWA Hiroyuki
2011-01-29 12:47 ` [BUGFIX][PATCH 0/4] Fixes for memcg with THP Balbir Singh
2011-01-30 23:55   ` KAMEZAWA Hiroyuki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110128122729.1f1c613e.kamezawa.hiroyu@jp.fujitsu.com \
    --to=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=balbir@linux.vnet.ibm.com \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=nishimura@mxp.nes.nec.co.jp \
    --subject='Re: [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).