android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memcg: move page-freeing code out of lock

Browse Source 
Move page-freeing code out of swap_cgroup_mutex in the hope that it could
reduce few of theoretical contentions between swapons and/or swapoffs.

This is just a cleanup, no functional changes.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2011-05-26 16:25:31 -07:00 committed by Linus Torvalds
parent 33278f7f0a
commit 6a5b18d2bd
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mm/page_cgroup.c
View File

@ -492,8 +492,8 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
/* memory shortage */ /* memory shortage */
ctrl->map = NULL; ctrl->map = NULL;
ctrl->length = 0; ctrl->length = 0;
vfree(array);
mutex_unlock(&swap_cgroup_mutex); mutex_unlock(&swap_cgroup_mutex);
vfree(array);
goto nomem; goto nomem;
} }
mutex_unlock(&swap_cgroup_mutex); mutex_unlock(&swap_cgroup_mutex);
@ -508,7 +508,8 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
void swap_cgroup_swapoff(int type) void swap_cgroup_swapoff(int type)
{ {
int i; struct page **map;
unsigned long i, length;
struct swap_cgroup_ctrl *ctrl; struct swap_cgroup_ctrl *ctrl;
if (!do_swap_account) if (!do_swap_account)
@ -516,17 +517,20 @@ void swap_cgroup_swapoff(int type)
mutex_lock(&swap_cgroup_mutex); mutex_lock(&swap_cgroup_mutex);
ctrl = &swap_cgroup_ctrl[type]; ctrl = &swap_cgroup_ctrl[type];
if (ctrl->map) { map = ctrl->map;
for (i = 0; i < ctrl->length; i++) { length = ctrl->length;
struct page *page = ctrl->map[i]; ctrl->map = NULL;
ctrl->length = 0;
mutex_unlock(&swap_cgroup_mutex);
if (map) {
for (i = 0; i < length; i++) {
struct page *page = map[i];
if (page) if (page)
__free_page(page); __free_page(page);
} }
vfree(ctrl->map); vfree(map);
ctrl->map = NULL;
ctrl->length = 0;
} }
mutex_unlock(&swap_cgroup_mutex);
} }
#endif #endif