Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cfd14ad authored by Glauber Costa's avatar Glauber Costa Committed by David S. Miller
Browse files

cgroup: make sure memcg margin is 0 when over limit 



For the memcg sock code, we'll need to register allocations
that are temporarily over limit. Let's make sure that margin
is 0 in this case.

I am keeping this as a separate patch, so that if any weirdness
interaction appears in the future, we can now exactly what caused
it.

Suggested by Johannes Weiner

Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
CC: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
CC: Johannes Weiner <hannes@cmpxchg.org>
CC: Michal Hocko <mhocko@suse.cz>
CC: Tejun Heo <tj@kernel.org>
CC: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 376be5ff

include/linux/res_counter.h

+4 −1
Original line number Diff line number Diff line
@@ -142,7 +142,10 @@ static inline unsigned long long res_counter_margin(struct res_counter *cnt) 
	unsigned long flags;



	spin_lock_irqsave(&cnt->lock, flags);

	if (cnt->limit > cnt->usage)

		margin = cnt->limit - cnt->usage;

	else

		margin = 0;

	spin_unlock_irqrestore(&cnt->lock, flags);

	return margin;

}