From: Muchun Song <songmuchun@bytedance.com>
To: akpm@linux-foundation.org, hannes@cmpxchg.org,
shakeelb@google.com, guro@fb.com, sfr@canb.auug.org.au,
alex.shi@linux.alibaba.com, alexander.h.duyck@linux.intel.com,
laoar.shao@gmail.com, richard.weiyang@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH] mm/memcg: fix NULL pointer dereference at workingset_eviction
Date: Mon, 30 Nov 2020 21:15:12 +0800 [thread overview]
Message-ID: <20201130131512.6043-1-songmuchun@bytedance.com> (raw)
We found a case of kernel panic. The stack trace is as follows
(omit some irrelevant information):
BUG: kernel NULL pointer dereference, address: 00000000000000c8
RIP: 0010:workingset_eviction+0x26b/0x450
Call Trace:
__remove_mapping+0x224/0x2b0
shrink_page_list+0x8c2/0x14e0
shrink_inactive_list+0x1bf/0x3f0
? do_raw_spin_unlock+0x49/0xc0
? _raw_spin_unlock+0xa/0x20
shrink_lruvec+0x401/0x640
This was caused by commit 76761ffa9ea1 ("mm/memcg: bail out early when
!memcg in mem_cgroup_lruvec"). When the parameter of memcg is NULL, we
should not use the &pgdat->__lruvec. So this just reverts commit
76761ffa9ea1 to fix it.
Fixes: 76761ffa9ea1 ("mm/memcg: bail out early when !memcg in mem_cgroup_lruvec")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
include/linux/memcontrol.h | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index f9a496c4eac7..a1416205507c 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -610,17 +610,20 @@ mem_cgroup_nodeinfo(struct mem_cgroup *memcg, int nid)
static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg,
struct pglist_data *pgdat)
{
+ struct mem_cgroup_per_node *mz;
struct lruvec *lruvec;
- if (mem_cgroup_disabled() || !memcg) {
+ if (mem_cgroup_disabled()) {
lruvec = &pgdat->__lruvec;
- } else {
- struct mem_cgroup_per_node *mz;
-
- mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
- lruvec = &mz->lruvec;
+ goto out;
}
+ if (!memcg)
+ memcg = root_mem_cgroup;
+
+ mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
+ lruvec = &mz->lruvec;
+out:
/*
* Since a node can be onlined after the mem_cgroup was created,
* we have to be prepared to initialize lruvec->pgdat here;
--
2.11.0
next reply other threads:[~2020-11-30 13:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 13:15 Muchun Song [this message]
2020-11-30 13:23 ` Michal Hocko
2020-11-30 13:36 ` [External] " Muchun Song
2020-11-30 13:45 ` Michal Hocko
2020-11-30 15:57 ` Vlastimil Babka
2020-11-30 20:23 ` Andrew Morton
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=20201130131512.6043-1-songmuchun@bytedance.com \
--to=songmuchun@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=alex.shi@linux.alibaba.com \
--cc=alexander.h.duyck@linux.intel.com \
--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=richard.weiyang@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.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