From 53b8087358fb11456259c6874b288e6a72ca324d Mon Sep 17 00:00:00 2001 From: fepitre-bot Date: Sat, 13 Sep 2025 06:08:13 +0200 Subject: [PATCH 1/2] Update to kernel-6.16.7 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 41a84d81..e89e08ca 100644 --- a/version +++ b/version @@ -1 +1 @@ -6.15.10 +6.16.7 From 79eb0c7309dd8841a600d8c6dbe8c95422324a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 22 Sep 2025 17:23:34 +0200 Subject: [PATCH 2/2] Backport fix for warning on suspend The warning causes issues especially on Whonix as it has panic_on_warn=1 Fixes QubesOS/qubes-issues#10237 --- ...e-system_transition_mutex-on-suspend.patch | 70 +++++++++++++++++++ kernel.spec.in | 1 + 2 files changed, 71 insertions(+) create mode 100644 0001-xen-take-system_transition_mutex-on-suspend.patch diff --git a/0001-xen-take-system_transition_mutex-on-suspend.patch b/0001-xen-take-system_transition_mutex-on-suspend.patch new file mode 100644 index 00000000..2d929d82 --- /dev/null +++ b/0001-xen-take-system_transition_mutex-on-suspend.patch @@ -0,0 +1,70 @@ +From 9d52b0b41be5b932a0a929c10038f1bb04af4ca5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= + +Date: Sun, 21 Sep 2025 18:28:47 +0200 +Subject: [PATCH] xen: take system_transition_mutex on suspend +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Xen's do_suspend() calls dpm_suspend_start() without taking required +system_transition_mutex. Since 12ffc3b1513eb moved the +pm_restrict_gfp_mask() call, not taking that mutex results in a WARN. + +Take the mutex in do_suspend(), and use mutex_trylock() to follow +how enter_state() does this. + +Suggested-by: Jürgen Groß +Fixes: 12ffc3b1513eb "PM: Restrict swap use to later in the suspend sequence" +Link: https://lore.kernel.org/xen-devel/aKiBJeqsYx_4Top5@mail-itl/ +Signed-off-by: Marek Marczykowski-Górecki +Cc: stable@vger.kernel.org # v6.16+ +Reviewed-by: Juergen Gross +Signed-off-by: Juergen Gross +Message-ID: <20250921162853.223116-1-marmarek@invisiblethingslab.com> +--- + drivers/xen/manage.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c +index 1f5a7a42fc327..e20c40a62e64e 100644 +--- a/drivers/xen/manage.c ++++ b/drivers/xen/manage.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -95,10 +96,16 @@ static void do_suspend(void) + + shutting_down = SHUTDOWN_SUSPEND; + ++ if (!mutex_trylock(&system_transition_mutex)) ++ { ++ pr_err("%s: failed to take system_transition_mutex\n", __func__); ++ goto out; ++ } ++ + err = freeze_processes(); + if (err) { + pr_err("%s: freeze processes failed %d\n", __func__, err); +- goto out; ++ goto out_unlock; + } + + err = freeze_kernel_threads(); +@@ -155,6 +162,8 @@ static void do_suspend(void) + + out_thaw: + thaw_processes(); ++out_unlock: ++ mutex_unlock(&system_transition_mutex); + out: + shutting_down = SHUTDOWN_INVALID; + } +-- +2.51.0 + diff --git a/kernel.spec.in b/kernel.spec.in index e7ada317..0fcb1853 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -145,6 +145,7 @@ Patch27: 0001-amdgpu-timeout.patch Patch30: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch Patch31: 0001-PCI-add-a-reset-quirk-for-Intel-I219LM-ethernet-adap.patch Patch32: 0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch +Patch33: 0001-xen-take-system_transition_mutex-on-suspend.patch # S0ix support: Patch61: xen-events-Add-wakeup-support-to-xen-pirq.patch