6.18-stable patches

added patches:
	erofs-add-gfp_noio-in-the-bio-completion-if-needed.patch

diff --git a/queue-6.18/erofs-add-gfp_noio-in-the-bio-completion-if-needed.patch b/queue-6.18/erofs-add-gfp_noio-in-the-bio-completion-if-needed.patch
new file mode 100644 (file)
index 0000000..7c21957
--- /dev/null
+++ b/queue-6.18/erofs-add-gfp_noio-in-the-bio-completion-if-needed.patch
@@ -0,0 +1,62 @@
+From c23df30915f83e7257c8625b690a1cece94142a0 Mon Sep 17 00:00:00 2001
+From: Jiucheng Xu <jiucheng.xu@amlogic.com>
+Date: Wed, 11 Mar 2026 17:11:31 +0800
+Subject: erofs: add GFP_NOIO in the bio completion if needed
+
+From: Jiucheng Xu <jiucheng.xu@amlogic.com>
+
+commit c23df30915f83e7257c8625b690a1cece94142a0 upstream.
+
+The bio completion path in the process context (e.g. dm-verity)
+will directly call into decompression rather than trigger another
+workqueue context for minimal scheduling latencies, which can
+then call vm_map_ram() with GFP_KERNEL.
+
+Due to insufficient memory, vm_map_ram() may generate memory
+swapping I/O, which can cause submit_bio_wait to deadlock
+in some scenarios.
+
+Trimmed down the call stack, as follows:
+
+f2fs_submit_read_io
+  submit_bio                      //bio_list is initialized.
+    mmc_blk_mq_recovery
+      z_erofs_endio
+        vm_map_ram
+          __pte_alloc_kernel
+            __alloc_pages_direct_reclaim
+              shrink_folio_list
+                __swap_writepage
+                  submit_bio_wait  //bio_list is non-NULL, hang!!!
+
+Use memalloc_noio_{save,restore}() to wrap up this path.
+
+Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
+Signed-off-by: Jiucheng Xu <jiucheng.xu@amlogic.com>
+Reviewed-by: Chao Yu <chao@kernel.org>
+Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/erofs/zdata.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/fs/erofs/zdata.c
++++ b/fs/erofs/zdata.c
+@@ -1445,6 +1445,7 @@ static void z_erofs_decompress_kickoff(s
+                                      int bios)
+ {
+       struct erofs_sb_info *const sbi = EROFS_SB(io->sb);
++      int gfp_flag;
+ 
+       /* wake up the caller thread for sync decompression */
+       if (io->sync) {
+@@ -1477,7 +1478,9 @@ static void z_erofs_decompress_kickoff(s
+                       sbi->opt.sync_decompress = EROFS_SYNC_DECOMPRESS_FORCE_ON;
+               return;
+       }
++      gfp_flag = memalloc_noio_save();
+       z_erofs_decompressqueue_work(&io->u.work);
++      memalloc_noio_restore(gfp_flag);
+ }
+ 
+ static void z_erofs_fill_bio_vec(struct bio_vec *bvec,

diff --git a/queue-6.18/series b/queue-6.18/series
index 2bcd0f332d2fe2e84027b156810c4ee28c93ca13..a64c5de977d0e5be3aa80568657f4be486a4b6a2 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -205,3 +205,4 @@ xfrm-iptfs-validate-inner-ipv4-header-length-in-iptfs-payload.patch
 xfrm-iptfs-only-publish-mode_data-after-clone-setup.patch
 virt-tdx-guest-fix-handling-of-host-controlled-quote-buffer-length.patch
 virtio_net-fix-uaf-on-dst_ops-when-iff_xmit_dst_release-is-cleared-and-napi_tx-is-false.patch
+erofs-add-gfp_noio-in-the-bio-completion-if-needed.patch