Add an owner to the mm_struct (v3)
Subsystems (6)
RFC 1/1 Add an owner to the mm_struct (v3)
This patch removes the mem_cgroup member from mm_struct and instead adds an owner. This approach was suggested by Paul Menage. The advantage of this approach is that, once the mm->owner is known, using the subsystem id, the cgroup can be determined. It also allows several control groups that are virtually grouped by mm_struct, to exist independent of the memory controller i.e., without adding mem_cgroup's for each controller, to mm_struct.
A new config option CONFIG_MM_OWNER is added and the memory resource controller selects this config option.
NOTE: This patch was developed on top of 2.6.25-rc5-mm1 and is applied on top of the memory-controller-move-to-own-slab patch (which is already present in the Andrew's patchset).
I am indebted to Paul Menage for the several reviews of this patchset and helping me make it lighter and simpler.
This patch was tested on a powerpc box, by running a task under the memory resource controller and moving it across groups at a constant interval.
---
fs/exec.c | 1 include/linux/init_task.h | 2 - include/linux/memcontrol.h | 17 ++--------- include/linux/mm_types.h | 5 ++- include/linux/sched.h | 24 ++++++++++++++++ init/Kconfig | 15 ++++++++++ kernel/exit.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ kernel/fork.c | 11 +++++-- mm/memcontrol.c | 21 ++------------ 9 files changed, 124 insertions(+), 37 deletions(-)
include/linux/mm_types.h renamed from include/linux/mm_types.h~memory-controller-add-mm-owner +3 -2
@@ -227,8 +227,9 @@ struct mm_struct {/* aio bits */ rwlock_t ioctx_list_lock;struct kioctx *ioctx_list; -#ifdef CONFIG_CGROUP_MEM_RES_CTLR -struct mem_cgroup *mem_cgroup; +#ifdef CONFIG_MM_OWNER +struct task_struct *owner;/* The thread group leader that */ +/* owns the mm_struct. */ #endif #ifdef CONFIG_PROC_FS
kernel/fork.c renamed from kernel/fork.c~memory-controller-add-mm-owner +8 -3
@@ -358,14 +358,13 @@ static struct mm_struct * mm_init(struct mm->ioctx_list =NULL ; mm->free_area_cache =TASK_UNMAPPED_BASE ; mm->cached_hole_size = ~0UL ; -mm_init_cgroup (mm, p); +mm_init_owner (mm, p);if (likely (!mm_alloc_pgd (mm))) { mm->def_flags =0 ;return mm; } -mm_free_cgroup (mm);free_mm (mm);return NULL ; }
@@ -394,7 +393,6 @@ void __mmdrop(struct mm_struct *mm) {BUG_ON (mm == &init_mm);mm_free_pgd (mm); -mm_free_cgroup (mm);destroy_context (mm);free_mm (mm); }
@@ -995,6 +993,13 @@ static void rt_mutex_init_task(struct ta#endif } +#ifdef CONFIG_MM_OWNER +void mm_init_owner (struct mm_struct *mm,struct task_struct *p) +{ + mm->owner = p; +} +#endif /* CONFIG_MM_OWNER */ +/* * This creates a new process as a copy of the old one, * but does not actually start it yet.
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memory-controller-add-mm-owner +4 -13
@@ -27,9 +27,6 @@ struct mm_struct;#ifdef CONFIG_CGROUP_MEM_RES_CTLR -extern void mm_init_cgroup (struct mm_struct *mm,struct task_struct *p); -extern void mm_free_cgroup (struct mm_struct *mm); -#define page_reset_bad_cgroup (page) ((page)->page_cgroup = 0)extern struct page_cgroup *page_get_page_cgroup (struct page *page);
@@ -48,8 +45,10 @@ extern unsigned long mem_cgroup_isolate_extern void mem_cgroup_out_of_memory (struct mem_cgroup *mem,gfp_t gfp_mask);int task_in_mem_cgroup (struct task_struct *task,const struct mem_cgroup *mem); +extern struct mem_cgroup *mem_cgroup_from_task (struct task_struct *p); +#define mm_match_cgroup (mm, cgroup) \ - ((cgroup) == rcu_dereference((mm)->mem_cgroup)) + ((cgroup) == mem_cgroup_from_task((mm)->owner))extern int mem_cgroup_prepare_migration (struct page *page);extern void mem_cgroup_end_migration (struct page *page);
@@ -73,15 +72,6 @@ extern long mem_cgroup_calc_reclaim_inac struct zone *zone, int priority);#else /* CONFIG_CGROUP_MEM_RES_CTLR */ -static inline void mm_init_cgroup (struct mm_struct *mm, -struct task_struct *p) -{ -} - -static inline void mm_free_cgroup (struct mm_struct *mm) -{ -} -static inline void page_reset_bad_cgroup (struct page *page) { }
@@ -172,6 +162,7 @@ static inline long mem_cgroup_calc_recla {return 0 ; } +#endif /* CONFIG_CGROUP_MEM_CONT */ #endif /* _LINUX_MEMCONTROL_H */
mm/memcontrol.c renamed from mm/memcontrol.c~memory-controller-add-mm-owner +3 -18
@@ -238,26 +238,12 @@ static struct mem_cgroup *mem_cgroup_fro css); } -static struct mem_cgroup *mem_cgroup_from_task (struct task_struct *p) +struct mem_cgroup *mem_cgroup_from_task (struct task_struct *p) {return container_of (task_subsys_state (p, mem_cgroup_subsys_id), struct mem_cgroup, css); } -void mm_init_cgroup (struct mm_struct *mm,struct task_struct *p) -{ -struct mem_cgroup *mem; - - mem =mem_cgroup_from_task (p); -css_get (&mem->css); - mm->mem_cgroup = mem; -} - -void mm_free_cgroup (struct mm_struct *mm) -{ -css_put (&mm->mem_cgroup->css); -} -static inline int page_cgroup_locked (struct page *page) {return bit_spin_is_locked (PAGE_CGROUP_LOCK_BIT , &page->page_cgroup);
@@ -478,6 +464,7 @@ unsigned long mem_cgroup_isolate_pages(uint zid =zone_idx (z);struct mem_cgroup_per_zone *mz; +BUG_ON (!mem_cont); mz =mem_cgroup_zoneinfo (mem_cont, nid, zid);if (active) src = &mz->active_list;
@@ -576,7 +563,7 @@ retry: mm = &init_mm;rcu_read_lock (); - mem =rcu_dereference (mm->mem_cgroup); + mem =mem_cgroup_from_task (rcu_dereference (mm->owner));/* * For every charge from the cgroup, increment reference count */
@@ -990,7 +977,6 @@ mem_cgroup_create(struct cgroup_subsys *if (unlikely ((cont->parent) ==NULL )) { mem = &init_mem_cgroup; - init_mm.mem_cgroup = mem; page_cgroup_cache =KMEM_CACHE (page_cgroup,SLAB_PANIC ); }else mem =kzalloc (sizeof (struct mem_cgroup ),GFP_KERNEL );
@@ -1072,7 +1058,6 @@ static void mem_cgroup_move_task(struct goto out;css_get (&mem->css); -rcu_assign_pointer (mm->mem_cgroup, mem);css_put (&old_mem->css); out:
include/linux/sched.h renamed from include/linux/sched.h~memory-controller-add-mm-owner +24 -0
@@ -2130,6 +2130,30 @@ static inline void migration_init(void)#define TASK_STATE_TO_CHAR_STR "RSDTtZX" +#ifdef CONFIG_MM_OWNER +extern void mm_update_next_owner (struct mm_struct *mm); +extern void mm_fork_init_owner (struct task_struct *p); +extern void mm_init_owner (struct mm_struct *mm,struct task_struct *p); +extern void mm_free_owner (struct mm_struct *mm); +#else +static inline void +mm_update_next_owner (struct mm_struct *mm,struct task_struct *p) +{ +} + +static inline void mm_fork_init_owner (struct task_struct *p) +{ +} + +static inline void mm_init_owner (struct mm_struct *mm,struct task_struct *p) +{ +} + +static inline void mm_free_owner (struct mm_struct *mm) +{ +} +#endif /* CONFIG_MM_OWNER */ +#endif /* __KERNEL__ */ #endif
kernel/exit.c renamed from kernel/exit.c~memory-controller-add-mm-owner +65 -0
77 lines not on this page · raw message
init/Kconfig renamed from init/Kconfig~memory-controller-add-mm-owner +15 -0
@@ -364,9 +364,21 @@ config RESOURCE_COUNTERS infrastructure that works with cgroups depends on CGROUPS +config MM_OWNER + bool "Enable ownership of mm structure" + help + This option enables mm_struct's to have an owner. The advantage + of this approach is that it allows for several independent memory + based cgorup controllers to co-exist independently without too + much space overhead + + This feature adds fork/exit overhead. So enable this only if + you need resource controllers + config CGROUP_MEM_RES_CTLR bool "Memory Resource Controller for Control Groups" depends on CGROUPS && RESOURCE_COUNTERS + select MM_OWNER help Provides a memory resource controller that manages both page cache and RSS memory.
@@ -379,6 +391,9 @@ config CGROUP_MEM_RES_CTLR Only enable when you're ok with these trade offs and really sure you need the memory resource controller. + This config option also selects MM_OWNER config option, which + could in turn add some fork/exit overhead. + config SYSFS_DEPRECATED bool
include/linux/init_task.h renamed from include/linux/init_task.h~memory-controller-add-mm-owner +1 -1
@@ -57,6 +57,7 @@ .page_table_lock = __SPIN_LOCK_UNLOCKED(name.page_table_lock), \ .mmlist = LIST_HEAD_INIT(name.mmlist), \ .cpu_vm_mask = CPU_MASK_ALL, \ + .owner = &init_task, \ }#define INIT_SIGNALS (sig) { \
@@ -199,7 +200,6 @@ extern struct group_info init_groups; INIT_LOCKDEP \ } -#define INIT_CPU_TIMERS (cpu_timers) \ { \ LIST_HEAD_INIT(cpu_timers[0]), \
fs/exec.c renamed from fs/exec.c~memory-controller-add-mm-owner +1 -0
@@ -735,6 +735,7 @@ static int exec_mmap(struct mm_struct *m tsk->active_mm = mm;activate_mm (active_mm, mm);task_unlock (tsk); +mm_update_next_owner (mm);arch_pick_mmap_layout (mm);if (old_mm) {up_read (&old_mm->mmap_sem);
_
Signature · 10 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 15 lines
This patch removes the
mem_cgroupmember frommm_structand instead adds an owner. This approach was suggested by Paul Menage. The advantage of this approach is that, once themm->owneris known, using the subsystem id, the cgroup can be determined. It also allows several control groups that are virtually grouped bymm_struct, to exist independent of the memory controller i.e., without adding mem_cgroup's for each controller, tomm_struct.A new config option
CONFIG_MM_OWNERis added and the memory resource controller selects this config option.NOTE: This patch was developed on top of 2.6.25-rc5-mm1 and is applied on top of the memory-controller-move-to-own-slab patch (which is already present in the Andrew's patchset).
Quoted 8 lines
I am indebted to Paul Menage for the several reviews of this patchset and helping me make it lighter and simpler.
This patch was tested on a powerpc box, by running a task under the memory resource controller and moving it across groups at a constant interval.
Signed-off-by Balbir Singh <[email protected]>---
changing mm->owner without notifying controllers makes it difficult to use. can you provide a notification mechanism?
YAMAMOTO Takashi
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 4 lines · YAMAMOTO Takashi
changing
mm->ownerwithout notifying controllers makes it difficult to use. can you provide a notification mechanism?
Yes, I think that call will need to be in the task_lock() critical section in which we update mm->owner.
Right now I think the only user that needs to be notified at that point is Balbir's virtual address limits controller.
Paul
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 7 lines
Quoted 4 lines · YAMAMOTO Takashi
changing
mm->ownerwithout notifying controllers makes it difficult to use. can you provide a notification mechanism?
Quoted 7 lines
Yes, I think that call will need to be in the
task_lock()critical section in which we updatemm->owner.Right now I think the only user that needs to be notified at that point is Balbir's virtual address limits controller.
Paul
i have some code for which i might want to use mm->owner.
it does somewhat complicated things like acquiring mm_sem and traversing ptes in its ->attach hook. (if you want to read the code, search "Subject: [RFC][PATCH] another swap controller for cgroup" in ML archive.)
probably i don't need to use mm->owner, but it's better if mm->owner can handle more cases anyway.
YAMAMOTO Takashi
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 18 lines · YAMAMOTO Takashi
Quoted 18 lines
This patch removes the
mem_cgroupmember frommm_structand instead adds an owner. This approach was suggested by Paul Menage. The advantage of this approach is that, once themm->owneris known, using the subsystem id, the cgroup can be determined. It also allows several control groups that are virtually grouped bymm_struct, to exist independent of the memory controller i.e., without adding mem_cgroup's for each controller, tomm_struct.A new config option
CONFIG_MM_OWNERis added and the memory resource controller selects this config option.NOTE: This patch was developed on top of 2.6.25-rc5-mm1 and is applied on top of the memory-controller-move-to-own-slab patch (which is already present in the Andrew's patchset).
I am indebted to Paul Menage for the several reviews of this patchset and helping me make it lighter and simpler.
Quoted 8 lines
Quoted 5 lines
This patch was tested on a powerpc box, by running a task under the memory resource controller and moving it across groups at a constant interval.
Signed-off-by Balbir Singh <[email protected]>---
changing
mm->ownerwithout notifying controllers makes it difficult to use. can you provide a notification mechanism?
But mm->owner is just a way to get to the correct cgroup and that does not change when mm->owner changes. Do we really need this notification? For the virtual memory controller, move_task() is sufficient, not sure why mm->owner is required.
Signature · 4 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL
Quoted 6 lines · Balbir Singh
-static struct
mem_cgroup*mem_cgroup_from_task(structtask_struct*p) +structmem_cgroup*mem_cgroup_from_task(structtask_struct*p)
{
return container_of(task_subsys_state(p,mem_cgroup_subsys_id),
structmem_cgroup, css);
}
This should probably be inlined in the header file if it's needed outside this file.
Quoted 3 lines
+static inline void
mm_fork_init_owner(struct task_struct *p)+{
+}
I think this is stale.
Quoted 9 lines
+
+voidmm_update_next_owner(struct mm_struct *mm)
+{
+ structtask_struct*c, *g, *p = current;
+
+ /*
+ * This routine should not be called forinit_task
+ */
+BUG_ON(p == p->parent);
I think (as you mentioned earlier) that we need an RCU critical section in this function, in order for the tasklist traversal to be safe.
Maybe also BUG_ON(p != mm->owner) ?
Quoted 2 lines
+
list_for_each_entry(c, &p->children, sibling){
+ if (c->mm&& (c->mm== mm))
Since mm != NULL, no need to test for c->mm since if it's NULL then c->mm != mm
Quoted 8 lines
+assign_new_owner:
+ BUG_ON(c == p); + task_lock(c); + if (c->mm != mm) {+
task_unlock(c);
+ goto retry;
+ }
+mm->owner= c;
Here we'll want to call vm_cgroup_update_mm_owner(), to adjust the accounting. (Or if in future we end up with more than a couple of subsystems that want notification at this time, we'll want to call cgroup_update_mm_owner() and have it call any interested subsystems.
Paul
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 11 lines · Paul Menage
Quoted 6 lines · Balbir Singh
-static struct
mem_cgroup*mem_cgroup_from_task(structtask_struct*p) +structmem_cgroup*mem_cgroup_from_task(structtask_struct*p)
{
return container_of(task_subsys_state(p,mem_cgroup_subsys_id),
structmem_cgroup, css);
}This should probably be inlined in the header file if it's needed outside this file.
I thought about it, but that also means we need to export struct mem_cgroup into the header file
Quoted 6 lines
Quoted 3 lines
+static inline void
mm_fork_init_owner(struct task_struct *p)+{
+}I think this is stale.
Yes, it is stale now :)
Quoted 10 lines
Quoted 9 lines
+
+voidmm_update_next_owner(struct mm_struct *mm)
+{
+ structtask_struct*c, *g, *p = current;
+
+ /*
+ * This routine should not be called forinit_task
+ */
+BUG_ON(p == p->parent);
Quoted 6 lines
I think (as you mentioned earlier) that we need an RCU critical section in this function, in order for the tasklist traversal to be safe.
Maybe also
BUG_ON(p != mm->owner)?
Yes
Quoted 5 lines
Quoted 2 lines
+
list_for_each_entry(c, &p->children, sibling){
+ if (c->mm&& (c->mm== mm))Since mm != NULL, no need to test for
c->mmsince if it's NULL thenc->mm!= mm
OK
Quoted 9 lines
Quoted 8 lines
+assign_new_owner:
+ BUG_ON(c == p); + task_lock(c); + if (c->mm != mm) {+
task_unlock(c);
+ goto retry;
+ }
+mm->owner= c;
Quoted 5 lines
Here we'll want to call
vm_cgroup_update_mm_owner(), to adjust the accounting. (Or if in future we end up with more than a couple of subsystems that want notification at this time, we'll want to callcgroup_update_mm_owner()and have it call any interested subsystems.
I don't think we need to adjust accounting, since only mm->owner is changing and not the cgroup to which the task/mm belongs. Do we really need to notify? I don't want to do any notifications under task_lock().
Quoted 1 line
Paul
Signature · 4 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL
Quoted 9 lines · Balbir Singh
Quoted 5 lines
Here we'll want to call
vm_cgroup_update_mm_owner(), to adjust the accounting. (Or if in future we end up with more than a couple of subsystems that want notification at this time, we'll want to callcgroup_update_mm_owner()and have it call any interested subsystems.I don't think we need to adjust accounting, since only
mm->owneris changing and not the cgroup to which the task/mm belongs. Do we really need to notify? I don't want to do any notifications undertask_lock().
It's possible but unlikely that the new owner is in a different cgroup.
Paul
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 8 lines · Paul Menage
Quoted 6 lines · Balbir Singh
Quoted 5 lines
Here we'll want to call
vm_cgroup_update_mm_owner(), to adjust the accounting. (Or if in future we end up with more than a couple of subsystems that want notification at this time, we'll want to callcgroup_update_mm_owner()and have it call any interested subsystems.
Quoted 5 lines
Quoted 3 lines
I don't think we need to adjust accounting, since only
mm->owneris changing and not the cgroup to which the task/mm belongs. Do we really need to notify? I don't want to do any notifications undertask_lock().It's possible but unlikely that the new owner is in a different cgroup.
Hmmm... that can never happen with thread groups, since mm->owner is p->group_leader and that never exits unless all threads are gone (it can explicitly change groups though). Without thread groups, the new owner can belong to a different cgroup, so we might need notification.
Signature · 4 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL
Quoted 12 lines · Balbir Singh
Quoted 11 lines · Paul Menage
Quoted 9 lines · Balbir Singh
Quoted 5 lines
Here we'll want to call
vm_cgroup_update_mm_owner(), to adjust the accounting. (Or if in future we end up with more than a couple of subsystems that want notification at this time, we'll want to callcgroup_update_mm_owner()and have it call any interested subsystems.I don't think we need to adjust accounting, since only
mm->owneris changing and not the cgroup to which the task/mm belongs. Do we really need to notify? I don't want to do any notifications undertask_lock().
Quoted 8 lines
Quoted 1 line
It's possible but unlikely that the new owner is in a different cgroup.
Hmmm... that can never happen with thread groups, since
mm->ownerisp->group_leaderand that never exits unless all threads are gone (it can explicitly change groups though). Without thread groups, the new owner can belong to a different cgroup, so we might need notification.
Thinking out aloud
If mm->owner changes and belongs to a different cgroup, we have a whole new problem. We need to determine all tasks that share the mm and belong to a particular cgroup, which changed since the new owner belongs to a different cgroup and then update the charge.
Signature · 10 lines
Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>