From: Greg Kroah-Hartman Date: Mon, 30 Dec 2024 08:43:26 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v6.1.123~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22b8dc8a77fdcdf0fedc14e1b5e56b47b3a52af9;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch --- diff --git a/queue-5.15/btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch b/queue-5.15/btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch new file mode 100644 index 00000000000..ea55b7426c1 --- /dev/null +++ b/queue-5.15/btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch @@ -0,0 +1,34 @@ +From 2c8507c63f5498d4ee4af404a8e44ceae4345056 Mon Sep 17 00:00:00 2001 +From: Filipe Manana +Date: Mon, 9 Dec 2024 16:43:44 +0000 +Subject: btrfs: avoid monopolizing a core when activating a swap file + +From: Filipe Manana + +commit 2c8507c63f5498d4ee4af404a8e44ceae4345056 upstream. + +During swap activation we iterate over the extents of a file and we can +have many thousands of them, so we can end up in a busy loop monopolizing +a core. Avoid this by doing a voluntary reschedule after processing each +extent. + +CC: stable@vger.kernel.org # 5.4+ +Reviewed-by: Qu Wenruo +Signed-off-by: Filipe Manana +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/inode.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -7698,6 +7698,8 @@ noinline int can_nocow_extent(struct ino + ret = -EAGAIN; + goto out; + } ++ ++ cond_resched(); + } + + btrfs_release_path(path); diff --git a/queue-5.15/series b/queue-5.15/series index 383564e5271..e3c81cbe225 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -98,3 +98,4 @@ riscv-fix-ipis-usage-in-kfence_protect_page.patch tracing-constify-string-literal-data-member-in-struct-trace_event_call.patch tracing-prevent-bad-count-for-tracing_cpumask_write.patch power-supply-gpio-charger-fix-set-charge-current-limits.patch +btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch