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

Commit 6de5a8bf authored by Sha Zhengju's avatar Sha Zhengju Committed by Linus Torvalds
Browse files

memcg: rename RESOURCE_MAX to RES_COUNTER_MAX 



RESOURCE_MAX is far too general name, change it to RES_COUNTER_MAX.

Signed-off-by: default avatarSha Zhengju <handai.szj@taobao.com>
Signed-off-by: default avatarQiang Huang <h.huangqiang@huawei.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Jeff Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34ff8dc0

include/linux/res_counter.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct res_counter { 
	struct res_counter *parent;

};



#define RESOURCE_MAX ULLONG_MAX

#define RES_COUNTER_MAX ULLONG_MAX



/**

 * Helpers to interact with userspace

kernel/res_counter.c

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
void res_counter_init(struct res_counter *counter, struct res_counter *parent)

{

	spin_lock_init(&counter->lock);

	counter->limit = RESOURCE_MAX;

	counter->soft_limit = RESOURCE_MAX;

	counter->limit = RES_COUNTER_MAX;

	counter->soft_limit = RES_COUNTER_MAX;

	counter->parent = parent;

}
@@ -182,12 +182,12 @@ int res_counter_memparse_write_strategy(const char *buf, 
{

	char *end;



	/* return RESOURCE_MAX(unlimited) if "-1" is specified */

	/* return RES_COUNTER_MAX(unlimited) if "-1" is specified */

	if (*buf == '-') {

		*res = simple_strtoull(buf + 1, &end, 10);

		if (*res != 1 || *end != '\0')

			return -EINVAL;

		*res = RESOURCE_MAX;

		*res = RES_COUNTER_MAX;

		return 0;

	}

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -4967,7 +4967,7 @@ static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val) 
	 */

	mutex_lock(&memcg_create_mutex);

	mutex_lock(&set_limit_mutex);

	if (!memcg->kmem_account_flags && val != RESOURCE_MAX) {

	if (!memcg->kmem_account_flags && val != RES_COUNTER_MAX) {

		if (cgroup_task_count(css->cgroup) || memcg_has_children(memcg)) {

			ret = -EBUSY;

			goto out;
@@ -4977,7 +4977,7 @@ static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val) 


		ret = memcg_update_cache_sizes(memcg);

		if (ret) {

			res_counter_set_limit(&memcg->kmem, RESOURCE_MAX);

			res_counter_set_limit(&memcg->kmem, RES_COUNTER_MAX);

			goto out;

		}

		static_key_slow_inc(&memcg_kmem_enabled_key);

net/ipv4/tcp_memcontrol.c

+5 −5
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val) 
	if (!cg_proto)

		return -EINVAL;



	if (val > RESOURCE_MAX)

		val = RESOURCE_MAX;

	if (val > RES_COUNTER_MAX)

		val = RES_COUNTER_MAX;



	tcp = tcp_from_cgproto(cg_proto);
@@ -101,9 +101,9 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val) 
		tcp->tcp_prot_mem[i] = min_t(long, val >> PAGE_SHIFT,

					     net->ipv4.sysctl_tcp_mem[i]);



	if (val == RESOURCE_MAX)

	if (val == RES_COUNTER_MAX)

		clear_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);

	else if (val != RESOURCE_MAX) {

	else if (val != RES_COUNTER_MAX) {

		/*

		 * The active bit needs to be written after the static_key

		 * update. This is what guarantees that the socket activation
@@ -187,7 +187,7 @@ static u64 tcp_cgroup_read(struct cgroup_subsys_state *css, struct cftype *cft) 


	switch (cft->private) {

	case RES_LIMIT:

		val = tcp_read_stat(memcg, RES_LIMIT, RESOURCE_MAX);

		val = tcp_read_stat(memcg, RES_LIMIT, RES_COUNTER_MAX);

		break;

	case RES_USAGE:

		val = tcp_read_usage(memcg);