| Message ID | 20250509153352.7187-7-tvrtko.ursulin@igalia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Some (drm_sched_|dma_)fence lifetime issues | expand |
On 5/9/25 17:33, Tvrtko Ursulin wrote: > Make the implementation use the previously added helper for accessing the > driver and timeline name. This will enable more coverage later when > asserts will be added into them. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> I would squash that together with the previous patch. Since both patches are for the same component it doesn't make much sense to separate them. Anyway Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/dma-buf/dma-fence.c | 9 +++++---- > include/trace/events/dma_fence.h | 4 ++-- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c > index 33661658f684..dc2456f68685 100644 > --- a/drivers/dma-buf/dma-fence.c > +++ b/drivers/dma-buf/dma-fence.c > @@ -538,8 +538,8 @@ void dma_fence_release(struct kref *kref) > if (WARN(!list_empty(&fence->cb_list) && > !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags), > "Fence %s:%s:%llx:%llx released with pending signals!\n", > - fence->ops->get_driver_name(fence), > - fence->ops->get_timeline_name(fence), > + dma_fence_driver_name(fence), > + dma_fence_timeline_name(fence), > fence->context, fence->seqno)) { > unsigned long flags; > > @@ -983,8 +983,9 @@ EXPORT_SYMBOL(dma_fence_set_deadline); > void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq) > { > seq_printf(seq, "%s %s seq %llu %ssignalled\n", > - fence->ops->get_driver_name(fence), > - fence->ops->get_timeline_name(fence), fence->seqno, > + dma_fence_driver_name(fence), > + dma_fence_timeline_name(fence), > + fence->seqno, > dma_fence_is_signaled(fence) ? "" : "un"); > } > EXPORT_SYMBOL(dma_fence_describe); > diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h > index a4de3df8500b..84c83074ee81 100644 > --- a/include/trace/events/dma_fence.h > +++ b/include/trace/events/dma_fence.h > @@ -16,8 +16,8 @@ DECLARE_EVENT_CLASS(dma_fence, > TP_ARGS(fence), > > TP_STRUCT__entry( > - __string(driver, fence->ops->get_driver_name(fence)) > - __string(timeline, fence->ops->get_timeline_name(fence)) > + __string(driver, dma_fence_driver_name(fence)) > + __string(timeline, dma_fence_timeline_name(fence)) > __field(unsigned int, context) > __field(unsigned int, seqno) > ),
On 12/05/2025 09:22, Christian König wrote: > On 5/9/25 17:33, Tvrtko Ursulin wrote: >> Make the implementation use the previously added helper for accessing the >> driver and timeline name. This will enable more coverage later when >> asserts will be added into them. >> >> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> > > I would squash that together with the previous patch. Since both patches are for the same component it doesn't make much sense to separate them. > > Anyway Reviewed-by: Christian König <christian.koenig@amd.com> Squashed locally and I kept your r-b. Regards, Tvrtko >> --- >> drivers/dma-buf/dma-fence.c | 9 +++++---- >> include/trace/events/dma_fence.h | 4 ++-- >> 2 files changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c >> index 33661658f684..dc2456f68685 100644 >> --- a/drivers/dma-buf/dma-fence.c >> +++ b/drivers/dma-buf/dma-fence.c >> @@ -538,8 +538,8 @@ void dma_fence_release(struct kref *kref) >> if (WARN(!list_empty(&fence->cb_list) && >> !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags), >> "Fence %s:%s:%llx:%llx released with pending signals!\n", >> - fence->ops->get_driver_name(fence), >> - fence->ops->get_timeline_name(fence), >> + dma_fence_driver_name(fence), >> + dma_fence_timeline_name(fence), >> fence->context, fence->seqno)) { >> unsigned long flags; >> >> @@ -983,8 +983,9 @@ EXPORT_SYMBOL(dma_fence_set_deadline); >> void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq) >> { >> seq_printf(seq, "%s %s seq %llu %ssignalled\n", >> - fence->ops->get_driver_name(fence), >> - fence->ops->get_timeline_name(fence), fence->seqno, >> + dma_fence_driver_name(fence), >> + dma_fence_timeline_name(fence), >> + fence->seqno, >> dma_fence_is_signaled(fence) ? "" : "un"); >> } >> EXPORT_SYMBOL(dma_fence_describe); >> diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h >> index a4de3df8500b..84c83074ee81 100644 >> --- a/include/trace/events/dma_fence.h >> +++ b/include/trace/events/dma_fence.h >> @@ -16,8 +16,8 @@ DECLARE_EVENT_CLASS(dma_fence, >> TP_ARGS(fence), >> >> TP_STRUCT__entry( >> - __string(driver, fence->ops->get_driver_name(fence)) >> - __string(timeline, fence->ops->get_timeline_name(fence)) >> + __string(driver, dma_fence_driver_name(fence)) >> + __string(timeline, dma_fence_timeline_name(fence)) >> __field(unsigned int, context) >> __field(unsigned int, seqno) >> ), >
diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 33661658f684..dc2456f68685 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -538,8 +538,8 @@ void dma_fence_release(struct kref *kref) if (WARN(!list_empty(&fence->cb_list) && !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags), "Fence %s:%s:%llx:%llx released with pending signals!\n", - fence->ops->get_driver_name(fence), - fence->ops->get_timeline_name(fence), + dma_fence_driver_name(fence), + dma_fence_timeline_name(fence), fence->context, fence->seqno)) { unsigned long flags; @@ -983,8 +983,9 @@ EXPORT_SYMBOL(dma_fence_set_deadline); void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq) { seq_printf(seq, "%s %s seq %llu %ssignalled\n", - fence->ops->get_driver_name(fence), - fence->ops->get_timeline_name(fence), fence->seqno, + dma_fence_driver_name(fence), + dma_fence_timeline_name(fence), + fence->seqno, dma_fence_is_signaled(fence) ? "" : "un"); } EXPORT_SYMBOL(dma_fence_describe); diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h index a4de3df8500b..84c83074ee81 100644 --- a/include/trace/events/dma_fence.h +++ b/include/trace/events/dma_fence.h @@ -16,8 +16,8 @@ DECLARE_EVENT_CLASS(dma_fence, TP_ARGS(fence), TP_STRUCT__entry( - __string(driver, fence->ops->get_driver_name(fence)) - __string(timeline, fence->ops->get_timeline_name(fence)) + __string(driver, dma_fence_driver_name(fence)) + __string(timeline, dma_fence_timeline_name(fence)) __field(unsigned int, context) __field(unsigned int, seqno) ),
Make the implementation use the previously added helper for accessing the driver and timeline name. This will enable more coverage later when asserts will be added into them. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> --- drivers/dma-buf/dma-fence.c | 9 +++++---- include/trace/events/dma_fence.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)