From: zanussi@kernel.org
To: LKML <linux-kernel@vger.kernel.org>,
linux-rt-users <linux-rt-users@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>, John Kacur <jkacur@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Daniel Wagner <wagi@monom.org>, Tom Zanussi <zanussi@kernel.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Subject: [PATCH RT 4/8] mm/memcontrol: Move misplaced local_unlock_irqrestore()
Date: Mon, 9 Mar 2020 14:47:49 -0500 [thread overview]
Message-ID: <41b2fe158cc09157964879dce19e74e1de962f27.1583783251.git.zanussi@kernel.org> (raw)
In-Reply-To: <cover.1583783251.git.zanussi@kernel.org>
In-Reply-To: <cover.1583783251.git.zanussi@kernel.org>
From: Matt Fleming <matt@codeblueprint.co.uk>
v4.14.172-rt78-rc1 stable review patch.
If anyone has any objections, please let me know.
-----------
[ Upstream commit 071a1d6a6e14d0dec240a8c67b425140d7f92f6a ]
The comment about local_lock_irqsave() mentions just the counters and
css_put_many()'s callback just invokes a worker so it is safe to move the
unlock function after memcg_check_events() so css_put_many() can be invoked
without the lock acquired.
Cc: Daniel Wagner <wagi@monom.org>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
[bigeasy: rewrote the patch description]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 0503b31e2a873..a359a24ebd9f0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6102,10 +6102,10 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
mem_cgroup_charge_statistics(memcg, page, PageTransHuge(page),
-nr_entries);
memcg_check_events(memcg, page);
+ local_unlock_irqrestore(event_lock, flags);
if (!mem_cgroup_is_root(memcg))
css_put_many(&memcg->css, nr_entries);
- local_unlock_irqrestore(event_lock, flags);
}
/**
--
2.14.1
next prev parent reply other threads:[~2020-03-09 19:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 19:47 [PATCH RT 0/8] Linux v4.14.172-rt78-rc1 zanussi
2020-03-09 19:47 ` [PATCH RT 1/8] userfaultfd: Use a seqlock instead of seqcount zanussi
2020-03-09 19:47 ` [PATCH RT 2/8] sched: migrate_enable: Use per-cpu cpu_stop_work zanussi
2020-03-09 19:47 ` [PATCH RT 3/8] sched: migrate_enable: Remove __schedule() call zanussi
2020-03-09 19:47 ` zanussi [this message]
2020-03-09 19:47 ` [PATCH RT 5/8] locallock: Include header for the `current' macro zanussi
2020-03-09 19:47 ` [PATCH RT 6/8] drm/vmwgfx: Drop preempt_disable() in vmw_fifo_ping_host() zanussi
2020-03-09 19:47 ` [PATCH RT 7/8] tracing: make preempt_lazy and migrate_disable counter smaller zanussi
2020-03-09 19:47 ` [PATCH RT 8/8] Linux 4.14.172-rt78-rc1 zanussi
-- strict thread matches above, loose matches on Subject: below --
2020-03-06 18:40 [PATCH RT 0/8] Linux 4.19.106-rt45-rc1 Steven Rostedt
2020-03-06 18:40 ` [PATCH RT 4/8] mm/memcontrol: Move misplaced local_unlock_irqrestore() Steven Rostedt
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=41b2fe158cc09157964879dce19e74e1de962f27.1583783251.git.zanussi@kernel.org \
--to=zanussi@kernel.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=matt@codeblueprint.co.uk \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=wagi@monom.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;
as well as URLs for NNTP newsgroup(s).