[PATCH v5 11/16] drm/sched: Account entity GPU time
Tvrtko Ursulin
tvrtko.ursulin at igalia.com
Mon Jul 7 07:41:58 UTC 2025
On 04/07/2025 15:18, Maíra Canal wrote:
> Hi Tvrtko,
>
> In general, LGTM, but I miss documentation for all the new structures
> and functions that you implemented.
Okay, I added some kerneldoc locally.
Regards,
Tvrtko
> On 23/06/25 09:27, Tvrtko Ursulin wrote:
>> To implement fair scheduling we need a view into the GPU time consumed by
>> entities. Problem we have is that jobs and entities objects have
>> decoupled
>> lifetimes, where at the point we have a view into accurate GPU time, we
>> cannot link back to the entity any longer.
>>
>> Solve this by adding a light weight entity stats object which is
>> reference
>> counted by both entity and the job and hence can safely be used from
>> either side.
>>
>> With that, the only other thing we need is to add a helper for adding the
>> job's GPU time into the respective entity stats object, and call it once
>> the accurate GPU time has been calculated.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>
>> Cc: Christian König <christian.koenig at amd.com>
>> Cc: Danilo Krummrich <dakr at kernel.org>
>> Cc: Matthew Brost <matthew.brost at intel.com>
>> Cc: Philipp Stanner <phasta at kernel.org>
>> ---
>> drivers/gpu/drm/scheduler/sched_entity.c | 29 ++++++++++++++++
>> drivers/gpu/drm/scheduler/sched_internal.h | 40 ++++++++++++++++++++++
>> drivers/gpu/drm/scheduler/sched_main.c | 6 +++-
>> include/drm/gpu_scheduler.h | 5 +++
>> 4 files changed, 79 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/
>> drm/scheduler/sched_entity.c
>> index e42526aa22dc..466914506c36 100644
>> --- a/drivers/gpu/drm/scheduler/sched_entity.c
>> +++ b/drivers/gpu/drm/scheduler/sched_entity.c
>> @@ -32,6 +32,29 @@
>> #include "gpu_scheduler_trace.h"
>> +
>> +void drm_sched_entity_stats_release(struct kref *kref)
>> +{
>> + struct drm_sched_entity_stats *stats =
>> + container_of(kref, typeof(*stats), kref);
>> +
>> + kfree(stats);
>> +}
>> +
>> +static struct drm_sched_entity_stats *drm_sched_entity_stats_alloc(void)
>> +{
>> + struct drm_sched_entity_stats *stats;
>> +
>> + stats = kzalloc(sizeof(*stats), GFP_KERNEL);
>> + if (!stats)
>> + return NULL;
>> +
>> + kref_init(&stats->kref);
>> + spin_lock_init(&stats->lock);
>> +
>> + return stats;
>> +}
>> +
>> /**
>> * drm_sched_entity_init - Init a context entity used by scheduler when
>> * submit to HW ring.
>> @@ -65,6 +88,11 @@ int drm_sched_entity_init(struct drm_sched_entity
>> *entity,
>> return -EINVAL;
>> memset(entity, 0, sizeof(struct drm_sched_entity));
>> +
>> + entity->stats = drm_sched_entity_stats_alloc();
>> + if (!entity->stats)
>> + return -ENOMEM;
>> +
>> INIT_LIST_HEAD(&entity->list);
>> entity->rq = NULL;
>> entity->guilty = guilty;
>> @@ -340,6 +368,7 @@ void drm_sched_entity_fini(struct drm_sched_entity
>> *entity)
>> dma_fence_put(rcu_dereference_check(entity->last_scheduled, true));
>> RCU_INIT_POINTER(entity->last_scheduled, NULL);
>> + drm_sched_entity_stats_put(entity->stats);
>> }
>> EXPORT_SYMBOL(drm_sched_entity_fini);
>> diff --git a/drivers/gpu/drm/scheduler/sched_internal.h b/drivers/gpu/
>> drm/scheduler/sched_internal.h
>> index 703ee48fbc58..000c4a5b2c86 100644
>> --- a/drivers/gpu/drm/scheduler/sched_internal.h
>> +++ b/drivers/gpu/drm/scheduler/sched_internal.h
>> @@ -3,6 +3,15 @@
>> #ifndef _DRM_GPU_SCHEDULER_INTERNAL_H_
>> #define _DRM_GPU_SCHEDULER_INTERNAL_H_
>> +#include <linux/ktime.h>
>> +#include <linux/kref.h>
>> +#include <linux/spinlock.h>
>> +
>> +struct drm_sched_entity_stats {
>> + struct kref kref;
>> + spinlock_t lock;
>> + ktime_t runtime;
>> +};
>> /* Used to choose between FIFO and RR job-scheduling */
>> extern int drm_sched_policy;
>> @@ -93,4 +102,35 @@ drm_sched_entity_is_ready(struct drm_sched_entity
>> *entity)
>> return true;
>> }
>> +void drm_sched_entity_stats_release(struct kref *kref);
>> +
>> +static inline struct drm_sched_entity_stats *
>> +drm_sched_entity_stats_get(struct drm_sched_entity_stats *stats)
>> +{
>> + kref_get(&stats->kref);
>> +
>> + return stats;
>> +}
>> +
>> +static inline void
>> +drm_sched_entity_stats_put(struct drm_sched_entity_stats *stats)
>> +{
>> + kref_put(&stats->kref, drm_sched_entity_stats_release);
>> +}
>> +
>> +static inline void
>> +drm_sched_entity_stats_job_add_gpu_time(struct drm_sched_job *job)
>> +{
>> + struct drm_sched_entity_stats *stats = job->entity_stats;
>> + struct drm_sched_fence *s_fence = job->s_fence;
>> + ktime_t start, end;
>> +
>> + start = dma_fence_timestamp(&s_fence->scheduled);
>> + end = dma_fence_timestamp(&s_fence->finished);
>> +
>> + spin_lock(&stats->lock);
>> + stats->runtime = ktime_add(stats->runtime, ktime_sub(end, start));
>> + spin_unlock(&stats->lock);
>> +}
>> +
>> #endif
>> diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/
>> scheduler/sched_main.c
>> index f87bb4681b93..22cc0dd536db 100644
>> --- a/drivers/gpu/drm/scheduler/sched_main.c
>> +++ b/drivers/gpu/drm/scheduler/sched_main.c
>> @@ -620,6 +620,7 @@ void drm_sched_job_arm(struct drm_sched_job *job)
>> job->sched = sched;
>> job->s_priority = entity->priority;
>> + job->entity_stats = drm_sched_entity_stats_get(entity->stats);
>> drm_sched_fence_init(job->s_fence, job->entity);
>> }
>> @@ -810,6 +811,7 @@ void drm_sched_job_cleanup(struct drm_sched_job *job)
>> * been called.
>> */
>> dma_fence_put(&job->s_fence->finished);
>> + drm_sched_entity_stats_put(job->entity_stats);
>> } else {
>> /* The job was aborted before it has been committed to be run;
>> * notably, drm_sched_job_arm() has not been called.
>> @@ -958,8 +960,10 @@ static void drm_sched_free_job_work(struct
>> work_struct *w)
>> container_of(w, struct drm_gpu_scheduler, work_free_job);
>> struct drm_sched_job *job;
>> - while ((job = drm_sched_get_finished_job(sched)))
>> + while ((job = drm_sched_get_finished_job(sched))) {
>> + drm_sched_entity_stats_job_add_gpu_time(job);
>> sched->ops->free_job(job);
>> + }
>> drm_sched_run_job_queue(sched);
>> }
>> diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
>> index 9f8b3b78d24d..cbbcd1c05154 100644
>> --- a/include/drm/gpu_scheduler.h
>> +++ b/include/drm/gpu_scheduler.h
>> @@ -71,6 +71,8 @@ enum drm_sched_priority {
>> DRM_SCHED_PRIORITY_COUNT
>> };
>> +struct drm_sched_entity_stats;
>> +
>> /**
>> * struct drm_sched_entity - A wrapper around a job queue (typically
>> * attached to the DRM file_priv).
>> @@ -109,6 +111,8 @@ struct drm_sched_entity {
>> */
>> struct drm_sched_rq *rq;
>> + struct drm_sched_entity_stats *stats;
>> +
>> /**
>> * @sched_list:
>> *
>> @@ -355,6 +359,7 @@ struct drm_sched_job {
>> struct drm_sched_fence *s_fence;
>> struct drm_sched_entity *entity;
>> + struct drm_sched_entity_stats *entity_stats;
>> enum drm_sched_priority s_priority;
>> u32 credits;
>
More information about the dri-devel
mailing list