Drop cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch b/queue-4.19/cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch
deleted file mode 100644 (file)
index 942d707..0000000
--- a/queue-4.19/cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 43626dade36fa74d3329046f4ae2d7fdefe401c6 Mon Sep 17 00:00:00 2001
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Date: Thu, 25 Aug 2022 17:38:38 +0900
-Subject: cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all()
-
-From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-
-commit 43626dade36fa74d3329046f4ae2d7fdefe401c6 upstream.
-
-syzbot is hitting percpu_rwsem_assert_held(&cpu_hotplug_lock) warning at
-cpuset_attach() [1], for commit 4f7e7236435ca0ab ("cgroup: Fix
-threadgroup_rwsem <-> cpus_read_lock() deadlock") missed that
-cpuset_attach() is also called from cgroup_attach_task_all().
-Add cpus_read_lock() like what cgroup_procs_write_start() does.
-
-Link: https://syzkaller.appspot.com/bug?extid=29d3a3b4d86c8136ad9e [1]
-Reported-by: syzbot <syzbot+29d3a3b4d86c8136ad9e@syzkaller.appspotmail.com>
-Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Fixes: 4f7e7236435ca0ab ("cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock")
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Cai Xinchen <caixinchen1@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- kernel/cgroup/cgroup-v1.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/kernel/cgroup/cgroup-v1.c
-+++ b/kernel/cgroup/cgroup-v1.c
-@@ -13,6 +13,7 @@
- #include <linux/delayacct.h>
- #include <linux/pid_namespace.h>
- #include <linux/cgroupstats.h>
-+#include <linux/cpu.h>
- 
- #include <trace/events/cgroup.h>
- 
-@@ -55,6 +56,7 @@ int cgroup_attach_task_all(struct task_s
-       int retval = 0;
- 
-       mutex_lock(&cgroup_mutex);
-+      get_online_cpus();
-       percpu_down_write(&cgroup_threadgroup_rwsem);
-       for_each_root(root) {
-               struct cgroup *from_cgrp;
-@@ -71,6 +73,7 @@ int cgroup_attach_task_all(struct task_s
-                       break;
-       }
-       percpu_up_write(&cgroup_threadgroup_rwsem);
-+      put_online_cpus();
-       mutex_unlock(&cgroup_mutex);
- 
-       return retval;

diff --git a/queue-4.19/series b/queue-4.19/series
index 3950f7af3d4b70dd30b7367d2f3f9bc78f1f9238..c156c78143aedb9b432f07f574a89a03bb13718f 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -32,4 +32,3 @@ media-ov5640-fix-analogue-gain-control.patch
 tipc-improve-function-tipc_wait_for_cond.patch
 drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch
 cgroup-cpuset-change-cpuset_rwsem-and-hotplug-lock-order.patch
-cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch