From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Apr 2020 09:41:24 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v5.4.31~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49806bd9d01e55748347db52c9a747e4a5a6f745;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
---

diff --git a/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch b/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
new file mode 100644
index 00000000000..61ca4f4b3de
--- /dev/null
+++ b/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch
@@ -0,0 +1,67 @@
+From 38228e8848cd7dd86ccb90406af32de0cad24be3 Mon Sep 17 00:00:00 2001
+From: Daniel Jordan <daniel.m.jordan@oracle.com>
+Date: Tue, 3 Dec 2019 14:31:11 -0500
+Subject: padata: always acquire cpu_hotplug_lock before pinst->lock
+
+From: Daniel Jordan <daniel.m.jordan@oracle.com>
+
+commit 38228e8848cd7dd86ccb90406af32de0cad24be3 upstream.
+
+lockdep complains when padata's paths to update cpumasks via CPU hotplug
+and sysfs are both taken:
+
+  # echo 0 > /sys/devices/system/cpu/cpu1/online
+  # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
+
+  ======================================================
+  WARNING: possible circular locking dependency detected
+  5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
+  ------------------------------------------------------
+  bash/205 is trying to acquire lock:
+  ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
+
+  but task is already holding lock:
+  ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
+
+  which lock already depends on the new lock.
+
+padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent
+order.  Which should be first?  CPU hotplug calls into padata with
+cpu_hotplug_lock already held, so it should have priority.
+
+Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus")
+Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
+Cc: Eric Biggers <ebiggers@kernel.org>
+Cc: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: Steffen Klassert <steffen.klassert@secunet.com>
+Cc: linux-crypto@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/padata.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/padata.c
++++ b/kernel/padata.c
+@@ -605,8 +605,8 @@ int padata_set_cpumask(struct padata_ins
+ 	struct cpumask *serial_mask, *parallel_mask;
+ 	int err = -EINVAL;
+ 
+-	mutex_lock(&pinst->lock);
+ 	get_online_cpus();
++	mutex_lock(&pinst->lock);
+ 
+ 	switch (cpumask_type) {
+ 	case PADATA_CPU_PARALLEL:
+@@ -624,8 +624,8 @@ int padata_set_cpumask(struct padata_ins
+ 	err =  __padata_set_cpumasks(pinst, parallel_mask, serial_mask);
+ 
+ out:
+-	put_online_cpus();
+ 	mutex_unlock(&pinst->lock);
++	put_online_cpus();
+ 
+ 	return err;
+ }
diff --git a/queue-4.14/series b/queue-4.14/series
index 98ef2e62af3..3c3dc02f480 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -10,3 +10,4 @@ blk-mq-sync-the-update-nr_hw_queues-with-blk_mq_queue_tag_busy_iter.patch
 blk-mq-allow-blocking-queue-tag-iter-callbacks.patch
 misc-pci_endpoint_test-fix-to-support-10-pci-endpoint-test-devices.patch
 coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
+padata-always-acquire-cpu_hotplug_lock-before-pinst-lock.patch