4.14-stable patches

added patches:
	locking-mutex-fix-non-debug-version-of-mutex_lock_io_nested.patch

diff --git a/queue-4.14/locking-mutex-fix-non-debug-version-of-mutex_lock_io_nested.patch b/queue-4.14/locking-mutex-fix-non-debug-version-of-mutex_lock_io_nested.patch
new file mode 100644 (file)
index 0000000..5dd4f0a
--- /dev/null
+++ b/queue-4.14/locking-mutex-fix-non-debug-version-of-mutex_lock_io_nested.patch
@@ -0,0 +1,37 @@
+From 291da9d4a9eb3a1cb0610b7f4480f5b52b1825e7 Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 22 Mar 2021 09:46:13 +0100
+Subject: locking/mutex: Fix non debug version of mutex_lock_io_nested()
+
+From: Thomas Gleixner <tglx@linutronix.de>
+
+commit 291da9d4a9eb3a1cb0610b7f4480f5b52b1825e7 upstream.
+
+If CONFIG_DEBUG_LOCK_ALLOC=n then mutex_lock_io_nested() maps to
+mutex_lock() which is clearly wrong because mutex_lock() lacks the
+io_schedule_prepare()/finish() invocations.
+
+Map it to mutex_lock_io().
+
+Fixes: f21860bac05b ("locking/mutex, sched/wait: Fix the mutex_lock_io_nested() define")
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: stable@vger.kernel.org
+Link: https://lkml.kernel.org/r/878s6fshii.fsf@nanos.tec.linutronix.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/mutex.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/mutex.h
++++ b/include/linux/mutex.h
+@@ -183,7 +183,7 @@ extern void mutex_lock_io(struct mutex *
+ # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
+ # define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock)
+ # define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)
+-# define mutex_lock_io_nested(lock, subclass) mutex_lock(lock)
++# define mutex_lock_io_nested(lock, subclass) mutex_lock_io(lock)
+ #endif
+ 
+ /*

diff --git a/queue-4.14/series b/queue-4.14/series
index 7fd1eef0ddc7f09888e8ac9ec5b6da189db8024d..62456424f99e08232bb72c81ea0cdb3560742a82 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -50,3 +50,4 @@ acpi-scan-use-unique-number-for-instance_no.patch
 perf-auxtrace-fix-auxtrace-queue-conflict.patch
 scsi-qedi-fix-error-return-code-of-qedi_alloc_global.patch
 scsi-mpt3sas-fix-error-return-code-of-mpt3sas_base_a.patch
+locking-mutex-fix-non-debug-version-of-mutex_lock_io_nested.patch