From: Andrey Ryabinin <aryabinin@virtuozzo.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Shakeel Butt <shakeelb@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>
Subject: [PATCH v3 2/2] mm/memcg: Consolidate mem_cgroup_resize_[memsw]_limit() functions.
Date: Tue, 9 Jan 2018 19:58:15 +0300 [thread overview]
Message-ID: <20180109165815.8329-2-aryabinin@virtuozzo.com> (raw)
In-Reply-To: <20180109165815.8329-1-aryabinin@virtuozzo.com>
mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() are almost
identical functions. Instead of having two of them, we could pass an
additional argument to mem_cgroup_resize_limit() and by using it,
consolidate all the code in a single function.
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
mm/memcontrol.c | 61 +++++++++++++--------------------------------------------
1 file changed, 14 insertions(+), 47 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 0d26db9a665d..f6253c80a5c8 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2445,50 +2445,17 @@ static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
static DEFINE_MUTEX(memcg_limit_mutex);
-static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
- unsigned long limit)
+static bool invalid_mem_limit(struct mem_cgroup *memcg, bool memsw,
+ unsigned long limit)
{
- unsigned long usage;
- bool enlarge = false;
- int ret;
-
- do {
- if (signal_pending(current)) {
- ret = -EINTR;
- break;
- }
-
- mutex_lock(&memcg_limit_mutex);
- if (limit > memcg->memsw.limit) {
- mutex_unlock(&memcg_limit_mutex);
- ret = -EINVAL;
- break;
- }
- if (limit > memcg->memory.limit)
- enlarge = true;
- ret = page_counter_limit(&memcg->memory, limit);
- mutex_unlock(&memcg_limit_mutex);
-
- if (!ret)
- break;
-
- usage = page_counter_read(&memcg->memory);
- if (!try_to_free_mem_cgroup_pages(memcg, usage - limit,
- GFP_KERNEL, true)) {
- ret = -EBUSY;
- break;
- }
- } while (true);
-
- if (!ret && enlarge)
- memcg_oom_recover(memcg);
-
- return ret;
+ return (!memsw && limit > memcg->memsw.limit) ||
+ (memsw && limit < memcg->memory.limit);
}
-static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
- unsigned long limit)
+static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, bool memsw,
+ unsigned long limit)
{
+ struct page_counter *counter = memsw ? &memcg->memsw : &memcg->memory;
unsigned long usage;
bool enlarge = false;
int ret;
@@ -2500,22 +2467,22 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
}
mutex_lock(&memcg_limit_mutex);
- if (limit < memcg->memory.limit) {
+ if (invalid_mem_limit(memcg, memsw, limit)) {
mutex_unlock(&memcg_limit_mutex);
ret = -EINVAL;
break;
}
- if (limit > memcg->memsw.limit)
+ if (limit > counter->limit)
enlarge = true;
- ret = page_counter_limit(&memcg->memsw, limit);
+ ret = page_counter_limit(counter, limit);
mutex_unlock(&memcg_limit_mutex);
if (!ret)
break;
- usage = page_counter_read(&memcg->memsw);
+ usage = page_counter_read(counter);
if (!try_to_free_mem_cgroup_pages(memcg, usage - limit,
- GFP_KERNEL, false)) {
+ GFP_KERNEL, !memsw)) {
ret = -EBUSY;
break;
}
@@ -3193,10 +3160,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of,
}
switch (MEMFILE_TYPE(of_cft(of)->private)) {
case _MEM:
- ret = mem_cgroup_resize_limit(memcg, nr_pages);
+ ret = mem_cgroup_resize_limit(memcg, false, nr_pages);
break;
case _MEMSWAP:
- ret = mem_cgroup_resize_memsw_limit(memcg, nr_pages);
+ ret = mem_cgroup_resize_limit(memcg, true, nr_pages);
break;
case _KMEM:
ret = memcg_update_kmem_limit(memcg, nr_pages);
--
2.13.6
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2018-01-09 16:58 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 10:24 [PATCH 1/2] mm/memcg: try harder to decrease [memory,memsw].limit_in_bytes Andrey Ryabinin
2017-12-20 10:24 ` [PATCH 2/2] mm/memcg: Consolidate mem_cgroup_resize_[memsw]_limit() functions Andrey Ryabinin
2017-12-20 10:33 ` [PATCH 1/2] mm/memcg: try harder to decrease [memory,memsw].limit_in_bytes Michal Hocko
2017-12-20 11:32 ` Andrey Ryabinin
2017-12-20 11:34 ` Michal Hocko
2017-12-20 18:15 ` Shakeel Butt
2017-12-21 10:00 ` Andrey Ryabinin
2017-12-20 13:21 ` [PATCH v2 " Andrey Ryabinin
2017-12-20 13:21 ` [PATCH v2 2/2] mm/memcg: Consolidate mem_cgroup_resize_[memsw]_limit() functions Andrey Ryabinin
2017-12-20 13:53 ` [PATCH v2 1/2] mm/memcg: try harder to decrease [memory,memsw].limit_in_bytes Michal Hocko
2018-01-09 16:58 ` [PATCH v3 " Andrey Ryabinin
2018-01-09 16:58 ` Andrey Ryabinin [this message]
2018-01-09 17:10 ` [PATCH v3 2/2] mm/memcg: Consolidate mem_cgroup_resize_[memsw]_limit() functions Shakeel Butt
2018-01-09 17:26 ` Andrey Ryabinin
2018-01-09 23:26 ` Andrew Morton
2018-01-10 12:43 ` [PATCH v4] mm/memcg: try harder to decrease [memory,memsw].limit_in_bytes Andrey Ryabinin
2018-01-10 22:31 ` Andrew Morton
2018-01-11 11:59 ` Andrey Ryabinin
2018-01-12 0:21 ` Andrew Morton
2018-01-12 9:08 ` Andrey Ryabinin
2018-01-11 10:42 ` Michal Hocko
2018-01-11 12:21 ` Andrey Ryabinin
2018-01-11 12:46 ` Michal Hocko
2018-01-11 15:23 ` Andrey Ryabinin
2018-01-11 16:29 ` Michal Hocko
2018-01-11 21:59 ` Andrey Ryabinin
2018-01-12 12:24 ` Michal Hocko
2018-01-12 22:57 ` Shakeel Butt
2018-01-15 12:29 ` Andrey Ryabinin
2018-01-15 17:04 ` Shakeel Butt
2018-01-15 12:30 ` Andrey Ryabinin
2018-01-15 12:46 ` Michal Hocko
2018-01-15 12:53 ` Andrey Ryabinin
2018-01-15 12:58 ` Michal Hocko
2018-01-09 17:08 ` [PATCH v3 1/2] " Andrey Ryabinin
2018-01-09 17:22 ` Shakeel Butt
2018-01-19 13:25 ` [PATCH v5 1/2] mm/memcontrol.c: " Andrey Ryabinin
2018-01-19 13:25 ` [PATCH v5 2/2] mm/memcontrol.c: Reduce reclaim retries in mem_cgroup_resize_limit() Andrey Ryabinin
2018-01-19 13:35 ` Michal Hocko
2018-01-19 14:49 ` Shakeel Butt
2018-01-19 15:11 ` Michal Hocko
2018-01-19 15:24 ` Shakeel Butt
2018-01-19 15:31 ` Michal Hocko
2018-02-21 20:17 ` Andrew Morton
2018-02-22 13:50 ` Andrey Ryabinin
2018-02-22 14:09 ` Michal Hocko
2018-02-22 15:13 ` Andrey Ryabinin
2018-02-22 15:33 ` Michal Hocko
2018-02-22 15:38 ` Andrey Ryabinin
2018-02-22 15:44 ` Michal Hocko
2018-02-22 16:01 ` Andrey Ryabinin
2018-02-22 16:30 ` Michal Hocko
2018-01-19 13:32 ` [PATCH v5 1/2] mm/memcontrol.c: try harder to decrease [memory,memsw].limit_in_bytes Michal Hocko
2018-01-25 19:44 ` Andrey Ryabinin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180109165815.8329-2-aryabinin@virtuozzo.com \
--to=aryabinin@virtuozzo.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shakeelb@google.com \
--cc=vdavydov.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).