Commit 9b04369b authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Andrey Grodzovsky
Browse files

drm/scheduler: Don't kill jobs in interrupt context 



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: 542cff78 ("drm/sched: Avoid lockdep spalt on killing a processes")
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220411221536.283312-1-dmitry.osipenko@collabora.com
parent 925b6e59

drivers/gpu/drm/scheduler/sched_entity.c

+3 −3
Original line number Diff line number Diff line
@@ -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 *

include/drm/gpu_scheduler.h

+2 −2
Original line number Diff line number Diff line
@@ -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;