From: Tvrtko Ursulin <[email protected]> The `v3d_stats` sequence counter uses regular seqcount helpers, which carry lockdep annotations that expect a consistent IRQ context between all writers. However, lockdep is unable to detect that v3d's readers are never in IRQ or softirq context, and that for CPU job queues, even the write side never is. This led to false positive that were previously worked around by conditionally disabling local IRQs under IS_ENABLED(CONFIG_LOCKDEP).
Switch to the raw seqcount helpers which skip lockdep tracking entirely. This is safe because jobs are fully serialized per queue: the next job can only be queued after the previous one has been signaled, so there is no scope for the start and update paths to race on the same seqcount. Signed-off-by: Tvrtko Ursulin <[email protected]> Co-developed-by: Maíra Canal <[email protected]> Signed-off-by: Maíra Canal <[email protected]> --- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.h | 5 ++++ drivers/gpu/drm/v3d/v3d_sched.c | 54 ++++++++--------------------------------- 3 files changed, 16 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index acdfd43af9ee4b66bf7c39ba8160106e4726738a..16aef2a5ecd218b8c04bc0097263554e5d7ad954 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -194,7 +194,7 @@ void v3d_get_stats(const struct v3d_stats *stats, u64 timestamp, unsigned int seq; do { - seq = read_seqcount_begin(&stats->lock); + seq = raw_read_seqcount_begin(&stats->lock); *active_runtime = stats->enabled_ns; if (stats->start_ns) *active_runtime += timestamp - stats->start_ns; diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index 314213c2671003862c486a1a7237af5480afa9e4..2e5520015e08c47fef4bfbf185eda15027992032 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -46,6 +46,11 @@ struct v3d_stats { * This seqcount is used to protect the access to the GPU stats * variables. It must be used as, while we are reading the stats, * IRQs can happen and the stats can be updated. + * + * However, we use the raw seqcount helpers to interact with this lock + * to avoid false positives from lockdep, which is unable to detect that + * our readers are never from irq or softirq context, and that, for CPU + * job queues, even the write side never is. */ seqcount_t lock; }; diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c index 6dc871fc9a62303da4fbc62b612c3a797fe762de..18265721c1d32158fa6f7e68fa3e70a77d265b9d 100644 --- a/drivers/gpu/drm/v3d/v3d_sched.c +++ b/drivers/gpu/drm/v3d/v3d_sched.c @@ -144,54 +144,28 @@ v3d_job_start_stats(struct v3d_job *job, enum v3d_queue queue) struct v3d_stats *global_stats = &v3d->queue[queue].stats; struct v3d_stats *local_stats = &file->stats[queue]; u64 now = local_clock(); - unsigned long flags; - /* - * We only need to disable local interrupts to appease lockdep who - * otherwise would think v3d_job_start_stats vs v3d_stats_update has an - * unsafe in-irq vs no-irq-off usage problem. This is a false positive - * because all the locks are per queue and stats type, and all jobs are - * completely one at a time serialised. More specifically: - * - * 1. Locks for GPU queues are updated from interrupt handlers under a - * spin lock and started here with preemption disabled. - * - * 2. Locks for CPU queues are updated from the worker with preemption - * disabled and equally started here with preemption disabled. - * - * Therefore both are consistent. - * - * 3. Because next job can only be queued after the previous one has - * been signaled, and locks are per queue, there is also no scope for - * the start part to race with the update part. - */ - if (IS_ENABLED(CONFIG_LOCKDEP)) - local_irq_save(flags); - else - preempt_disable(); + preempt_disable(); - write_seqcount_begin(&local_stats->lock); + raw_write_seqcount_begin(&local_stats->lock); local_stats->start_ns = now; - write_seqcount_end(&local_stats->lock); + raw_write_seqcount_end(&local_stats->lock); - write_seqcount_begin(&global_stats->lock); + raw_write_seqcount_begin(&global_stats->lock); global_stats->start_ns = now; - write_seqcount_end(&global_stats->lock); + raw_write_seqcount_end(&global_stats->lock); - if (IS_ENABLED(CONFIG_LOCKDEP)) - local_irq_restore(flags); - else - preempt_enable(); + preempt_enable(); } static void v3d_stats_update(struct v3d_stats *stats, u64 now) { - write_seqcount_begin(&stats->lock); + raw_write_seqcount_begin(&stats->lock); stats->enabled_ns += now - stats->start_ns; stats->jobs_completed++; stats->start_ns = 0; - write_seqcount_end(&stats->lock); + raw_write_seqcount_end(&stats->lock); } void @@ -201,13 +175,8 @@ v3d_job_update_stats(struct v3d_job *job, enum v3d_queue q) struct v3d_queue_state *queue = &v3d->queue[q]; struct v3d_stats *global_stats = &queue->stats; u64 now = local_clock(); - unsigned long flags; - /* See comment in v3d_job_start_stats() */ - if (IS_ENABLED(CONFIG_LOCKDEP)) - local_irq_save(flags); - else - preempt_disable(); + preempt_disable(); /* Don't update the local stats if the file context has already closed */ spin_lock(&queue->queue_lock); @@ -217,10 +186,7 @@ v3d_job_update_stats(struct v3d_job *job, enum v3d_queue q) v3d_stats_update(global_stats, now); - if (IS_ENABLED(CONFIG_LOCKDEP)) - local_irq_restore(flags); - else - preempt_enable(); + preempt_enable(); } static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job) -- 2.52.0
