1 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches-rt/0318-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch b/debian/patches-rt/0318-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
new file mode 100644
index 000000000..87fb2dcd0
--- /dev/null
+++ b/debian/patches-rt/0318-mm-memcontrol-Move-misplaced-local_unlock_irqrestore.patch
@@ -0,0 +1,42 @@
+From 402c737918994231fbd205f2a7dcf06c5046a849 Mon Sep 17 00:00:00 2001
+From: Matt Fleming <matt@codeblueprint.co.uk>
+Date: Sun, 26 Jan 2020 21:19:45 +0000
+Subject: [PATCH 318/347] mm/memcontrol: Move misplaced
+ local_unlock_irqrestore()
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.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 <wagi@monom.org>
+Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+[bigeasy: rewrote the patch description]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/memcontrol.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mm/memcontrol.c b/mm/memcontrol.c
+index 239fec6eac9f..d5bda1449fe3 100644
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -6541,10 +6541,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.36.1
+