[BUGFIX v2] memcg: fix res_counter_read_u64 lock aware (Was Re:[PATCH] oom: handle overflow in mem_cgroup_out_of_memory()

From: KAMEZAWA Hiroyuki
Date: Wed Jan 26 2011 - 20:49:47 EST

Thank you for advices. This version doesn't use inlined function
and adds no overhead in 64bit.

res_counter_read_u64 is not frequently called in memcontrol.c now.
It's called at user-interface and interaction with other components.
This addition of lock will not add any performance troubles.

res_counter_read_u64 reads u64 value without lock. It's dangerous
in 32bit environment. This patch adds lock.

- handle 32/64 bit in other funciton
- avoid unnecessary inlining.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
kernel/res_counter.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

Index: mmotm-0125/kernel/res_counter.c
--- mmotm-0125.orig/kernel/res_counter.c
+++ mmotm-0125/kernel/res_counter.c
@@ -126,10 +126,24 @@ ssize_t res_counter_read(struct res_coun
pos, buf, s - buf);

+#if BITS_PER_LONG == 32
+u64 res_counter_read_u64(struct res_counter *counter, int member)
+ unsigned long flags;
+ u64 ret;
+ spin_lock_irqsave(&counter->lock, flags);
+ ret = *res_counter_member(counter, member);
+ spin_unlock_irqrestore(&counter->lock, flags);
+ return ret;
u64 res_counter_read_u64(struct res_counter *counter, int member)
return *res_counter_member(counter, member);

int res_counter_memparse_write_strategy(const char *buf,
unsigned long long *res)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/