From 0d65d04f961014c84ab5bd939a0605147ccdec9c Mon Sep 17 00:00:00 2001 Message-Id: <0d65d04f961014c84ab5bd939a0605147ccdec9c.1601675153.git.zanussi@kernel.org> In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org> References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org> From: Matt Fleming Date: Sun, 26 Jan 2020 21:19:45 +0000 Subject: [PATCH 318/333] mm/memcontrol: Move misplaced local_unlock_irqrestore() Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz [ 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 Signed-off-by: Matt Fleming Signed-off-by: Steven Rostedt (VMware) [bigeasy: rewrote the patch description] Signed-off-by: Sebastian Andrzej Siewior --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a54cfafba8ad..7b506d178aa0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6538,10 +6538,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.17.1