The patch titled
memrlimit-improve-error-handling update
has been removed from the -mm tree. Its filename was
memrlimit-improve-error-handling-update.patch
This patch was dropped because it was folded into memrlimit-add-memrlimit-controller-accounting-and-control.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memrlimit-improve-error-handling update
From: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
This is a newer version of the patch, could you please drop the older one
and pick this. Aplogies for the inconvenience.
Changelog v2->v1
1. Address some of Hugh's comments. Reuse error (don't add new ret variable)
TODO: Merge ret & ~PAGE_MASK and vm_expanded.
memrlimit cgroup does not handle error cases after may_expand_vm(). This
BUG was reported by Kamezawa, with the test case below to reproduce it
[root@iridium kamezawa]# cat /opt/cgroup/test/memrlimit.usage_in_bytes
71921664
[root@iridium kamezawa]# ulimit -s 3
[root@iridium kamezawa]# ls
Killed
[root@iridium kamezawa]# ls
Killed
[root@iridium kamezawa]# ls
Killed
[root@iridium kamezawa]# ls
Killed
[root@iridium kamezawa]# ls
Killed
[root@iridium kamezawa]# ulimit -s unlimited
[root@iridium kamezawa]# cat /opt/cgroup/test/memrlimit.usage_in_bytes
72368128
[root@iridium kamezawa]#
This patch adds better handling support to fix the reported problem.
Reported-by: [kamezawa.hiroyu@xxxxxxxxxxxxxx]
Signed-off-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxx>
Cc: Sudhir Kumar <skumar@xxxxxxxxxxxxxxxxxx>
Cc: YAMAMOTO Takashi <yamamoto@xxxxxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 6 +++---
mm/mremap.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN mm/mmap.c~memrlimit-improve-error-handling-update mm/mmap.c
--- a/mm/mmap.c~memrlimit-improve-error-handling-update
+++ a/mm/mmap.c
@@ -1996,7 +1996,6 @@ unsigned long do_brk(unsigned long addr,
struct rb_node ** rb_link, * rb_parent;
pgoff_t pgoff = addr >> PAGE_SHIFT;
int error;
- int ret = -ENOMEM;
len = PAGE_ALIGN(len);
if (!len)
@@ -2048,9 +2047,10 @@ unsigned long do_brk(unsigned long addr,
goto munmap_back;
}
+ error = -ENOMEM;
/* Check against address space limits *after* clearing old maps... */
if (!may_expand_vm(mm, len >> PAGE_SHIFT))
- return ret;
+ return error;
if (mm->map_count > sysctl_max_map_count)
goto undo_charge;
@@ -2089,7 +2089,7 @@ out:
return addr;
undo_charge:
memrlimit_cgroup_uncharge_as(mm, len >> PAGE_SHIFT);
- return ret;
+ return error;
}
EXPORT_SYMBOL(do_brk);
diff -puN mm/mremap.c~memrlimit-improve-error-handling-update mm/mremap.c
--- a/mm/mremap.c~memrlimit-improve-error-handling-update
+++ a/mm/mremap.c
@@ -427,7 +427,7 @@ out:
if (ret & ~PAGE_MASK)
vm_unacct_memory(charged);
out_nc:
- if (vm_expanded)
+ if ((ret & ~PAGE_MASK) && vm_expanded)
memrlimit_cgroup_uncharge_as(mm,
(new_len - old_len) >> PAGE_SHIFT);
return ret;
_
Patches currently in -mm which might be from balbir@xxxxxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
memrlimit-add-memrlimit-controller-documentation.patch
memrlimit-setup-the-memrlimit-controller.patch
memrlimit-add-memrlimit-controller-accounting-and-control.patch
memrlimit-improve-error-handling-update.patch
memrlimit-handle-attach_task-failure-add-can_attach-callback.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
