The patch titled
Memory rlimit enhance mm_owner_changed callback to deal with exited owner
has been added to the -mm tree. Its filename is
memrlimit-add-memrlimit-controller-accounting-and-control-memory-rlimit-enhance-mm_owner_changed-callback-to-deal-with-exited-owner.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Memory rlimit enhance mm_owner_changed callback to deal with exited owner
From: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
mm_owner_changed callback can also be called with new task set to NULL.
(race between try_to_unuse() and mm->owner exiting). Surprisingly the
order of cgroup arguments being passed was incorrect (proves that we did
not run into mm_owner_changed callback at all).
Signed-off-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Sudhir Kumar <skumar@xxxxxxxxxxxxxxxxxx>
Cc: YAMAMOTO Takashi <yamamoto@xxxxxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Pavel Emelianov <xemul@xxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memrlimitcgroup.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff -puN mm/memrlimitcgroup.c~memrlimit-add-memrlimit-controller-accounting-and-control-memory-rlimit-enhance-mm_owner_changed-callback-to-deal-with-exited-owner mm/memrlimitcgroup.c
--- a/mm/memrlimitcgroup.c~memrlimit-add-memrlimit-controller-accounting-and-control-memory-rlimit-enhance-mm_owner_changed-callback-to-deal-with-exited-owner
+++ a/mm/memrlimitcgroup.c
@@ -73,6 +73,12 @@ void memrlimit_cgroup_uncharge_as(struct
{
struct memrlimit_cgroup *memrcg;
+ /*
+ * Uncharge happened as a part of the mm_owner_changed callback
+ */
+ if (!mm->owner)
+ return;
+
memrcg = memrlimit_cgroup_from_task(mm->owner);
res_counter_uncharge(&memrcg->as_res, (nr_pages << PAGE_SHIFT));
}
@@ -193,8 +199,8 @@ out:
* This callback is called with mmap_sem held
*/
static void memrlimit_cgroup_mm_owner_changed(struct cgroup_subsys *ss,
- struct cgroup *cgrp,
struct cgroup *old_cgrp,
+ struct cgroup *cgrp,
struct task_struct *p)
{
struct memrlimit_cgroup *memrcg, *old_memrcg;
@@ -204,7 +210,12 @@ static void memrlimit_cgroup_mm_owner_ch
memrcg = memrlimit_cgroup_from_cgrp(cgrp);
old_memrcg = memrlimit_cgroup_from_cgrp(old_cgrp);
- if (res_counter_charge(&memrcg->as_res, (mm->total_vm << PAGE_SHIFT)))
+ /*
+ * If we don't have a new cgroup, we just uncharge from the old one.
+ * It means that the task is going away
+ */
+ if (memrcg &&
+ res_counter_charge(&memrcg->as_res, (mm->total_vm << PAGE_SHIFT)))
goto out;
res_counter_uncharge(&old_memrcg->as_res, (mm->total_vm << PAGE_SHIFT));
out:
_
Patches currently in -mm which might be from balbir@xxxxxxxxxxxxxxxxxx are
memcg-fix-oops-in-mem_cgroup_shrink_usage.patch
linux-next.patch
memrlimit-add-memrlimit-controller-documentation.patch
memrlimit-setup-the-memrlimit-controller.patch
memrlimit-cgroup-mm-owner-callback-changes-to-add-task-info.patch
memrlimit-add-memrlimit-controller-accounting-and-control.patch
memrlimit-add-memrlimit-controller-accounting-and-control-memory-rlimit-fix-crash-on-fork.patch
memrlimit-add-memrlimit-controller-accounting-and-control-memory-rlimit-enhance-mm_owner_changed-callback-to-deal-with-exited-owner.patch
memrlimit-improve-error-handling.patch
memrlimit-improve-error-handling-update.patch
memrlimit-handle-attach_task-failure-add-can_attach-callback.patch
mm-owner-fix-race-between-swap-and-exit.patch
gcov-architecture-specific-compile-flag-adjustments-x86_64-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
