mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v1] drm/scheduler: Don't kill jobs in interrupt context
@ 2022-04-11 22:15 Dmitry Osipenko
  2022-04-12 16:51 ` Andrey Grodzovsky
  2022-04-13 10:04 ` Steven Price
  0 siblings, 2 replies; 27+ messages in thread
From: Dmitry Osipenko @ 2022-04-11 22:15 UTC (permalink / raw)
  To: David Airlie, Daniel Vetter, Tomeu Vizoso, Steven Price,
	Rob Herring, Alyssa Rosenzweig, Rob Clark, Andrey Grodzovsky
  Cc: dri-devel, linux-kernel, Dmitry Osipenko

Interrupt context can't sleep. Drivers like Panfrost and MSM are taking
mutex when job is released, and thus, that code can sleep. This results
into "BUG: scheduling while atomic" if locks are contented while job is
freed. There is no good reason for releasing scheduler's jobs in IRQ
context, hence use normal context to fix the trouble.

Cc: stable@vger.kernel.org
Fixes: 542cff7893a3 ("drm/sched: Avoid lockdep spalt on killing a processes")
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
 drivers/gpu/drm/scheduler/sched_entity.c | 6 +++---
 include/drm/gpu_scheduler.h              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
index 191c56064f19..6b25b2f4f5a3 100644
--- a/drivers/gpu/drm/scheduler/sched_entity.c
+++ b/drivers/gpu/drm/scheduler/sched_entity.c
@@ -190,7 +190,7 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout)
 }
 EXPORT_SYMBOL(drm_sched_entity_flush);
 
-static void drm_sched_entity_kill_jobs_irq_work(struct irq_work *wrk)
+static void drm_sched_entity_kill_jobs_work(struct work_struct *wrk)
 {
 	struct drm_sched_job *job = container_of(wrk, typeof(*job), work);
 
@@ -207,8 +207,8 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f,
 	struct drm_sched_job *job = container_of(cb, struct drm_sched_job,
 						 finish_cb);
 
-	init_irq_work(&job->work, drm_sched_entity_kill_jobs_irq_work);
-	irq_work_queue(&job->work);
+	INIT_WORK(&job->work, drm_sched_entity_kill_jobs_work);
+	schedule_work(&job->work);
 }
 
 static struct dma_fence *
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index 0fca8f38bee4..addb135eeea6 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -28,7 +28,7 @@
 #include <linux/dma-fence.h>
 #include <linux/completion.h>
 #include <linux/xarray.h>
-#include <linux/irq_work.h>
+#include <linux/workqueue.h>
 
 #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
 
@@ -295,7 +295,7 @@ struct drm_sched_job {
 	 */
 	union {
 		struct dma_fence_cb		finish_cb;
-		struct irq_work 		work;
+		struct work_struct 		work;
 	};
 
 	uint64_t			id;
-- 
2.35.1


^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2022-07-15 15:24 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 22:15 [PATCH v1] drm/scheduler: Don't kill jobs in interrupt context Dmitry Osipenko
2022-04-12 16:51 ` Andrey Grodzovsky
2022-04-12 18:20   ` Dmitry Osipenko
2022-04-12 19:40     ` Andrey Grodzovsky
2022-04-12 19:55       ` Dmitry Osipenko
2022-04-12 22:59       ` Erico Nunes
2022-04-13  6:05         ` Dmitry Osipenko
2022-04-13  9:45           ` Erico Nunes
2022-04-13 10:04 ` Steven Price
2022-05-17  7:40   ` Erico Nunes
2022-05-17  9:03     ` Dmitry Osipenko
2022-05-17 14:03       ` Andrey Grodzovsky
2022-05-17 14:13         ` Andrey Grodzovsky
2022-05-17 14:48           ` Dmitry Osipenko
2022-07-06  7:07             ` Dmitry Osipenko
2022-07-06 13:49               ` Andrey Grodzovsky
2022-07-06 14:57                 ` Dmitry Osipenko
2022-07-06 15:46                 ` Alex Deucher
2022-07-12  8:56                   ` Dmitry Osipenko
2022-07-14  9:57                     ` Dmitry Osipenko
2022-07-14 14:14                       ` Andrey Grodzovsky
2022-07-14 14:23                         ` Dmitry Osipenko
2022-07-14 16:22                         ` Alex Deucher
2022-07-14 17:58                           ` Andrey Grodzovsky
2022-07-14 21:16                             ` Alex Deucher
2022-07-15 15:18                               ` Andrey Grodzovsky
2022-07-15 15:24                                 ` Dmitry Osipenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®