From: Wei Yang <richard.weiyang@gmail.com>
To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com,
akpm@linux-foundation.org
Cc: cgroups@vger.kernel.org, linux-mm@kvack.org,
Wei Yang <richard.weiyang@gmail.com>
Subject: [PATCH 2/3] mm/memcg: __mem_cgroup_remove_exceeded could handle a !on-tree mz properly
Date: Tue, 8 Mar 2022 01:20:46 +0000 [thread overview]
Message-ID: <20220308012047.26638-2-richard.weiyang@gmail.com> (raw)
In-Reply-To: <20220308012047.26638-1-richard.weiyang@gmail.com>
There is no tree operation if mz is not on-tree.
Let's remove the extra check.
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
---
mm/memcontrol.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d70bf5cf04eb..344a7e891bc5 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -545,9 +545,11 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid)
unsigned long flags;
spin_lock_irqsave(&mctz->lock, flags);
- /* if on-tree, remove it */
- if (mz->on_tree)
- __mem_cgroup_remove_exceeded(mz, mctz);
+ /*
+ * remove it first
+ * If not on-tree, no tree ops.
+ */
+ __mem_cgroup_remove_exceeded(mz, mctz);
/*
* Insert again. mz->usage_in_excess will be updated.
* If excess is 0, no tree ops.
--
2.33.1
next prev parent reply other threads:[~2022-03-08 1:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 1:20 [PATCH 1/3] mm/memcg: mz already removed from rb_tree in mem_cgroup_largest_soft_limit_node() Wei Yang
2022-03-08 1:20 ` Wei Yang [this message]
2022-03-08 1:20 ` [PATCH 3/3] mm/memcg: add next_mz back if not reclaimed yet Wei Yang
2022-03-08 8:17 ` Michal Hocko
2022-03-09 0:46 ` Wei Yang
2022-03-09 13:48 ` Michal Hocko
2022-03-10 1:13 ` Wei Yang
2022-03-10 8:53 ` Michal Hocko
2022-03-10 23:57 ` Wei Yang
2022-03-10 8:59 ` Michal Hocko
2022-03-10 23:55 ` Wei Yang
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=20220308012047.26638-2-richard.weiyang@gmail.com \
--to=richard.weiyang@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@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