From: Waiman Long <longman@redhat.com>
To: Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>
Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org,
linux-mm@kvack.org, Shakeel Butt <shakeelb@google.com>,
Chris Down <chris@chrisdown.name>, Roman Gushchin <guro@fb.com>,
Yafang Shao <laoar.shao@gmail.com>,
Waiman Long <longman@redhat.com>
Subject: [PATCH v2 2/3] mm/memcg: Simplify mem_cgroup_get_max()
Date: Sun, 13 Sep 2020 22:44:51 -0400 [thread overview]
Message-ID: <20200914024452.19167-3-longman@redhat.com> (raw)
In-Reply-To: <20200914024452.19167-1-longman@redhat.com>
The mem_cgroup_get_max() function used to get memory+swap max from
both the v1 memsw and v2 memory+swap page counters & return the maximum
of these 2 values. This is redundant and it is more efficient to just
get either the v1 or the v2 values depending on which one is currently
in use.
Signed-off-by: Waiman Long <longman@redhat.com>
---
mm/memcontrol.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8c74f1200261..ca36bed588d1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1633,17 +1633,15 @@ void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg)
*/
unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg)
{
- unsigned long max;
-
- max = READ_ONCE(memcg->memory.max);
- if (mem_cgroup_swappiness(memcg)) {
- unsigned long memsw_max;
- unsigned long swap_max;
-
- memsw_max = memcg->memsw.max;
- swap_max = READ_ONCE(memcg->swap.max);
- swap_max = min(swap_max, (unsigned long)total_swap_pages);
- max = min(max + swap_max, memsw_max);
+ unsigned long max = READ_ONCE(memcg->memory.max);
+
+ if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) {
+ if (mem_cgroup_swappiness(memcg))
+ max += min(READ_ONCE(memcg->swap.max),
+ (unsigned long)total_swap_pages);
+ } else { /* v1 */
+ if (mem_cgroup_swappiness(memcg))
+ max = memcg->memsw.max;
}
return max;
}
--
2.18.1
next prev parent reply other threads:[~2020-09-14 2:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 2:44 [PATCH v2 0/3] mm/memcg: Miscellaneous cleanups and streamlining Waiman Long
2020-09-14 2:44 ` [PATCH v2 1/3] mm/memcg: Clean up obsolete enum charge_type Waiman Long
2020-09-14 11:37 ` Michal Hocko
2020-09-14 2:44 ` Waiman Long [this message]
2020-09-14 11:48 ` [PATCH v2 2/3] mm/memcg: Simplify mem_cgroup_get_max() Michal Hocko
2020-09-14 13:51 ` Waiman Long
2020-09-14 21:29 ` Johannes Weiner
2020-09-14 21:32 ` Johannes Weiner
2020-09-14 2:44 ` [PATCH v2 3/3] mm/memcg: Unify swap and memsw page counters Waiman Long
2020-09-14 11:54 ` Michal Hocko
2020-09-14 15:37 ` Shakeel Butt
2020-09-14 14:19 ` [PATCH v3 2/3] mm/memcg: Simplify mem_cgroup_get_max() Waiman Long
2020-09-14 14:47 ` Michal Hocko
2020-09-14 14:58 ` Waiman Long
2020-09-14 15:09 ` [PATCH v4 " Waiman Long
2020-09-14 15:18 ` Michal Hocko
2020-09-14 15:36 ` Shakeel Butt
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=20200914024452.19167-3-longman@redhat.com \
--to=longman@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=chris@chrisdown.name \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=laoar.shao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=shakeelb@google.com \
--cc=tj@kernel.org \
--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).