Messages in this thread Patch in this message | | | From | zanussi@kernel ... | Subject | [PATCH RT 22/25] mm/memcontrol: Move misplaced local_unlock_irqrestore() | Date | Fri, 21 Feb 2020 15:24:50 -0600 |
| |
From: Matt Fleming <matt@codeblueprint.co.uk>
v4.14.170-rt75-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 0503b31e2a87..a359a24ebd9f 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
| |