From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> To: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> 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>, "balbir@linux.vnet.ibm.com" <balbir@linux.vnet.ibm.com> Subject: Re: [BUGFIX][PATCH 1/4] memcg: fix limit estimation at reclaim for hugepage Date: Fri, 28 Jan 2011 13:49:02 +0900 [thread overview] Message-ID: <20110128134902.5845b507.kamezawa.hiroyu@jp.fujitsu.com> (raw) In-Reply-To: <20110128134019.27abcfe2.nishimura@mxp.nes.nec.co.jp> On Fri, 28 Jan 2011 13:40:19 +0900 Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote: > On Fri, 28 Jan 2011 12:24:49 +0900 > KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> wrote: > > > From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > > > Current memory cgroup's code tends to assume page_size == PAGE_SIZE > > and arrangement for THP is not enough yet. > > > > This is one of fixes for supporing THP. This adds > > mem_cgroup_check_margin() and checks whether there are required amount of > > free resource after memory reclaim. By this, THP page allocation > > can know whether it really succeeded or not and avoid infinite-loop > > and hangup. > > > > Total fixes for do_charge()/reclaim memory will follow this patch. > > > > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > This patch looks good to me, but some nitpicks. > > > --- > > include/linux/res_counter.h | 11 +++++++++++ > > mm/memcontrol.c | 25 ++++++++++++++++++++++++- > > 2 files changed, 35 insertions(+), 1 deletion(-) > > > > Index: mmotm-0125/include/linux/res_counter.h > > =================================================================== > > --- mmotm-0125.orig/include/linux/res_counter.h > > +++ mmotm-0125/include/linux/res_counter.h > > @@ -182,6 +182,17 @@ static inline bool res_counter_check_und > > return ret; > > } > > > > +static inline s64 res_counter_check_margin(struct res_counter *cnt) > > +{ > > + s64 ret; > > + unsigned long flags; > > + > > + spin_lock_irqsave(&cnt->lock, flags); > > + ret = cnt->limit - cnt->usage; > > + spin_unlock_irqrestore(&cnt->lock, flags); > > + return ret; > > +} > > + > > static inline bool res_counter_check_under_soft_limit(struct res_counter *cnt) > > { > > bool ret; > > Index: mmotm-0125/mm/memcontrol.c > > =================================================================== > > --- mmotm-0125.orig/mm/memcontrol.c > > +++ mmotm-0125/mm/memcontrol.c > > @@ -1111,6 +1111,22 @@ static bool mem_cgroup_check_under_limit > > return false; > > } > > > > +static s64 mem_cgroup_check_margin(struct mem_cgroup *mem) > > +{ > > + s64 mem_margin; > > + > > + if (do_swap_account) { > > + s64 memsw_margin; > > + > > + mem_margin = res_counter_check_margin(&mem->res); > > + memsw_margin = res_counter_check_margin(&mem->memsw); > > + if (mem_margin > memsw_margin) > > + mem_margin = memsw_margin; > > + } else > > + mem_margin = res_counter_check_margin(&mem->res); > > + return mem_margin; > > +} > > + > How about > > mem_margin = res_counter_check_margin(&mem->res); > if (do_swap_account) > memsw_margin = res_counter_check_margin(&mem->memsw); > else > memsw_margin = RESOURCE_MAX; > > return min(mem_margin, memsw_margin); > > ? > I think using min() makes it more clear what this function does. > Ok. > > static unsigned int get_swappiness(struct mem_cgroup *memcg) > > { > > struct cgroup *cgrp = memcg->css.cgroup; > > @@ -1853,7 +1869,14 @@ static int __mem_cgroup_do_charge(struct > > * Check the limit again to see if the reclaim reduced the > > * current usage of the cgroup before giving up > > */ > > - if (ret || mem_cgroup_check_under_limit(mem_over_limit)) > > + if (mem_cgroup_check_margin(mem_over_limit) >= csize) > > + return CHARGE_RETRY; > > + > > + /* > > + * If the charge size is a PAGE_SIZE, it's not hopeless while > > + * we can reclaim a page. > > + */ > > + if (csize == PAGE_SIZE && ret) > > return CHARGE_RETRY; > > > > /* > > > checkpatch complains some whitespace warnings. > will fix soon. -Kame
WARNING: multiple messages have this Message-ID (diff)
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> To: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> 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>, "balbir@linux.vnet.ibm.com" <balbir@linux.vnet.ibm.com> Subject: Re: [BUGFIX][PATCH 1/4] memcg: fix limit estimation at reclaim for hugepage Date: Fri, 28 Jan 2011 13:49:02 +0900 [thread overview] Message-ID: <20110128134902.5845b507.kamezawa.hiroyu@jp.fujitsu.com> (raw) In-Reply-To: <20110128134019.27abcfe2.nishimura@mxp.nes.nec.co.jp> On Fri, 28 Jan 2011 13:40:19 +0900 Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote: > On Fri, 28 Jan 2011 12:24:49 +0900 > KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> wrote: > > > From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > > > Current memory cgroup's code tends to assume page_size == PAGE_SIZE > > and arrangement for THP is not enough yet. > > > > This is one of fixes for supporing THP. This adds > > mem_cgroup_check_margin() and checks whether there are required amount of > > free resource after memory reclaim. By this, THP page allocation > > can know whether it really succeeded or not and avoid infinite-loop > > and hangup. > > > > Total fixes for do_charge()/reclaim memory will follow this patch. > > > > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > This patch looks good to me, but some nitpicks. > > > --- > > include/linux/res_counter.h | 11 +++++++++++ > > mm/memcontrol.c | 25 ++++++++++++++++++++++++- > > 2 files changed, 35 insertions(+), 1 deletion(-) > > > > Index: mmotm-0125/include/linux/res_counter.h > > =================================================================== > > --- mmotm-0125.orig/include/linux/res_counter.h > > +++ mmotm-0125/include/linux/res_counter.h > > @@ -182,6 +182,17 @@ static inline bool res_counter_check_und > > return ret; > > } > > > > +static inline s64 res_counter_check_margin(struct res_counter *cnt) > > +{ > > + s64 ret; > > + unsigned long flags; > > + > > + spin_lock_irqsave(&cnt->lock, flags); > > + ret = cnt->limit - cnt->usage; > > + spin_unlock_irqrestore(&cnt->lock, flags); > > + return ret; > > +} > > + > > static inline bool res_counter_check_under_soft_limit(struct res_counter *cnt) > > { > > bool ret; > > Index: mmotm-0125/mm/memcontrol.c > > =================================================================== > > --- mmotm-0125.orig/mm/memcontrol.c > > +++ mmotm-0125/mm/memcontrol.c > > @@ -1111,6 +1111,22 @@ static bool mem_cgroup_check_under_limit > > return false; > > } > > > > +static s64 mem_cgroup_check_margin(struct mem_cgroup *mem) > > +{ > > + s64 mem_margin; > > + > > + if (do_swap_account) { > > + s64 memsw_margin; > > + > > + mem_margin = res_counter_check_margin(&mem->res); > > + memsw_margin = res_counter_check_margin(&mem->memsw); > > + if (mem_margin > memsw_margin) > > + mem_margin = memsw_margin; > > + } else > > + mem_margin = res_counter_check_margin(&mem->res); > > + return mem_margin; > > +} > > + > How about > > mem_margin = res_counter_check_margin(&mem->res); > if (do_swap_account) > memsw_margin = res_counter_check_margin(&mem->memsw); > else > memsw_margin = RESOURCE_MAX; > > return min(mem_margin, memsw_margin); > > ? > I think using min() makes it more clear what this function does. > Ok. > > static unsigned int get_swappiness(struct mem_cgroup *memcg) > > { > > struct cgroup *cgrp = memcg->css.cgroup; > > @@ -1853,7 +1869,14 @@ static int __mem_cgroup_do_charge(struct > > * Check the limit again to see if the reclaim reduced the > > * current usage of the cgroup before giving up > > */ > > - if (ret || mem_cgroup_check_under_limit(mem_over_limit)) > > + if (mem_cgroup_check_margin(mem_over_limit) >= csize) > > + return CHARGE_RETRY; > > + > > + /* > > + * If the charge size is a PAGE_SIZE, it's not hopeless while > > + * we can reclaim a page. > > + */ > > + if (csize == PAGE_SIZE && ret) > > return CHARGE_RETRY; > > > > /* > > > checkpatch complains some whitespace warnings. > will fix soon. -Kame -- 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/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-01-28 4:55 UTC|newest] Thread overview: 66+ 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:22 ` KAMEZAWA Hiroyuki 2011-01-28 3:24 ` [BUGFIX][PATCH 1/4] memcg: fix limit estimation at reclaim for hugepage KAMEZAWA Hiroyuki 2011-01-28 3:24 ` KAMEZAWA Hiroyuki 2011-01-28 4:40 ` Daisuke Nishimura 2011-01-28 4:40 ` Daisuke Nishimura 2011-01-28 4:49 ` KAMEZAWA Hiroyuki [this message] 2011-01-28 4:49 ` KAMEZAWA Hiroyuki 2011-01-28 4:58 ` KAMEZAWA Hiroyuki 2011-01-28 4:58 ` KAMEZAWA Hiroyuki 2011-01-28 5:36 ` Daisuke Nishimura 2011-01-28 5:36 ` Daisuke Nishimura 2011-01-28 8:04 ` Minchan Kim 2011-01-28 8:04 ` Minchan Kim 2011-01-28 8:17 ` Johannes Weiner 2011-01-28 8:17 ` Johannes Weiner 2011-01-28 8:25 ` Minchan Kim 2011-01-28 8:25 ` Minchan Kim 2011-01-28 8:36 ` KAMEZAWA Hiroyuki 2011-01-28 8:36 ` KAMEZAWA Hiroyuki 2011-01-30 2:26 ` Minchan Kim 2011-01-30 2:26 ` Minchan Kim 2011-01-28 8:41 ` Johannes Weiner 2011-01-28 8:41 ` Johannes Weiner 2011-01-28 8:24 ` KAMEZAWA Hiroyuki 2011-01-28 8:24 ` KAMEZAWA Hiroyuki 2011-01-28 8:37 ` Minchan Kim 2011-01-28 8:37 ` Minchan Kim 2011-01-28 7:52 ` Johannes Weiner 2011-01-28 7:52 ` Johannes Weiner 2011-01-28 8:06 ` KAMEZAWA Hiroyuki 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 3:26 ` KAMEZAWA Hiroyuki 2011-01-28 5:37 ` Daisuke Nishimura 2011-01-28 5:37 ` Daisuke Nishimura 2011-01-28 7:57 ` Johannes Weiner 2011-01-28 7:57 ` Johannes Weiner 2011-01-28 8:14 ` KAMEZAWA Hiroyuki 2011-01-28 8:14 ` KAMEZAWA Hiroyuki 2011-01-28 9:02 ` Johannes Weiner 2011-01-28 9:02 ` Johannes Weiner 2011-01-28 9:16 ` KAMEZAWA Hiroyuki 2011-01-28 9:16 ` KAMEZAWA Hiroyuki 2011-01-28 3:27 ` [BUGFIX][PATCH 3/4] mecg: fix oom flag at THP charge KAMEZAWA Hiroyuki 2011-01-28 3:27 ` KAMEZAWA Hiroyuki 2011-01-28 5:39 ` Daisuke Nishimura 2011-01-28 5:39 ` Daisuke Nishimura 2011-01-28 5:50 ` KAMEZAWA Hiroyuki 2011-01-28 5:50 ` KAMEZAWA Hiroyuki 2011-01-28 8:02 ` Johannes Weiner 2011-01-28 8:02 ` Johannes Weiner 2011-01-28 8:21 ` KAMEZAWA Hiroyuki 2011-01-28 8:21 ` KAMEZAWA Hiroyuki 2011-01-31 7:41 ` Balbir Singh 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 3:28 ` KAMEZAWA Hiroyuki 2011-01-28 8:20 ` Daisuke Nishimura 2011-01-28 8:20 ` Daisuke Nishimura 2011-01-28 8:30 ` KAMEZAWA Hiroyuki 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-29 12:47 ` Balbir Singh 2011-01-30 23:55 ` KAMEZAWA Hiroyuki 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=20110128134902.5845b507.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 \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.