mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

memcg: avoid use cmpxchg in swap cgroup maintainance

Browse source 
swap_cgroup uses 2bytes data and uses cmpxchg in a new operation.  2byte
cmpxchg/xchg is not available on some archs.  This patch replaces
cmpxchg/xchg with operations under lock.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reported-by: Sachin Sant <sachinp@in.ibm.com> wrote:
Acked-by: Balbir Singh <balbir@in.ibm.com>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
KAMEZAWA Hiroyuki 2010-03-15 00:34:57 -04:00 committed by Linus Torvalds
parent a3d3203e4b
commit e9e58a4ec3
1 changed files with 16 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
mm/page_cgroup.c
View file

@ -284,6 +284,7 @@ static DEFINE_MUTEX(swap_cgroup_mutex);
struct swap_cgroup_ctrl { struct swap_cgroup_ctrl {
struct page **map; struct page **map;
unsigned long length; unsigned long length;
spinlock_t lock;
}; };
struct swap_cgroup_ctrl swap_cgroup_ctrl[MAX_SWAPFILES]; struct swap_cgroup_ctrl swap_cgroup_ctrl[MAX_SWAPFILES];
@ -353,16 +354,22 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
struct swap_cgroup_ctrl *ctrl; struct swap_cgroup_ctrl *ctrl;
struct page *mappage; struct page *mappage;
struct swap_cgroup *sc; struct swap_cgroup *sc;
unsigned long flags;
unsigned short retval;
ctrl = &swap_cgroup_ctrl[type]; ctrl = &swap_cgroup_ctrl[type];
mappage = ctrl->map[idx]; mappage = ctrl->map[idx];
sc = page_address(mappage); sc = page_address(mappage);
sc += pos; sc += pos;
if (cmpxchg(&sc->id, old, new) == old) spin_lock_irqsave(&ctrl->lock, flags);
return old; retval = sc->id;
if (retval == old)
sc->id = new;
else else
return 0; retval = 0;
spin_unlock_irqrestore(&ctrl->lock, flags);
return retval;
} }
/** /**
@ -383,13 +390,17 @@ unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
struct page *mappage; struct page *mappage;
struct swap_cgroup *sc; struct swap_cgroup *sc;
unsigned short old; unsigned short old;
unsigned long flags;
ctrl = &swap_cgroup_ctrl[type]; ctrl = &swap_cgroup_ctrl[type];
mappage = ctrl->map[idx]; mappage = ctrl->map[idx];
sc = page_address(mappage); sc = page_address(mappage);
sc += pos; sc += pos;
old = xchg(&sc->id, id); spin_lock_irqsave(&ctrl->lock, flags);
old = sc->id;
sc->id = id;
spin_unlock_irqrestore(&ctrl->lock, flags);
return old; return old;
} }
@ -441,6 +452,7 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
mutex_lock(&swap_cgroup_mutex); mutex_lock(&swap_cgroup_mutex);
ctrl->length = length; ctrl->length = length;
ctrl->map = array; ctrl->map = array;
spin_lock_init(&ctrl->lock);
if (swap_cgroup_prepare(type)) { if (swap_cgroup_prepare(type)) {
/* memory shortage */ /* memory shortage */
ctrl->map = NULL; ctrl->map = NULL;