On Fri, Sep 03, 2021 at 11:47:52AM -0700, Rob Clark wrote:

From: Rob Clark robdclark@chromium.org

Add a way to hint to the fence signaler of an upcoming deadline, such as vblank, which the fence waiter would prefer not to miss. This is to aid the fence signaler in making power management decisions, like boosting frequency as the deadline approaches and awareness of missing deadlines so that can be factored in to the frequency scaling.

v2: Drop dma_fence::deadline and related logic to filter duplicate deadlines, to avoid increasing dma_fence size. The fence-context implementation will need similar logic to track deadlines of all the fences on the same timeline. [ckoenig]

Signed-off-by: Rob Clark robdclark@chromium.org Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Rob Clark robdclark@chromium.org

---

drivers/dma-buf/dma-fence.c | 20 ++++++++++++++++++++ include/linux/dma-fence.h | 16 ++++++++++++++++ 2 files changed, 36 insertions(+)

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index ce0f5eff575d..1f444863b94d 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -910,6 +910,26 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, } EXPORT_SYMBOL(dma_fence_wait_any_timeout);

+/**

• • dma_fence_set_deadline - set desired fence-wait deadline
• • @fence: the fence that is to be waited on
• • @deadline: the time by which the waiter hopes for the fence to be

• •        signaled
    

• • Inform the fence signaler of an upcoming deadline, such as vblank, by
• • which point the waiter would prefer the fence to be signaled by. This
• • is intended to give feedback to the fence signaler to aid in power
• • management decisions, such as boosting GPU frequency if a periodic
• • vblank deadline is approaching.
• */

+void dma_fence_set_deadline(struct dma_fence *fence, ktime_t deadline) +{

• if (fence->ops->set_deadline && !dma_fence_is_signaled(fence))

• fence->ops->set_deadline(fence, deadline);
  

+} +EXPORT_SYMBOL(dma_fence_set_deadline);

/**

• dma_fence_init - Initialize a custom fence.
• @fence: the fence to initialize

diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 6ffb4b2c6371..9c809f0d5d0a 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -99,6 +99,7 @@ enum dma_fence_flag_bits { DMA_FENCE_FLAG_SIGNALED_BIT, DMA_FENCE_FLAG_TIMESTAMP_BIT, DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,

• DMA_FENCE_FLAG_HAS_DEADLINE_BIT, DMA_FENCE_FLAG_USER_BITS, /* must always be last member */

}; @@ -261,6 +262,19 @@ struct dma_fence_ops { */ void (*timeline_value_str)(struct dma_fence *fence, char *str, int size);

• /**

• * @set_deadline:
  

• *
  

• * Callback to allow a fence waiter to inform the fence signaler of an
  

• * upcoming deadline, such as vblank, by which point the waiter would
  

• * prefer the fence to be signaled by.  This is intended to give feedback
  

• * to the fence signaler to aid in power management decisions, such as
  

• * boosting GPU frequency.
  

Please add here that this callback is called without &dma_fence.lock held, and that locking is up to callers if they have some state to manage.

I realized that while scratching some heads over your later patches. -Daniel

• *
  

• * This callback is optional.
  

• */
  

• void (*set_deadline)(struct dma_fence *fence, ktime_t deadline);

}; void dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops, @@ -586,6 +600,8 @@ static inline signed long dma_fence_wait(struct dma_fence *fence, bool intr) return ret < 0 ? ret : 0; } +void dma_fence_set_deadline(struct dma_fence *fence, ktime_t deadline);

struct dma_fence *dma_fence_get_stub(void); struct dma_fence *dma_fence_allocate_private_stub(void); u64 dma_fence_context_alloc(unsigned num); -- 2.31.1

On Fri, Sep 03, 2021 at 11:47:55AM -0700, Rob Clark wrote:

From: Rob Clark robdclark@chromium.org

As the finished fence is the one that is exposed to userspace, and therefore the one that other operations, like atomic update, would block on, we need to propagate the deadline from from the finished fence to the actual hw fence.

v2: Split into drm_sched_fence_set_parent() (ckoenig)

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/gpu/drm/scheduler/sched_fence.c | 34 +++++++++++++++++++++++++ drivers/gpu/drm/scheduler/sched_main.c | 2 +- include/drm/gpu_scheduler.h | 8 ++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index bcea035cf4c6..4fc41a71d1c7 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -128,6 +128,30 @@ static void drm_sched_fence_release_finished(struct dma_fence *f) dma_fence_put(&fence->scheduled); } +static void drm_sched_fence_set_deadline_finished(struct dma_fence *f,

• 				  ktime_t deadline)
  

+{

• struct drm_sched_fence *fence = to_drm_sched_fence(f);
• unsigned long flags;
• spin_lock_irqsave(&fence->lock, flags);
• /* If we already have an earlier deadline, keep it: */
• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags) &&

•    ktime_before(fence->deadline, deadline)) {
  

• spin_unlock_irqrestore(&fence->lock, flags);
  

• return;
  

• }
• fence->deadline = deadline;
• set_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags);
• spin_unlock_irqrestore(&fence->lock, flags);
• if (fence->parent)

• dma_fence_set_deadline(fence->parent, deadline);
  

+}

static const struct dma_fence_ops drm_sched_fence_ops_scheduled = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name, @@ -138,6 +162,7 @@ static const struct dma_fence_ops drm_sched_fence_ops_finished = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name, .release = drm_sched_fence_release_finished,

• .set_deadline = drm_sched_fence_set_deadline_finished,

}; struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) @@ -152,6 +177,15 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) } EXPORT_SYMBOL(to_drm_sched_fence); +void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence,

• 		struct dma_fence *fence)
  

+{

• s_fence->parent = dma_fence_get(fence);
• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT,

•      &s_fence->finished.flags))
  

Don't you need the spinlock here too to avoid races? test_bit is very unordered, so guarantees nothing. Spinlock would need to be both around ->parent = and the test_bit.

Entirely aside, but there's discussions going on to preallocate the hw fence somehow. If we do that we could make the deadline forwarding lockless here. Having a spinlock just to set the parent is a bit annoying ...

Alternative is that you do this locklessly with barriers and a _lot_ of comments. Would be good to benchmark whether the overhead matters though first. -Daniel

• dma_fence_set_deadline(fence, s_fence->deadline);
  

+}

struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *entity, void *owner) { diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 595e47ff7d06..27bf0ac0625f 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -978,7 +978,7 @@ static int drm_sched_main(void *param) drm_sched_fence_scheduled(s_fence); if (!IS_ERR_OR_NULL(fence)) {

• 	s_fence->parent = dma_fence_get(fence);
  

• 	drm_sched_fence_set_parent(s_fence, fence);
  r = dma_fence_add_callback(fence, &sched_job->cb,
  			   drm_sched_job_done_cb);
  if (r == -ENOENT)
  

diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 7f77a455722c..158ddd662469 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -238,6 +238,12 @@ struct drm_sched_fence { */ struct dma_fence finished;

• /**

• * @deadline: deadline set on &drm_sched_fence.finished which
  

• * potentially needs to be propagated to &drm_sched_fence.parent
  

• */
  

• ktime_t deadline;

•    /**
      * @parent: the fence returned by &drm_sched_backend_ops.run_job
      * when scheduling the job on hardware. We signal the
  

@@ -505,6 +511,8 @@ void drm_sched_entity_set_priority(struct drm_sched_entity *entity, enum drm_sched_priority priority); bool drm_sched_entity_is_ready(struct drm_sched_entity *entity); +void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence,

• 		struct dma_fence *fence);
  

struct drm_sched_fence *drm_sched_fence_alloc( struct drm_sched_entity *s_entity, void *owner); void drm_sched_fence_init(struct drm_sched_fence *fence, -- 2.31.1

On Thu, Sep 09, 2021 at 08:22:59AM +0200, Christian König wrote:

Am 08.09.21 um 19:45 schrieb Daniel Vetter:

...

On Fri, Sep 03, 2021 at 11:47:55AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

As the finished fence is the one that is exposed to userspace, and therefore the one that other operations, like atomic update, would block on, we need to propagate the deadline from from the finished fence to the actual hw fence.

v2: Split into drm_sched_fence_set_parent() (ckoenig)

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/gpu/drm/scheduler/sched_fence.c | 34 +++++++++++++++++++++++++ drivers/gpu/drm/scheduler/sched_main.c | 2 +- include/drm/gpu_scheduler.h | 8 ++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index bcea035cf4c6..4fc41a71d1c7 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -128,6 +128,30 @@ static void drm_sched_fence_release_finished(struct dma_fence *f) dma_fence_put(&fence->scheduled); } +static void drm_sched_fence_set_deadline_finished(struct dma_fence *f,

• 				  ktime_t deadline)
  

+{

• struct drm_sched_fence *fence = to_drm_sched_fence(f);
• unsigned long flags;
• spin_lock_irqsave(&fence->lock, flags);
• /* If we already have an earlier deadline, keep it: */
• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags) &&

•    ktime_before(fence->deadline, deadline)) {
  

• spin_unlock_irqrestore(&fence->lock, flags);
  

• return;
  

• }
• fence->deadline = deadline;
• set_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags);
• spin_unlock_irqrestore(&fence->lock, flags);
• if (fence->parent)

• dma_fence_set_deadline(fence->parent, deadline);
  

+}

• static const struct dma_fence_ops drm_sched_fence_ops_scheduled = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name,

@@ -138,6 +162,7 @@ static const struct dma_fence_ops drm_sched_fence_ops_finished = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name, .release = drm_sched_fence_release_finished,

• .set_deadline = drm_sched_fence_set_deadline_finished, }; struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f)

@@ -152,6 +177,15 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) } EXPORT_SYMBOL(to_drm_sched_fence); +void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence,

• 		struct dma_fence *fence)
  

+{

• s_fence->parent = dma_fence_get(fence);
• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT,

•      &s_fence->finished.flags))
  

Don't you need the spinlock here too to avoid races? test_bit is very unordered, so guarantees nothing. Spinlock would need to be both around ->parent = and the test_bit.

Entirely aside, but there's discussions going on to preallocate the hw fence somehow. If we do that we could make the deadline forwarding lockless here. Having a spinlock just to set the parent is a bit annoying

Well previously we didn't needed the spinlock to set the parent because the parent wasn't used outside of the main thread.

This becomes an issue now because we can race with setting the deadline. So yeah we probably do need the spinlock here now.

Yeah tbh this is the part I don't like, because it means the scheduler thread locking becomes more complex.

We might need to look at this again when we include stuff like boosting priorities and things like that. Maybe it would be better if we have a request queue which the scheduler thread could then pick up whenever it gets around to the next scheduling decision?

I think for now just the spinlock in more places should be fine. -Daniel

Christian.

...

...

Alternative is that you do this locklessly with barriers and a _lot_ of comments. Would be good to benchmark whether the overhead matters though first. -Daniel

...

• dma_fence_set_deadline(fence, s_fence->deadline);
  

+}

• struct drm_sched_fence *drm_sched_fence_alloc(struct drm_sched_entity *entity, void *owner) {

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 595e47ff7d06..27bf0ac0625f 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -978,7 +978,7 @@ static int drm_sched_main(void *param) drm_sched_fence_scheduled(s_fence); if (!IS_ERR_OR_NULL(fence)) {

• 	s_fence->parent = dma_fence_get(fence);
  

• 	drm_sched_fence_set_parent(s_fence, fence);
  r = dma_fence_add_callback(fence, &sched_job->cb,
  			   drm_sched_job_done_cb);
  if (r == -ENOENT)
  

diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 7f77a455722c..158ddd662469 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -238,6 +238,12 @@ struct drm_sched_fence { */ struct dma_fence finished;

• /**

• * @deadline: deadline set on &drm_sched_fence.finished which
  

• * potentially needs to be propagated to &drm_sched_fence.parent
  

• */
  

• ktime_t deadline;

•     /**
       * @parent: the fence returned by &drm_sched_backend_ops.run_job
       * when scheduling the job on hardware. We signal the
  

@@ -505,6 +511,8 @@ void drm_sched_entity_set_priority(struct drm_sched_entity *entity, enum drm_sched_priority priority); bool drm_sched_entity_is_ready(struct drm_sched_entity *entity); +void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence,

• 		struct dma_fence *fence);
  

  struct drm_sched_fence *drm_sched_fence_alloc( struct drm_sched_entity *s_entity, void *owner); void drm_sched_fence_init(struct drm_sched_fence *fence,

-- 2.31.1

On Tue, Sep 21, 2021 at 8:57 AM Rob Clark robdclark@gmail.com wrote:

On Wed, Sep 8, 2021 at 10:45 AM Daniel Vetter daniel@ffwll.ch wrote:

...

On Fri, Sep 03, 2021 at 11:47:55AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

As the finished fence is the one that is exposed to userspace, and therefore the one that other operations, like atomic update, would block on, we need to propagate the deadline from from the finished fence to the actual hw fence.

v2: Split into drm_sched_fence_set_parent() (ckoenig)

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/gpu/drm/scheduler/sched_fence.c | 34 +++++++++++++++++++++++++ drivers/gpu/drm/scheduler/sched_main.c | 2 +- include/drm/gpu_scheduler.h | 8 ++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index bcea035cf4c6..4fc41a71d1c7 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -128,6 +128,30 @@ static void drm_sched_fence_release_finished(struct dma_fence *f) dma_fence_put(&fence->scheduled); }

+static void drm_sched_fence_set_deadline_finished(struct dma_fence *f,

•                                           ktime_t deadline)
  

+{

• struct drm_sched_fence *fence = to_drm_sched_fence(f);
  

• unsigned long flags;
  

• spin_lock_irqsave(&fence->lock, flags);
  

• /* If we already have an earlier deadline, keep it: */
  

• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags) &&
  

•     ktime_before(fence->deadline, deadline)) {
  

•         spin_unlock_irqrestore(&fence->lock, flags);
  

•         return;
  

• }
  

• fence->deadline = deadline;
  

• set_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &f->flags);
  

• spin_unlock_irqrestore(&fence->lock, flags);
  

• if (fence->parent)
  

•         dma_fence_set_deadline(fence->parent, deadline);
  

+}

static const struct dma_fence_ops drm_sched_fence_ops_scheduled = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name, @@ -138,6 +162,7 @@ static const struct dma_fence_ops drm_sched_fence_ops_finished = { .get_driver_name = drm_sched_fence_get_driver_name, .get_timeline_name = drm_sched_fence_get_timeline_name, .release = drm_sched_fence_release_finished,

• .set_deadline = drm_sched_fence_set_deadline_finished,
  

};

struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) @@ -152,6 +177,15 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f) } EXPORT_SYMBOL(to_drm_sched_fence);

+void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence,

•                         struct dma_fence *fence)
  

+{

• s_fence->parent = dma_fence_get(fence);
  

• if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT,
  

•              &s_fence->finished.flags))
  

Don't you need the spinlock here too to avoid races? test_bit is very unordered, so guarantees nothing. Spinlock would need to be both around ->parent = and the test_bit.

Entirely aside, but there's discussions going on to preallocate the hw fence somehow. If we do that we could make the deadline forwarding lockless here. Having a spinlock just to set the parent is a bit annoying ...

Alternative is that you do this locklessly with barriers and a _lot_ of comments. Would be good to benchmark whether the overhead matters though first.

So, my thinking is that very few (well no) guarantees are made to the fence implementor that their ->set_deadline() is not called multiple times, from multiple threads, etc. And no guarantee that a later deadline is set after an earlier deadline has been set. It is all up to the set_deadline() implementation to deal with these cases.

So that means we just need the appropriate barrier-fu to ensure another thread calling drm_sched_fence_set_deadline_finished() sees fence->parent set before the test_bit. It could mean that the backend implementation sees the same deadline set twice, but that is fine.

something like:

----- diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index 4fc41a71d1c7..7f2af6d1777c 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -132,6 +132,7 @@ static void drm_sched_fence_set_deadline_finished(struct dma_fence *f, ktime_t deadline) { struct drm_sched_fence *fence = to_drm_sched_fence(f); + struct dma_fence *parent; unsigned long flags;

spin_lock_irqsave(&fence->lock, flags); @@ -148,8 +149,9 @@ static void drm_sched_fence_set_deadline_finished(struct dma_fence *f,

spin_unlock_irqrestore(&fence->lock, flags);

- if (fence->parent) - dma_fence_set_deadline(fence->parent, deadline); + parent = smp_load_acquire(&fence->parent); + if (parent) + dma_fence_set_deadline(parent, deadline); }

static const struct dma_fence_ops drm_sched_fence_ops_scheduled = { @@ -180,7 +182,7 @@ EXPORT_SYMBOL(to_drm_sched_fence); void drm_sched_fence_set_parent(struct drm_sched_fence *s_fence, struct dma_fence *fence) { - s_fence->parent = dma_fence_get(fence); + smp_store_release(&s_fence->parent, dma_fence_get(fence)); if (test_bit(DMA_FENCE_FLAG_HAS_DEADLINE_BIT, &s_fence->finished.flags)) dma_fence_set_deadline(fence, s_fence->deadline); -----

BR, -R

On Wed, Sep 8, 2021 at 10:48 AM Daniel Vetter daniel@ffwll.ch wrote:

On Fri, Sep 03, 2021 at 11:47:56AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

Signed-off-by: Rob Clark robdclark@chromium.org

Why do you need a kthread_work here? Is this just to make sure you're running at realtime prio? Maybe a comment to that effect would be good.

Mostly because we are already using a kthread_worker for things the GPU needs to kick off to a different context.. but I think this is something we'd want at a realtime prio

BR, -R

-Daniel

...

---

drivers/gpu/drm/msm/msm_fence.c | 76 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_fence.h | 20 +++++++ drivers/gpu/drm/msm/msm_gpu.h | 1 + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 20 +++++++ 4 files changed, 117 insertions(+)

diff --git a/drivers/gpu/drm/msm/msm_fence.c b/drivers/gpu/drm/msm/msm_fence.c index f2cece542c3f..67c2a96e1c85 100644 --- a/drivers/gpu/drm/msm/msm_fence.c +++ b/drivers/gpu/drm/msm/msm_fence.c @@ -8,6 +8,37 @@

#include "msm_drv.h" #include "msm_fence.h" +#include "msm_gpu.h"

+static inline bool fence_completed(struct msm_fence_context *fctx, uint32_t fence);

+static struct msm_gpu *fctx2gpu(struct msm_fence_context *fctx) +{

• struct msm_drm_private *priv = fctx->dev->dev_private;
  

• return priv->gpu;
  

+}

+static enum hrtimer_restart deadline_timer(struct hrtimer *t) +{

• struct msm_fence_context *fctx = container_of(t,
  

•                 struct msm_fence_context, deadline_timer);
  

• kthread_queue_work(fctx2gpu(fctx)->worker, &fctx->deadline_work);
  

• return HRTIMER_NORESTART;
  

+}

+static void deadline_work(struct kthread_work *work) +{

• struct msm_fence_context *fctx = container_of(work,
  

•                 struct msm_fence_context, deadline_work);
  

• /* If deadline fence has already passed, nothing to do: */
  

• if (fence_completed(fctx, fctx->next_deadline_fence))
  

•         return;
  

• msm_devfreq_boost(fctx2gpu(fctx), 2);
  

+}

struct msm_fence_context * @@ -26,6 +57,13 @@ msm_fence_context_alloc(struct drm_device *dev, volatile uint32_t *fenceptr, fctx->fenceptr = fenceptr; spin_lock_init(&fctx->spinlock);

• hrtimer_init(&fctx->deadline_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
  

• fctx->deadline_timer.function = deadline_timer;
  

• kthread_init_work(&fctx->deadline_work, deadline_work);
  

• fctx->next_deadline = ktime_get();
  

• return fctx;
  

}

@@ -49,6 +87,8 @@ void msm_update_fence(struct msm_fence_context *fctx, uint32_t fence) { spin_lock(&fctx->spinlock); fctx->completed_fence = max(fence, fctx->completed_fence);

• if (fence_completed(fctx, fctx->next_deadline_fence))
  

•         hrtimer_cancel(&fctx->deadline_timer);
  spin_unlock(&fctx->spinlock);
  

}

@@ -79,10 +119,46 @@ static bool msm_fence_signaled(struct dma_fence *fence) return fence_completed(f->fctx, f->base.seqno); }

+static void msm_fence_set_deadline(struct dma_fence *fence, ktime_t deadline) +{

• struct msm_fence *f = to_msm_fence(fence);
  

• struct msm_fence_context *fctx = f->fctx;
  

• unsigned long flags;
  

• ktime_t now;
  

• spin_lock_irqsave(&fctx->spinlock, flags);
  

• now = ktime_get();
  

• if (ktime_after(now, fctx->next_deadline) ||
  

•                 ktime_before(deadline, fctx->next_deadline)) {
  

•         fctx->next_deadline = deadline;
  

•         fctx->next_deadline_fence =
  

•                 max(fctx->next_deadline_fence, (uint32_t)fence->seqno);
  

•         /*
  

•          * Set timer to trigger boost 3ms before deadline, or
  

•          * if we are already less than 3ms before the deadline
  

•          * schedule boost work immediately.
  

•          */
  

•         deadline = ktime_sub(deadline, ms_to_ktime(3));
  

•         if (ktime_after(now, deadline)) {
  

•                 kthread_queue_work(fctx2gpu(fctx)->worker,
  

•                                 &fctx->deadline_work);
  

•         } else {
  

•                 hrtimer_start(&fctx->deadline_timer, deadline,
  

•                                 HRTIMER_MODE_ABS);
  

•         }
  

• }
  

• spin_unlock_irqrestore(&fctx->spinlock, flags);
  

+}

static const struct dma_fence_ops msm_fence_ops = { .get_driver_name = msm_fence_get_driver_name, .get_timeline_name = msm_fence_get_timeline_name, .signaled = msm_fence_signaled,

• .set_deadline = msm_fence_set_deadline,
  

};

struct dma_fence * diff --git a/drivers/gpu/drm/msm/msm_fence.h b/drivers/gpu/drm/msm/msm_fence.h index 4783db528bcc..d34e853c555a 100644 --- a/drivers/gpu/drm/msm/msm_fence.h +++ b/drivers/gpu/drm/msm/msm_fence.h @@ -50,6 +50,26 @@ struct msm_fence_context { volatile uint32_t *fenceptr;

  spinlock_t spinlock;

• /*
  

•  * TODO this doesn't really deal with multiple deadlines, like
  

•  * if userspace got multiple frames ahead.. OTOH atomic updates
  

•  * don't queue, so maybe that is ok
  

•  */
  

• /** next_deadline: Time of next deadline */
  

• ktime_t next_deadline;
  

• /**
  

•  * next_deadline_fence:
  

•  *
  

•  * Fence value for next pending deadline.  The deadline timer is
  

•  * canceled when this fence is signaled.
  

•  */
  

• uint32_t next_deadline_fence;
  

• struct hrtimer deadline_timer;
  

• struct kthread_work deadline_work;
  

};

struct msm_fence_context * msm_fence_context_alloc(struct drm_device *dev, diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 0e4b45bff2e6..e031c9b495ed 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -425,6 +425,7 @@ void msm_devfreq_init(struct msm_gpu *gpu); void msm_devfreq_cleanup(struct msm_gpu *gpu); void msm_devfreq_resume(struct msm_gpu *gpu); void msm_devfreq_suspend(struct msm_gpu *gpu); +void msm_devfreq_boost(struct msm_gpu *gpu, unsigned factor); void msm_devfreq_active(struct msm_gpu *gpu); void msm_devfreq_idle(struct msm_gpu *gpu);

diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c index 0a1ee20296a2..8a8d7b9028a3 100644 --- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c +++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c @@ -144,6 +144,26 @@ void msm_devfreq_suspend(struct msm_gpu *gpu) devfreq_suspend_device(gpu->devfreq.devfreq); }

+void msm_devfreq_boost(struct msm_gpu *gpu, unsigned factor) +{

• struct msm_gpu_devfreq *df = &gpu->devfreq;
  

• unsigned long freq;
  

• /*
  

•  * Hold devfreq lock to synchronize with get_dev_status()/
  

•  * target() callbacks
  

•  */
  

• mutex_lock(&df->devfreq->lock);
  

• freq = get_freq(gpu);
  

• freq *= factor;
  

• msm_devfreq_target(&gpu->pdev->dev, &freq, 0);
  

• mutex_unlock(&df->devfreq->lock);
  

+}

void msm_devfreq_active(struct msm_gpu *gpu) { struct msm_gpu_devfreq *df = &gpu->devfreq; -- 2.31.1

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

On Fri, Sep 03, 2021 at 11:47:57AM -0700, Rob Clark wrote:

From: Rob Clark robdclark@chromium.org

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/dma-buf/dma-fence-array.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c index d3fbd950be94..8d194b09ee3d 100644 --- a/drivers/dma-buf/dma-fence-array.c +++ b/drivers/dma-buf/dma-fence-array.c @@ -119,12 +119,23 @@ static void dma_fence_array_release(struct dma_fence *fence) dma_fence_free(fence); } +static void dma_fence_array_set_deadline(struct dma_fence *fence,

• 			 ktime_t deadline)
  

+{

• struct dma_fence_array *array = to_dma_fence_array(fence);
• unsigned i;
• for (i = 0; i < array->num_fences; ++i)

• dma_fence_set_deadline(array->fences[i], deadline);
  

Hm I wonder whether this can go wrong, and whether we need Christian's massive fence iterator that I've seen flying around. If you nest these things too much it could all go wrong I think. I looked at other users which inspect dma_fence_array and none of them have a risk for unbounded recursion.

Maybe check with Christian. -Daniel

+}

const struct dma_fence_ops dma_fence_array_ops = { .get_driver_name = dma_fence_array_get_driver_name, .get_timeline_name = dma_fence_array_get_timeline_name, .enable_signaling = dma_fence_array_enable_signaling, .signaled = dma_fence_array_signaled, .release = dma_fence_array_release,

• .set_deadline = dma_fence_array_set_deadline,

}; EXPORT_SYMBOL(dma_fence_array_ops); -- 2.31.1

On Wed, Sep 8, 2021 at 10:54 AM Daniel Vetter daniel@ffwll.ch wrote:

On Fri, Sep 03, 2021 at 11:47:58AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/dma-buf/dma-fence-chain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)

diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c index 1b4cb3e5cec9..736a9ad3ea6d 100644 --- a/drivers/dma-buf/dma-fence-chain.c +++ b/drivers/dma-buf/dma-fence-chain.c @@ -208,6 +208,18 @@ static void dma_fence_chain_release(struct dma_fence *fence) dma_fence_free(fence); }

+static void dma_fence_chain_set_deadline(struct dma_fence *fence,

•                                  ktime_t deadline)
  

+{

• dma_fence_chain_for_each(fence, fence) {
  

•         struct dma_fence_chain *chain = to_dma_fence_chain(fence);
  

•         struct dma_fence *f = chain ? chain->fence : fence;
  

Doesn't this just end up calling set_deadline on a chain, potenetially resulting in recursion? Also I don't think this should ever happen, why did you add that?

Tbh the fence-chain was the part I was a bit fuzzy about, and the main reason I added igt tests. The iteration is similar to how, for ex, dma_fence_chain_signaled() work, and according to the igt test it does what was intended

BR, -R

-Daniel

...

•         dma_fence_set_deadline(f, deadline);
  

• }
  

+}

const struct dma_fence_ops dma_fence_chain_ops = { .use_64bit_seqno = true, .get_driver_name = dma_fence_chain_get_driver_name, @@ -215,6 +227,7 @@ const struct dma_fence_ops dma_fence_chain_ops = { .enable_signaling = dma_fence_chain_enable_signaling, .signaled = dma_fence_chain_signaled, .release = dma_fence_chain_release,

• .set_deadline = dma_fence_chain_set_deadline,
  

}; EXPORT_SYMBOL(dma_fence_chain_ops);

-- 2.31.1

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

Am 08.09.21 um 20:45 schrieb Daniel Vetter:

On Wed, Sep 08, 2021 at 11:19:15AM -0700, Rob Clark wrote:

...

On Wed, Sep 8, 2021 at 10:54 AM Daniel Vetter daniel@ffwll.ch wrote:

...

On Fri, Sep 03, 2021 at 11:47:58AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/dma-buf/dma-fence-chain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)

diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c index 1b4cb3e5cec9..736a9ad3ea6d 100644 --- a/drivers/dma-buf/dma-fence-chain.c +++ b/drivers/dma-buf/dma-fence-chain.c @@ -208,6 +208,18 @@ static void dma_fence_chain_release(struct dma_fence *fence) dma_fence_free(fence); }

+static void dma_fence_chain_set_deadline(struct dma_fence *fence,

•                                  ktime_t deadline)
  

+{

• dma_fence_chain_for_each(fence, fence) {
  

•         struct dma_fence_chain *chain = to_dma_fence_chain(fence);
  

•         struct dma_fence *f = chain ? chain->fence : fence;
  

Doesn't this just end up calling set_deadline on a chain, potenetially resulting in recursion? Also I don't think this should ever happen, why did you add that?

Tbh the fence-chain was the part I was a bit fuzzy about, and the main reason I added igt tests. The iteration is similar to how, for ex, dma_fence_chain_signaled() work, and according to the igt test it does what was intended

Huh indeed. Maybe something we should fix, like why does the dma_fence_chain_for_each not give you the upcast chain pointer ... I guess this also needs more Christian and less me.

Yeah I was also already thinking about having a dma_fence_chain_for_each_contained() macro which directly returns the containing fence, just didn't had time to implement/clean that up.

And yes the patch is correct as it is and avoid the recursion, so Reviewed-by: Christian König christian.koenig@amd.com for this one.

Regards, Christian.

-Daniel

...

BR, -R

...

-Daniel

...

•         dma_fence_set_deadline(f, deadline);
  

• }
  

+}

• const struct dma_fence_ops dma_fence_chain_ops = { .use_64bit_seqno = true, .get_driver_name = dma_fence_chain_get_driver_name,

@@ -215,6 +227,7 @@ const struct dma_fence_ops dma_fence_chain_ops = { .enable_signaling = dma_fence_chain_enable_signaling, .signaled = dma_fence_chain_signaled, .release = dma_fence_chain_release,

• .set_deadline = dma_fence_chain_set_deadline,
  

  }; EXPORT_SYMBOL(dma_fence_chain_ops);

-- 2.31.1

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

On Fri, Sep 03, 2021 at 11:47:59AM -0700, Rob Clark wrote:

From: Rob Clark robdclark@chromium.org

The initial purpose is for igt tests, but this would also be useful for compositors that wait until close to vblank deadline to make decisions about which frame to show.

Signed-off-by: Rob Clark robdclark@chromium.org

Needs userspace and I think ideally also some igts to make sure it works and doesn't go boom. -Daniel

---

drivers/dma-buf/sync_file.c | 19 +++++++++++++++++++ include/uapi/linux/sync_file.h | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 394e6e1e9686..f295772d5169 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -459,6 +459,22 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, return ret; } +static int sync_file_ioctl_set_deadline(struct sync_file *sync_file,

• 			unsigned long arg)
  

+{

• struct sync_set_deadline ts;
• if (copy_from_user(&ts, (void __user *)arg, sizeof(ts)))

• return -EFAULT;
  

• if (ts.pad)

• return -EINVAL;
  

• dma_fence_set_deadline(sync_file->fence, ktime_set(ts.tv_sec, ts.tv_nsec));
• return 0;

+}

static long sync_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -471,6 +487,9 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg);

• case SYNC_IOC_SET_DEADLINE:

• return sync_file_ioctl_set_deadline(sync_file, arg);
  

• default: return -ENOTTY; }

diff --git a/include/uapi/linux/sync_file.h b/include/uapi/linux/sync_file.h index ee2dcfb3d660..f67d4ffe7566 100644 --- a/include/uapi/linux/sync_file.h +++ b/include/uapi/linux/sync_file.h @@ -67,6 +67,18 @@ struct sync_file_info { __u64 sync_fence_info; }; +/**

• • struct sync_set_deadline - set a deadline on a fence
• • @tv_sec: seconds elapsed since epoch
• • @tv_nsec: nanoseconds elapsed since the time given by the tv_sec
• • @pad: must be zero
• */

+struct sync_set_deadline {

• __s64 tv_sec;
• __s32 tv_nsec;
• __u32 pad;

+};

#define SYNC_IOC_MAGIC '>' /** @@ -95,4 +107,12 @@ struct sync_file_info { */ #define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)

+/**

• • DOC: SYNC_IOC_SET_DEADLINE - set a deadline on a fence
• • Allows userspace to set a deadline on a fence, see dma_fence_set_deadline()
• */

+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)

#endif /* _UAPI_LINUX_SYNC_H */

2.31.1

On Wed, Sep 08, 2021 at 11:23:42AM -0700, Rob Clark wrote:

On Wed, Sep 8, 2021 at 10:50 AM Daniel Vetter daniel@ffwll.ch wrote:

...

On Fri, Sep 03, 2021 at 11:47:59AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

The initial purpose is for igt tests, but this would also be useful for compositors that wait until close to vblank deadline to make decisions about which frame to show.

Signed-off-by: Rob Clark robdclark@chromium.org

Needs userspace and I think ideally also some igts to make sure it works and doesn't go boom.

See cover-letter.. there are igt tests, although currently that is the only user.

Ah sorry missed that. It would be good to record that in the commit too that adds the uapi. git blame doesn't find cover letters at all, unlike on gitlab where you get the MR request with everything.

Ok there is the Link: thing, but since that only points at the last version all the interesting discussion is still usually lost, so I tend to not bother looking there.

I'd be ok to otherwise initially restrict this and the sw_sync UABI (CAP_SYS_ADMIN? Or??) until there is a non-igt user, but they are both needed by the igt tests

Hm really awkward, uapi for igts in cross vendor stuff like this isn't great. I think hiding it in vgem is semi-ok (we have fences there already). But it's all a bit silly ...

For the tests, should we instead have a selftest/Kunit thing to exercise this stuff? igt probably not quite the right thing. Or combine with a page flip if you want to test msm. -Daniel

BR, -R

...

-Daniel

...

---

drivers/dma-buf/sync_file.c | 19 +++++++++++++++++++ include/uapi/linux/sync_file.h | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 394e6e1e9686..f295772d5169 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -459,6 +459,22 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, return ret; }

+static int sync_file_ioctl_set_deadline(struct sync_file *sync_file,

•                                 unsigned long arg)
  

+{

• struct sync_set_deadline ts;
  

• if (copy_from_user(&ts, (void __user *)arg, sizeof(ts)))
  

•         return -EFAULT;
  

• if (ts.pad)
  

•         return -EINVAL;
  

• dma_fence_set_deadline(sync_file->fence, ktime_set(ts.tv_sec, ts.tv_nsec));
  

• return 0;
  

+}

static long sync_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -471,6 +487,9 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg);

• case SYNC_IOC_SET_DEADLINE:
  

•         return sync_file_ioctl_set_deadline(sync_file, arg);
  

• default:
          return -ENOTTY;
  }
  

diff --git a/include/uapi/linux/sync_file.h b/include/uapi/linux/sync_file.h index ee2dcfb3d660..f67d4ffe7566 100644 --- a/include/uapi/linux/sync_file.h +++ b/include/uapi/linux/sync_file.h @@ -67,6 +67,18 @@ struct sync_file_info { __u64 sync_fence_info; };

+/**

• • struct sync_set_deadline - set a deadline on a fence
• • @tv_sec: seconds elapsed since epoch
• • @tv_nsec: nanoseconds elapsed since the time given by the tv_sec
• • @pad: must be zero
• */

+struct sync_set_deadline {

• __s64   tv_sec;
  

• __s32   tv_nsec;
  

• __u32   pad;
  

+};

#define SYNC_IOC_MAGIC '>'

/** @@ -95,4 +107,12 @@ struct sync_file_info { */ #define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)

+/**

• • DOC: SYNC_IOC_SET_DEADLINE - set a deadline on a fence
• • Allows userspace to set a deadline on a fence, see dma_fence_set_deadline()
• */

+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)

#endif /* _UAPI_LINUX_SYNC_H */

2.31.1

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

On Wed, Sep 8, 2021 at 9:36 PM Rob Clark robdclark@gmail.com wrote:

On Wed, Sep 8, 2021 at 11:49 AM Daniel Vetter daniel@ffwll.ch wrote:

...

On Wed, Sep 08, 2021 at 11:23:42AM -0700, Rob Clark wrote:

...

On Wed, Sep 8, 2021 at 10:50 AM Daniel Vetter daniel@ffwll.ch wrote:

...

On Fri, Sep 03, 2021 at 11:47:59AM -0700, Rob Clark wrote:

...

From: Rob Clark robdclark@chromium.org

The initial purpose is for igt tests, but this would also be useful for compositors that wait until close to vblank deadline to make decisions about which frame to show.

Signed-off-by: Rob Clark robdclark@chromium.org

Needs userspace and I think ideally also some igts to make sure it works and doesn't go boom.

See cover-letter.. there are igt tests, although currently that is the only user.

Ah sorry missed that. It would be good to record that in the commit too that adds the uapi. git blame doesn't find cover letters at all, unlike on gitlab where you get the MR request with everything.

Ok there is the Link: thing, but since that only points at the last version all the interesting discussion is still usually lost, so I tend to not bother looking there.

...

I'd be ok to otherwise initially restrict this and the sw_sync UABI (CAP_SYS_ADMIN? Or??) until there is a non-igt user, but they are both needed by the igt tests

Hm really awkward, uapi for igts in cross vendor stuff like this isn't great. I think hiding it in vgem is semi-ok (we have fences there already). But it's all a bit silly ...

For the tests, should we instead have a selftest/Kunit thing to exercise this stuff? igt probably not quite the right thing. Or combine with a page flip if you want to test msm.

Hmm, IIRC we have used CONFIG_BROKEN or something along those lines for UABI in other places where we weren't willing to commit to yet?

I suppose if we had to I could make this a sw_sync ioctl instead. But OTOH there are kind of a limited # of ways this ioctl could look. And we already know that at least some wayland compositors are going to want this.

Hm I was trying to think up a few ways this could work, but didn't come up with anything reasonable. Forcing the compositor to boost the entire chain (for gl composited primary plane fallback) is something the kernel can easily do too. Also only makes sense for priority boost, not so much for clock boosting, since clock boosting only really needs the final element to be boosted.

I guess I can look at non-igt options. But the igt test is already a pretty convenient way to contrive situations (like loops, which is a thing I need to add)

Yeah it's definitely very useful for testing ... One option could be a hacky debugfs interface, where you write a fd number and deadline and the debugfs read function does the deadline setting. Horribly, but since it's debugfs no one ever cares. That's at least where we're hiding all the i915 hacks that igts need. -Daniel

BR, -R

...

-Daniel

...

BR, -R

...

-Daniel

...

---

drivers/dma-buf/sync_file.c | 19 +++++++++++++++++++ include/uapi/linux/sync_file.h | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 394e6e1e9686..f295772d5169 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -459,6 +459,22 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, return ret; }

+static int sync_file_ioctl_set_deadline(struct sync_file *sync_file,

•                                 unsigned long arg)
  

+{

• struct sync_set_deadline ts;
  

• if (copy_from_user(&ts, (void __user *)arg, sizeof(ts)))
  

•         return -EFAULT;
  

• if (ts.pad)
  

•         return -EINVAL;
  

• dma_fence_set_deadline(sync_file->fence, ktime_set(ts.tv_sec, ts.tv_nsec));
  

• return 0;
  

+}

static long sync_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -471,6 +487,9 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg);

• case SYNC_IOC_SET_DEADLINE:
  

•         return sync_file_ioctl_set_deadline(sync_file, arg);
  

• default:
          return -ENOTTY;
  }
  

diff --git a/include/uapi/linux/sync_file.h b/include/uapi/linux/sync_file.h index ee2dcfb3d660..f67d4ffe7566 100644 --- a/include/uapi/linux/sync_file.h +++ b/include/uapi/linux/sync_file.h @@ -67,6 +67,18 @@ struct sync_file_info { __u64 sync_fence_info; };

+/**

• • struct sync_set_deadline - set a deadline on a fence
• • @tv_sec: seconds elapsed since epoch
• • @tv_nsec: nanoseconds elapsed since the time given by the tv_sec
• • @pad: must be zero
• */

+struct sync_set_deadline {

• __s64   tv_sec;
  

• __s32   tv_nsec;
  

• __u32   pad;
  

+};

#define SYNC_IOC_MAGIC '>'

/** @@ -95,4 +107,12 @@ struct sync_file_info { */ #define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)

+/**

• • DOC: SYNC_IOC_SET_DEADLINE - set a deadline on a fence
• • Allows userspace to set a deadline on a fence, see dma_fence_set_deadline()
• */

+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)

#endif /* _UAPI_LINUX_SYNC_H */

2.31.1

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

On Fri, 3 Sep 2021 11:47:59 -0700 Rob Clark robdclark@gmail.com wrote:

From: Rob Clark robdclark@chromium.org

The initial purpose is for igt tests, but this would also be useful for compositors that wait until close to vblank deadline to make decisions about which frame to show.

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/dma-buf/sync_file.c | 19 +++++++++++++++++++ include/uapi/linux/sync_file.h | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 394e6e1e9686..f295772d5169 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -459,6 +459,22 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, return ret; } +static int sync_file_ioctl_set_deadline(struct sync_file *sync_file,

• 			unsigned long arg)
  

+{

• struct sync_set_deadline ts;
• if (copy_from_user(&ts, (void __user *)arg, sizeof(ts)))

• return -EFAULT;
  

• if (ts.pad)

• return -EINVAL;
  

• dma_fence_set_deadline(sync_file->fence, ktime_set(ts.tv_sec, ts.tv_nsec));
• return 0;

+}

static long sync_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -471,6 +487,9 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg);

• case SYNC_IOC_SET_DEADLINE:

• return sync_file_ioctl_set_deadline(sync_file, arg);
  

• default: return -ENOTTY; }

diff --git a/include/uapi/linux/sync_file.h b/include/uapi/linux/sync_file.h index ee2dcfb3d660..f67d4ffe7566 100644 --- a/include/uapi/linux/sync_file.h +++ b/include/uapi/linux/sync_file.h @@ -67,6 +67,18 @@ struct sync_file_info { __u64 sync_fence_info; }; +/**

• • struct sync_set_deadline - set a deadline on a fence
• • @tv_sec: seconds elapsed since epoch
• • @tv_nsec: nanoseconds elapsed since the time given by the tv_sec
• • @pad: must be zero

Hi Rob,

I think you need to specify which clock this timestamp must be in.

Which epoch? Sounds a bit like CLOCK_REALTIME to me which would not make sense.

Also I cannot guess how a compositor should be using this, so explaining the expected usage would be really good, with reasons for why should userspace bother.

Thanks, pq

• */

+struct sync_set_deadline {

• __s64 tv_sec;
• __s32 tv_nsec;
• __u32 pad;

+};

#define SYNC_IOC_MAGIC '>' /** @@ -95,4 +107,12 @@ struct sync_file_info { */ #define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)

+/**

• • DOC: SYNC_IOC_SET_DEADLINE - set a deadline on a fence
• • Allows userspace to set a deadline on a fence, see dma_fence_set_deadline()
• */

+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)

#endif /* _UAPI_LINUX_SYNC_H */

On Mon, Sep 27, 2021 at 1:42 AM Pekka Paalanen ppaalanen@gmail.com wrote:

On Fri, 3 Sep 2021 11:47:59 -0700 Rob Clark robdclark@gmail.com wrote:

...

From: Rob Clark robdclark@chromium.org

The initial purpose is for igt tests, but this would also be useful for compositors that wait until close to vblank deadline to make decisions about which frame to show.

Signed-off-by: Rob Clark robdclark@chromium.org

drivers/dma-buf/sync_file.c | 19 +++++++++++++++++++ include/uapi/linux/sync_file.h | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 394e6e1e9686..f295772d5169 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -459,6 +459,22 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, return ret; }

+static int sync_file_ioctl_set_deadline(struct sync_file *sync_file,

•                                 unsigned long arg)
  

+{

• struct sync_set_deadline ts;
  

• if (copy_from_user(&ts, (void __user *)arg, sizeof(ts)))
  

•         return -EFAULT;
  

• if (ts.pad)
  

•         return -EINVAL;
  

• dma_fence_set_deadline(sync_file->fence, ktime_set(ts.tv_sec, ts.tv_nsec));
  

• return 0;
  

+}

static long sync_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -471,6 +487,9 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg);

• case SYNC_IOC_SET_DEADLINE:
  

•         return sync_file_ioctl_set_deadline(sync_file, arg);
  

• default:
          return -ENOTTY;
  }
  

diff --git a/include/uapi/linux/sync_file.h b/include/uapi/linux/sync_file.h index ee2dcfb3d660..f67d4ffe7566 100644 --- a/include/uapi/linux/sync_file.h +++ b/include/uapi/linux/sync_file.h @@ -67,6 +67,18 @@ struct sync_file_info { __u64 sync_fence_info; };

+/**

• • struct sync_set_deadline - set a deadline on a fence
• • @tv_sec: seconds elapsed since epoch
• • @tv_nsec: nanoseconds elapsed since the time given by the tv_sec
• • @pad: must be zero

Hi Rob,

I think you need to specify which clock this timestamp must be in.

Which epoch? Sounds a bit like CLOCK_REALTIME to me which would not make sense.

It should be monotonic.. same clock as is used for vblank timestamps, which I assume that would be the most straightforward thing for compositors to use

BR, -R

Also I cannot guess how a compositor should be using this, so explaining the expected usage would be really good, with reasons for why should userspace bother.

Thanks, pq

...

• */

+struct sync_set_deadline {

• __s64   tv_sec;
  

• __s32   tv_nsec;
  

• __u32   pad;
  

+};

#define SYNC_IOC_MAGIC '>'

/** @@ -95,4 +107,12 @@ struct sync_file_info { */ #define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)

+/**

• • DOC: SYNC_IOC_SET_DEADLINE - set a deadline on a fence
• • Allows userspace to set a deadline on a fence, see dma_fence_set_deadline()
• */

+#define SYNC_IOC_SET_DEADLINE _IOW(SYNC_IOC_MAGIC, 5, struct sync_set_deadline)

#endif /* _UAPI_LINUX_SYNC_H */