Add DRM sched support functions to avoid driver side layering violations
Subsystems (3)
Matthew Brost
maintainerv8 cover Add DRM sched support functions to avoid driver side layering violations
Subset of [1], believe we are in agreement these can go into the DRM scheduler. Will post the Xe in a follow once patches make it from drm-misc-next to drm-xe-next.
Matt
[1] https://patchwork.freedesktop.org/series/155314/
Matthew Brost (2):
drm/sched: Add several job helpers to avoid drivers touching scheduler
state
drm/sched: Add pending job list iterator
drivers/gpu/drm/scheduler/sched_main.c | 36 +++++++++++++++++- include/drm/gpu_scheduler.h | 52 ++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-)
Signature · 1 line
2.34.1
Matthew Brost
maintainerPATCH v8 1/2 drm/sched: Add several job helpers to avoid drivers touching scheduler state
In the past, drivers used to reach into scheduler internals—this must end because it makes it difficult to change scheduler internals, as driver-side code must also be updated.
Add helpers to check if the scheduler is stopped and to query a job’s signaled state to avoid reaching into scheduler internals. These are expected to be used driver-side in recovery and debug flows.
---
v4:
- Reorder patch to first in series (Niranjana)
- Also check parent fence for signaling (Niranjana)
v8:
- Fixup kernel doc (Philipp)
- Move chnage log (Philipp)
- Better commit (Philipp)
- Drop inlines (Philipp)
--- drivers/gpu/drm/scheduler/sched_main.c | 36 ++++++++++++++++++++++++-- include/drm/gpu_scheduler.h | 2 ++ 2 files changed, 36 insertions(+), 2 deletions(-)
drivers/gpu/drm/scheduler/sched_main.c +34 -2
@@ -344,7 +344,7 @@ drm_sched_rq_select_entity_fifo(struct drm_gpu_scheduler *sched,*/ static void drm_sched_run_job_queue (struct drm_gpu_scheduler *sched) { -if (!READ_ONCE (sched->pause_submit)) +if (!drm_sched_is_stopped (sched))queue_work (sched->submit_wq, &sched->work_run_job); }
@@ -354,7 +354,7 @@ static void drm_sched_run_job_queue(struct drm_gpu_scheduler *sched)*/ static void drm_sched_run_free_queue (struct drm_gpu_scheduler *sched) { -if (!READ_ONCE (sched->pause_submit)) +if (!drm_sched_is_stopped (sched))queue_work (sched->submit_wq, &sched->work_free_job); }
@@ -1567,3 +1567,35 @@ void drm_sched_wqueue_start(struct drm_gpu_scheduler *sched)queue_work (sched->submit_wq, &sched->work_free_job); }EXPORT_SYMBOL (drm_sched_wqueue_start); + +/** +* drm_sched_is_stopped() - Checks whether drm_sched is stopped +* @sched: DRM scheduler +* +* Return: true if sched is stopped, false otherwise +*/ +bool drm_sched_is_stopped (struct drm_gpu_scheduler *sched) +{ +return READ_ONCE (sched->pause_submit); +} +EXPORT_SYMBOL (drm_sched_is_stopped); + +/** +* drm_sched_job_is_signaled() - DRM scheduler job is signaled +* @job: DRM scheduler job +* +* Determine if DRM scheduler job is signaled. DRM scheduler should be stopped +* to obtain a stable snapshot of state. Both parent fence (hardware fence) and +* finished fence (software fence) are checked to determine signaling state. +* +* Return: true if job is signaled, false otherwise +*/ +bool drm_sched_job_is_signaled (struct drm_sched_job *job) +{ +struct drm_sched_fence *s_fence = job->s_fence; + +WARN_ON (!drm_sched_is_stopped (job->sched)); +return (s_fence->parent &&dma_fence_is_signaled (s_fence->parent)) || +dma_fence_is_signaled (&s_fence->finished); +} +EXPORT_SYMBOL (drm_sched_job_is_signaled);
include/drm/gpu_scheduler.h +2 -0
@@ -645,6 +645,7 @@ void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);void drm_sched_start (struct drm_gpu_scheduler *sched,int errno);void drm_sched_resubmit_jobs (struct drm_gpu_scheduler *sched);void drm_sched_fault (struct drm_gpu_scheduler *sched); +bool drm_sched_is_stopped (struct drm_gpu_scheduler *sched);struct drm_gpu_scheduler * drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,
@@ -674,6 +675,7 @@ bool drm_sched_job_has_dependency(struct drm_sched_job *job, struct dma_fence *fence);void drm_sched_job_cleanup (struct drm_sched_job *job);void drm_sched_increase_karma (struct drm_sched_job *bad); +bool drm_sched_job_is_signaled (struct drm_sched_job *job);static inline bool drm_sched_invalidate_job (struct drm_sched_job *s_job,int threshold)
Signature · 1 line
2.34.1
Matthew Brost
maintainerPATCH v8 2/2 drm/sched: Add pending job list iterator
In reply to Matthew BrostStop open coding pending job list in drivers. Add pending job list iterator which safely walks DRM scheduler list asserting DRM scheduler is stopped.
---
v2:
- Fix checkpatch (CI)
v3:
- Drop locked version (Christian)
v4:
- Reorder patch (Niranjana)
--- include/drm/gpu_scheduler.h | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
include/drm/gpu_scheduler.h +50 -0
@@ -700,4 +700,54 @@ void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,struct drm_gpu_scheduler **sched_list, unsigned int num_sched_list); +/** +* struct drm_sched_pending_job_iter - DRM scheduler pending job iterator state +* @sched: DRM scheduler associated with pending job iterator +*/ +struct drm_sched_pending_job_iter { +struct drm_gpu_scheduler *sched; +}; + +/* Drivers should never call this directly */ +static inline struct drm_sched_pending_job_iter +__drm_sched_pending_job_iter_begin (struct drm_gpu_scheduler *sched) +{ +struct drm_sched_pending_job_iter iter = { + .sched = sched, + }; + +WARN_ON (!drm_sched_is_stopped (sched)); +return iter; +} + +/* Drivers should never call this directly */ +static inline void +__drm_sched_pending_job_iter_end (const struct drm_sched_pending_job_iter iter) +{ +WARN_ON (!drm_sched_is_stopped (iter.sched)); +} + +DEFINE_CLASS(drm_sched_pending_job_iter, struct drm_sched_pending_job_iter, +__drm_sched_pending_job_iter_end (_T), +__drm_sched_pending_job_iter_begin (__sched), + struct drm_gpu_scheduler *__sched); +static inline void * +class_drm_sched_pending_job_iter_lock_ptr (class_drm_sched_pending_job_iter_t *_T) +{return _T; } +#define class_drm_sched_pending_job_iter_is_conditional false + +/** +* drm_sched_for_each_pending_job() - Iterator for each pending job in scheduler +* @__job: Current pending job being iterated over +* @__sched: DRM scheduler to iterate over pending jobs +* @__entity: DRM scheduler entity to filter jobs, NULL indicates no filter +* +* Iterator for each pending job in scheduler, filtering on an entity, and +* enforcing scheduler is fully stopped +*/ +#define drm_sched_for_each_pending_job (__job, __sched, __entity) \ + scoped_guard(drm_sched_pending_job_iter, (__sched)) \ + list_for_each_entry((__job), &(__sched)->pending_list, list) \ + for_each_if(!(__entity) || (__job)->entity == (__entity)) +#endif
Signature · 1 line
2.34.1