From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>, Daniel Wagner <wagi@monom.org>,
Tom Zanussi <zanussi@kernel.org>,
"Srivatsa S. Bhat" <srivatsa@csail.mit.edu>,
stable-rt@vger.kernel.org
Subject: [PATCH RT 3/6] mm/memcontrol: Disable preemption in __mod_memcg_lruvec_state()
Date: Fri, 06 Nov 2020 21:06:39 -0500 [thread overview]
Message-ID: <20201107020727.995741226@goodmis.org> (raw)
In-Reply-To: 20201107020636.598338441@goodmis.org
5.4.74-rt42-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
The callers expect disabled preemption/interrupts while invoking
__mod_memcg_lruvec_state(). This works mainline because a lock of
somekind is acquired.
Use preempt_disable_rt() where per-CPU variables are accessed and a
stable pointer is expected. This is also done in __mod_zone_page_state()
for the same reason.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
mm/memcontrol.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9bdb75ef6d62..c9d02e2272e1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -752,6 +752,7 @@ void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,
pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec);
memcg = pn->memcg;
+ preempt_disable_rt();
/* Update memcg */
__mod_memcg_state(memcg, idx, val);
@@ -767,6 +768,7 @@ void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,
x = 0;
}
__this_cpu_write(pn->lruvec_stat_cpu->count[idx], x);
+ preempt_enable_rt();
}
void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val)
--
2.28.0
next prev parent reply other threads:[~2020-11-07 2:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 2:06 [PATCH RT 0/6] Linux 5.4.74-rt42-rc1 Steven Rostedt
2020-11-07 2:06 ` [PATCH RT 1/6] net: Properly annotate the try-lock for the seqlock Steven Rostedt
2020-11-07 2:06 ` [PATCH RT 2/6] tcp: Remove superfluous BH-disable around listening_hash Steven Rostedt
2020-11-09 9:22 ` Sebastian Andrzej Siewior
2020-11-09 17:01 ` Steven Rostedt
2020-11-09 17:35 ` Sebastian Andrzej Siewior
2020-11-07 2:06 ` Steven Rostedt [this message]
2020-11-07 2:06 ` [PATCH RT 4/6] ptrace: fix ptrace_unfreeze_traced() race with rt-lock Steven Rostedt
2020-11-07 2:06 ` [PATCH RT 5/6] timers: Dont block on ->expiry_lock for TIMER_IRQSAFE Steven Rostedt
2020-11-07 2:06 ` [PATCH RT 6/6] Linux 5.4.74-rt42-rc1 Steven Rostedt
2020-11-09 9:27 ` Sebastian Andrzej Siewior
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=20201107020727.995741226@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=srivatsa@csail.mit.edu \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=wagi@monom.org \
--cc=zanussi@kernel.org \
/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