From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Jun 2023 11:12:14 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.14.318~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c319e0498ab8a6e816cf9a50dabb307a0724f65;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	f2fs-fix-iostat-lock-protection.patch
---

diff --git a/queue-5.15/f2fs-fix-iostat-lock-protection.patch b/queue-5.15/f2fs-fix-iostat-lock-protection.patch
new file mode 100644
index 00000000000..8aefe00e060
--- /dev/null
+++ b/queue-5.15/f2fs-fix-iostat-lock-protection.patch
@@ -0,0 +1,48 @@
+From 144f1cd40bf91fb3ac1d41806470756ce774f389 Mon Sep 17 00:00:00 2001
+From: Qilin Tan <qilin.tan@mediatek.com>
+Date: Fri, 31 Mar 2023 17:26:56 +0800
+Subject: f2fs: fix iostat lock protection
+
+From: Qilin Tan <qilin.tan@mediatek.com>
+
+commit 144f1cd40bf91fb3ac1d41806470756ce774f389 upstream.
+
+Made iostat lock irq safe to avoid potentinal deadlock.
+
+Deadlock scenario:
+f2fs_attr_store
+  -> f2fs_sbi_store
+  -> _sbi_store
+  -> spin_lock(sbi->iostat_lock)
+    <interrupt request>
+    -> scsi_end_request
+    -> bio_endio
+    -> f2fs_dio_read_end_io
+    -> f2fs_update_iostat
+    -> spin_lock_irqsave(sbi->iostat_lock)  ===> Dead lock here
+
+Fixes: 61803e984307 ("f2fs: fix iostat related lock protection")
+Fixes: a1e09b03e6f5 ("f2fs: use iomap for direct I/O")
+Signed-off-by: Qilin Tan <qilin.tan@mediatek.com>
+Reviewed-by: Chao Yu <chao@kernel.org>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Cc: Daniel Rosenberg <drosen@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/f2fs/sysfs.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/f2fs/sysfs.c
++++ b/fs/f2fs/sysfs.c
+@@ -491,9 +491,9 @@ out:
+ 	if (!strcmp(a->attr.name, "iostat_period_ms")) {
+ 		if (t < MIN_IOSTAT_PERIOD_MS || t > MAX_IOSTAT_PERIOD_MS)
+ 			return -EINVAL;
+-		spin_lock(&sbi->iostat_lock);
++		spin_lock_irq(&sbi->iostat_lock);
+ 		sbi->iostat_period_ms = (unsigned int)t;
+-		spin_unlock(&sbi->iostat_lock);
++		spin_unlock_irq(&sbi->iostat_lock);
+ 		return count;
+ 	}
+ #endif
diff --git a/queue-5.15/series b/queue-5.15/series
index 522d2ce4be2..66340ac1c6d 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -6,3 +6,4 @@ i40e-remove-string-printing-for-i40e_status.patch
 i40e-use-int-for-i40e_status.patch
 i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch
 bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch
+f2fs-fix-iostat-lock-protection.patch