diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:18:02 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:18:02 +0000 |
commit | eb4273cf3e952d49bd88ea7d5a9041e2b5aec556 (patch) | |
tree | 987fba31b18efab34ac6f50e73e76b8187e8cef5 /debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch | |
parent | Merging upstream version 6.10.3. (diff) | |
download | linux-17bb17f9d7a9dbcc66b9c2be8ad9b34b4814949b.tar.xz linux-17bb17f9d7a9dbcc66b9c2be8ad9b34b4814949b.zip |
Adding debian version 6.10.3-1.debian/6.10.3-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch')
-rw-r--r-- | debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch b/debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch new file mode 100644 index 0000000000..e2976aacd5 --- /dev/null +++ b/debian/patches-rt/0007-drm-i915-guc-Consider-also-RCU-depth-in-busy-loop.patch @@ -0,0 +1,30 @@ +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Tue, 3 Oct 2023 21:37:21 +0200 +Subject: [PATCH 7/8] drm/i915/guc: Consider also RCU depth in busy loop. +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz + +intel_guc_send_busy_loop() looks at in_atomic() and irqs_disabled() to +decide if it should busy-spin while waiting or if it may sleep. +Both checks will report false on PREEMPT_RT if sleeping spinlocks are +acquired leading to RCU splats while the function sleeps. + +Check also if RCU has been disabled. + +Reported-by: "John B. Wyatt IV" <jwyatt@redhat.com> +Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h ++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h +@@ -362,7 +362,7 @@ static inline int intel_guc_send_busy_lo + { + int err; + unsigned int sleep_period_ms = 1; +- bool not_atomic = !in_atomic() && !irqs_disabled(); ++ bool not_atomic = !in_atomic() && !irqs_disabled() && !rcu_preempt_depth(); + + /* + * FIXME: Have caller pass in if we are in an atomic context to avoid |