Messages in this thread Patch in this message | | | Date | Tue, 4 Nov 2008 18:13:43 +0900 | From | KAMEZAWA Hiroyuki <> | Subject | Re: [RFC][PATCH 3/5] memcg : mem+swap controller kconfig |
| |
On Tue, 4 Nov 2008 17:54:06 +0900 Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote:
> > +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > > +static void __init enable_swap_cgroup(void) > > +{ > > + if (really_do_swap_account) > > + do_swap_account = 1; > > +} > I think check for !mem_cgroup_subsys.disabled is also needed here. >
Hmm, mem_cgroup_create() is called even when disabled ? .......seems so.
Ok, will fix. thank you for checking it.
Regards, -Kame
> > Thanks, > Daisuke Nishimura. > > > +#else > > +static void __init enable_swap_cgroup(void) > > +{ > > +} > > +#endif > > + > > static struct cgroup_subsys_state * > > mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont) > > { > > @@ -1377,6 +1398,7 @@ mem_cgroup_create(struct cgroup_subsys * > > > > if (unlikely((cont->parent) == NULL)) { > > mem = &init_mem_cgroup; > > + enable_swap_cgroup(); > > } else { > > mem = mem_cgroup_alloc(); > > if (!mem) > > @@ -1460,3 +1482,13 @@ struct cgroup_subsys mem_cgroup_subsys = > > .attach = mem_cgroup_move_task, > > .early_init = 0, > > }; > > + > > +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > > + > > +static int __init disable_swap_account(char *s) > > +{ > > + really_do_swap_account = 0; > > + return 1; > > +} > > +__setup("noswapaccount", disable_swap_account); > > +#endif > > Index: mmotm-2.6.28-rc2+/Documentation/kernel-parameters.txt > > =================================================================== > > --- mmotm-2.6.28-rc2+.orig/Documentation/kernel-parameters.txt > > +++ mmotm-2.6.28-rc2+/Documentation/kernel-parameters.txt > > @@ -1543,6 +1543,9 @@ and is between 256 and 4096 characters. > > > > nosoftlockup [KNL] Disable the soft-lockup detector. > > > > + noswapaccount [KNL] Disable accounting of swap in memory resource > > + controller. (See Documentation/controllers/memory.txt) > > + > > nosync [HW,M68K] Disables sync negotiation for all devices. > > > > notsc [BUGS=X86-32] Disable Time Stamp Counter > > Index: mmotm-2.6.28-rc2+/include/linux/memcontrol.h > > =================================================================== > > --- mmotm-2.6.28-rc2+.orig/include/linux/memcontrol.h > > +++ mmotm-2.6.28-rc2+/include/linux/memcontrol.h > > @@ -77,6 +77,9 @@ extern void mem_cgroup_record_reclaim_pr > > extern long mem_cgroup_calc_reclaim(struct mem_cgroup *mem, struct zone *zone, > > int priority, enum lru_list lru); > > > > +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > > +extern int do_swap_account; > > +#endif > > > > #else /* CONFIG_CGROUP_MEM_RES_CTLR */ > > struct mem_cgroup; > > >
| |