drm/atomic: Interruptible locks for everyone!
Subsystems (2)
Maarten Lankhorst
maintainercover drm/atomic: Interruptible locks for everyone!
drm_atomic_commit could previous have always failed when waits failed, but locking was always done uninterruptibly. Add infrastructure to make it possible for callers to choose interruptible locking, and convert the 4 most common ioctl's to use it.
All other atomic helpers can be converted when Daniel's "acquire_ctx for everyone!" patch series lands.
Maarten Lankhorst (5):
drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible
waiting
drm/atomic: Convert atomic ioctl locking to interruptible. drm/atomic: Convert pageflip ioctl locking to interruptible. drm/legacy: Convert cursor ioctl locking to interruptible. drm/legacy: Convert setplane ioctl locking to interruptible.
drivers/gpu/drm/drm_atomic.c | 7 ++-- drivers/gpu/drm/drm_debugfs_crc.c | 2 +- drivers/gpu/drm/drm_modeset_lock.c | 75 ++++++++++++++++++-------------------- drivers/gpu/drm/drm_plane.c | 21 ++++++----- include/drm/drm_modeset_lock.h | 12 ++++-- 5 files changed, 60 insertions(+), 57 deletions(-)
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 1/5 drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting
When we want to make drm_atomic_commit interruptible, there are a lot of places that call the lock function, which we don't have control over.
Rather than trying to convert every single one, it's easier to toggle interruptible waiting per acquire_ctx. If drm_modeset_acquire_init is called with DRM_MODESET_ACQUIRE_INTERRUPTIBLE, then we will perform interruptible waits in drm_modeset_lock and drm_modeset_backoff.
--- drivers/gpu/drm/drm_debugfs_crc.c | 2 +- drivers/gpu/drm/drm_modeset_lock.c | 75 ++++++++++++++++++-------------------- include/drm/drm_modeset_lock.h | 12 ++++-- 3 files changed, 44 insertions(+), 45 deletions(-)
drivers/gpu/drm/drm_debugfs_crc.c +1 -1
@@ -155,7 +155,7 @@ static int crtc_crc_open(struct inode *inode, struct file *filep)int ret =0 ;if (drm_drv_uses_atomic_modeset (crtc->dev)) { - ret =drm_modeset_lock_interruptible (&crtc->mutex,NULL ); + ret =drm_modeset_lock_single_interruptible (&crtc->mutex);if (ret)return ret;
drivers/gpu/drm/drm_modeset_lock.c +35 -40
127 lines not on this page · raw message
include/drm/drm_modeset_lock.h +8 -4
@@ -34,6 +34,7 @@ struct drm_modeset_lock;* @contended: used internally for -EDEADLK handling * @locked: list of held locks * @trylock_only: trylock mode used in atomic contexts/panic notifiers +* @interruptible: whether interruptible locking should be used. * * Each thread competing for a set of locks must use one acquire * ctx. And if any lock fxn returns -EDEADLK, it must backoff and
@@ -59,6 +60,9 @@ struct drm_modeset_acquire_ctx {* Trylock mode, use only for panic handlers! */ bool trylock_only; + +/* Perform interruptible waits on this context. */ +bool interruptible; };/**
@@ -82,12 +86,13 @@ struct drm_modeset_lock {struct list_head head; }; +#define DRM_MODESET_ACQUIRE_INTERRUPTIBLE BIT(0) +void drm_modeset_acquire_init (struct drm_modeset_acquire_ctx *ctx,uint32_t flags);void drm_modeset_acquire_fini (struct drm_modeset_acquire_ctx *ctx);void drm_modeset_drop_locks (struct drm_modeset_acquire_ctx *ctx); -void drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx); -int drm_modeset_backoff_interruptible (struct drm_modeset_acquire_ctx *ctx); +int drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx);void drm_modeset_lock_init (struct drm_modeset_lock *lock);
@@ -111,8 +116,7 @@ static inline bool drm_modeset_is_locked(struct drm_modeset_lock *lock)int drm_modeset_lock (struct drm_modeset_lock *lock,struct drm_modeset_acquire_ctx *ctx); -int drm_modeset_lock_interruptible (struct drm_modeset_lock *lock, -struct drm_modeset_acquire_ctx *ctx); +int __must_check drm_modeset_lock_single_interruptible (struct drm_modeset_lock *lock);void drm_modeset_unlock (struct drm_modeset_lock *lock);struct drm_device ;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting
Quoted 9 lines · Maarten Lankhorst
When we want to make
drm_atomic_commitinterruptible, there are a lot of places that call the lock function, which we don't have control over.Rather than trying to convert every single one, it's easier to toggle interruptible waiting per
acquire_ctx. Ifdrm_modeset_acquire_initis called withDRM_MODESET_ACQUIRE_INTERRUPTIBLE, then we will perform interruptible waits indrm_modeset_lockanddrm_modeset_backoff.Signed-off-by Maarten Lankhorst <[email protected]>
I wonder whether we should do a drm_modeset_lock_single without the context attribute too, for OCD. But not really needed.
Quoted 211 lines
--- drivers/gpu/drm/drm_debugfs_crc.c | 2 +- drivers/gpu/drm/drm_modeset_lock.c | 75 ++++++++++++++++++-------------------- include/drm/drm_modeset_lock.h | 12 ++++-- 3 files changed, 44 insertions(+), 45 deletions(-)drivers/gpu/drm/drm_debugfs_crc.c +1
-1@@ -155,7 +155,7 @@ static int crtc_crc_open(struct inode *inode, struct file *filep)int ret =0 ;if (drm_drv_uses_atomic_modeset (crtc->dev)) { - ret =drm_modeset_lock_interruptible (&crtc->mutex,NULL ); + ret =drm_modeset_lock_single_interruptible (&crtc->mutex);if (ret)return ret;drivers/gpu/drm/drm_modeset_lock.c +35
-40@@ -178,7 +178,11 @@ EXPORT_SYMBOL(drm_warn_on_modeset_not_all_locked);/** * drm_modeset_acquire_init - initialize acquire context * @ctx: the acquire context -* @flags: for future +* @flags: 0 or %DRM_MODESET_ACQUIRE_INTERRUPTIBLE +* +* When passing %DRM_MODESET_ACQUIRE_INTERRUPTIBLE to @flags, +* all calls to drm_modeset_lock() will perform an interruptible +* wait. */ void drm_modeset_acquire_init (struct drm_modeset_acquire_ctx *ctx,uint32_t flags)@@ -186,6 +190,9 @@ void drm_modeset_acquire_init(struct drm_modeset_acquire_ctx *ctx,memset (ctx,0 ,sizeof (*ctx));ww_acquire_init (&ctx->ww_ctx, &crtc_ww_class);INIT_LIST_HEAD (&ctx->locked); + +if (flags &DRM_MODESET_ACQUIRE_INTERRUPTIBLE ) + ctx->interruptible = true; }EXPORT_SYMBOL (drm_modeset_acquire_init);@@ -261,8 +268,19 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,return ret; } -static int modeset_backoff (struct drm_modeset_acquire_ctx *ctx, -bool interruptible) +/** +* drm_modeset_backoff - deadlock avoidance backoff +* @ctx: the acquire context +* +* If deadlock is detected (ie. drm_modeset_lock() returns -EDEADLK), +* you must call this function to drop all currently held locks and +* block until the contended lock becomes available. +* +* This function returns 0 on success, or -ERESTARTSYS if this context +* is initialized with %DRM_MODESET_ACQUIRE_INTERRUPTIBLE and the +* wait has been interrupted. +*/ +int drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx) {struct drm_modeset_lock *contended = ctx->contended;@@ -273,36 +291,11 @@ static int modeset_backoff(struct drm_modeset_acquire_ctx *ctx,drm_modeset_drop_locks (ctx); -return modeset_lock (contended, ctx, interruptible, true); -} - -/** -* drm_modeset_backoff - deadlock avoidance backoff -* @ctx: the acquire context -* -* If deadlock is detected (ie. drm_modeset_lock() returns -EDEADLK), -* you must call this function to drop all currently held locks and -* block until the contended lock becomes available. -*/ -void drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx) -{ -modeset_backoff (ctx, false); +return modeset_lock (contended, ctx, ctx->interruptible, true); }EXPORT_SYMBOL (drm_modeset_backoff);/** -* drm_modeset_backoff_interruptible - deadlock avoidance backoff -* @ctx: the acquire context -* -* Interruptible version of drm_modeset_backoff() -*/ -int drm_modeset_backoff_interruptible (struct drm_modeset_acquire_ctx *ctx) -{ -return modeset_backoff (ctx, true); -} -EXPORT_SYMBOL (drm_modeset_backoff_interruptible); - -/** * drm_modeset_lock_init - initialize lock * @lock: lock to init */ @@ -324,14 +317,18 @@ EXPORT_SYMBOL(drm_modeset_lock_init);* deadlock scenario has been detected and it is an error to attempt * to take any more locks without first calling drm_modeset_backoff(). * +* If the @ctx is not NULL and initialized with +* %DRM_MODESET_ACQUIRE_INTERRUPTIBLE, this function will behave +* as drm_modeset_lock_interruptible(). +* * If @ctx is NULL then the function call behaves like a normal, -* non-nesting mutex_lock() call. +* uninterruptible non-nesting mutex_lock() call. */ int drm_modeset_lock (struct drm_modeset_lock *lock,struct drm_modeset_acquire_ctx *ctx) {if (ctx) -return modeset_lock (lock, ctx, false, false); +return modeset_lock (lock, ctx, ctx->interruptible, false);ww_mutex_lock (&lock->mutex,NULL );return 0 ;@@ -339,21 +336,19 @@ int drm_modeset_lock(struct drm_modeset_lock *lock,EXPORT_SYMBOL (drm_modeset_lock);/** -* drm_modeset_lock_interruptible - take modeset lock +* drm_modeset_lock_single_interruptible - take a single modeset lock * @lock: lock to take -* @ctx: acquire ctx * -* Interruptible version of drm_modeset_lock() +* This function behaves as drm_modeset_lock() with a NULL context, +* but performs interruptible waits. +* +* This function returns 0 on success, or -ERESTARTSYS when interrupted. */ -int drm_modeset_lock_interruptible (struct drm_modeset_lock *lock, -struct drm_modeset_acquire_ctx *ctx) +int drm_modeset_lock_single_interruptible (struct drm_modeset_lock *lock) { -if (ctx) -return modeset_lock (lock, ctx, true, false); -return ww_mutex_lock_interruptible (&lock->mutex,NULL ); } -EXPORT_SYMBOL (drm_modeset_lock_interruptible); +EXPORT_SYMBOL (drm_modeset_lock_single_interruptible);/** * drm_modeset_unlock - drop modeset lock include/drm/drm_modeset_lock.h +8
-4@@ -34,6 +34,7 @@ struct drm_modeset_lock;* @contended: used internally for -EDEADLK handling * @locked: list of held locks * @trylock_only: trylock mode used in atomic contexts/panic notifiers +* @interruptible: whether interruptible locking should be used. * * Each thread competing for a set of locks must use one acquire * ctx. And if any lock fxn returns -EDEADLK, it must backoff and @@ -59,6 +60,9 @@ struct drm_modeset_acquire_ctx {* Trylock mode, use only for panic handlers! */ bool trylock_only; + +/* Perform interruptible waits on this context. */ +bool interruptible; };/** @@ -82,12 +86,13 @@ struct drm_modeset_lock {struct list_head head; }; +#define DRM_MODESET_ACQUIRE_INTERRUPTIBLE BIT(0) +void drm_modeset_acquire_init (struct drm_modeset_acquire_ctx *ctx,uint32_t flags);void drm_modeset_acquire_fini (struct drm_modeset_acquire_ctx *ctx);void drm_modeset_drop_locks (struct drm_modeset_acquire_ctx *ctx); -void drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx); -int drm_modeset_backoff_interruptible (struct drm_modeset_acquire_ctx *ctx); +int drm_modeset_backoff (struct drm_modeset_acquire_ctx *ctx);void drm_modeset_lock_init (struct drm_modeset_lock *lock);@@ -111,8 +116,7 @@ static inline bool drm_modeset_is_locked(struct drm_modeset_lock *lock)int drm_modeset_lock (struct drm_modeset_lock *lock,struct drm_modeset_acquire_ctx *ctx); -int drm_modeset_lock_interruptible (struct drm_modeset_lock *lock, -struct drm_modeset_acquire_ctx *ctx); +int __must_check drm_modeset_lock_single_interruptible (struct drm_modeset_lock *lock);void drm_modeset_unlock (struct drm_modeset_lock *lock);struct drm_device ;Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerRe: [PATCH 1/5] drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting
Op 27-07-17 om 17:19 schreef Daniel Vetter:
Quoted 9 lines · Maarten Lankhorst
Quoted 8 lines
When we want to make
drm_atomic_commitinterruptible, there are a lot of places that call the lock function, which we don't have control over.Rather than trying to convert every single one, it's easier to toggle interruptible waiting per
acquire_ctx. Ifdrm_modeset_acquire_initis called withDRM_MODESET_ACQUIRE_INTERRUPTIBLE, then we will perform interruptible waits indrm_modeset_lockanddrm_modeset_backoff.
Quoted 6 lines
Quoted 1 line
Signed-off-by Maarten Lankhorst <[email protected]>I wonder whether we should do a
drm_modeset_lock_singlewithout the context attribute too, for OCD. But not really needed.Reviewed-by Daniel Vetter <[email protected]>
If it was up to me, we didn't rename drm_modeset_lock_interruptible and allowed it to pass a ctx. Most likely it would have been NULL, but at least we'd have symmetry.
The same discussion was held ww_mutex_lock iirc, and we ended up with a single locking function where we could pass a NULL context if needed. :)
~Maarten
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH 2/5 drm/atomic: Convert atomic ioctl locking to interruptible.
In reply to Maarten LankhorstPass DRM_MODESET_ACQUIRE_INTERRUPTIBLE to acquire_init, and handle drm_modeset_backoff which can now fail by returning the error.
--- drivers/gpu/drm/drm_atomic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_atomic.c +4 -3
@@ -2217,7 +2217,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, (arg->flags & DRM_MODE_PAGE_FLIP_EVENT))return -EINVAL ; -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); state =drm_atomic_state_alloc (dev);if (!state)
@@ -2327,8 +2327,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,if (ret == -EDEADLK ) {drm_atomic_state_clear (state); -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_atomic_state_put (state);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/5] drm/atomic: Convert atomic ioctl locking to interruptible.
Quoted 4 lines · Maarten Lankhorst
Pass
DRM_MODESET_ACQUIRE_INTERRUPTIBLEtoacquire_init, and handledrm_modeset_backoffwhich can now fail by returning the error.Signed-off-by Maarten Lankhorst <[email protected]>
Requires a testcase, with that addressed:
I think the test should be:
1. On thread stuck on a blocking plane update (using a vgem fence that doesn't get signalled).
2. Second thread does a blocking plane update on that the same plane.
3. Gets interrupted by a signal, and we confirm that we receive that signal before we've unblocked the first thread.
This would give us positive confirmation that interruptible actually works.
Cheers, Daniel
Quoted 36 lines
--- drivers/gpu/drm/drm_atomic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_atomic.c +4
-3@@ -2217,7 +2217,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, (arg->flags & DRM_MODE_PAGE_FLIP_EVENT))return -EINVAL ; -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); state =drm_atomic_state_alloc (dev);if (!state)@@ -2327,8 +2327,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,if (ret == -EDEADLK ) {drm_atomic_state_clear (state); -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_atomic_state_put (state);Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 3/5 drm/atomic: Convert pageflip ioctl locking to interruptible.
In reply to Maarten LankhorstPass DRM_MODESET_ACQUIRE_INTERRUPTIBLE to acquire_init, and handle drm_modeset_backoff which can now fail by returning the error.
--- drivers/gpu/drm/drm_plane.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_plane.c +4 -3
@@ -866,7 +866,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -EINVAL ; } -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: ret =drm_modeset_lock (&crtc->mutex, &ctx);if (ret)
@@ -955,8 +955,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, crtc->primary->old_fb =NULL ;if (ret == -EDEADLK ) { -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_modeset_drop_locks (&ctx);
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm/atomic: Convert pageflip ioctl locking to interruptible.
Quoted 4 lines · Maarten Lankhorst
Pass
DRM_MODESET_ACQUIRE_INTERRUPTIBLEtoacquire_init, and handledrm_modeset_backoffwhich can now fail by returning the error.Signed-off-by Maarten Lankhorst <[email protected]>
Same comment as the atomic ioctl. With the testcase added this gets my
Quoted 36 lines
--- drivers/gpu/drm/drm_plane.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_plane.c +4
-3@@ -866,7 +866,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,return -EINVAL ; } -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: ret =drm_modeset_lock (&crtc->mutex, &ctx);if (ret)@@ -955,8 +955,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, crtc->primary->old_fb =NULL ;if (ret == -EDEADLK ) { -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_modeset_drop_locks (&ctx);Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 4/5 drm/legacy: Convert cursor ioctl locking to interruptible.
In reply to Maarten LankhorstPass DRM_MODESET_ACQUIRE_INTERRUPTIBLE to acquire_init, and handle drm_modeset_backoff which can now fail by returning the error.
--- drivers/gpu/drm/drm_plane.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_plane.c +4 -3
@@ -715,7 +715,7 @@ static int drm_mode_cursor_common(struct drm_device *dev,return -ENOENT ; } -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: ret =drm_modeset_lock (&crtc->mutex, &ctx);if (ret)
@@ -757,8 +757,9 @@ static int drm_mode_cursor_common(struct drm_device *dev, } out:if (ret == -EDEADLK ) { -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_modeset_drop_locks (&ctx);
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH 5/5 drm/legacy: Convert setplane ioctl locking to interruptible.
In reply to Maarten LankhorstPass DRM_MODESET_ACQUIRE_INTERRUPTIBLE to acquire_init, and handle drm_modeset_backoff which can now fail by returning the error.
--- drivers/gpu/drm/drm_plane.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_plane.c +4 -3
@@ -549,7 +549,7 @@ static int setplane_internal(struct drm_plane *plane,struct drm_modeset_acquire_ctx ctx;int ret; -drm_modeset_acquire_init (&ctx,0 ); +drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: ret =drm_modeset_lock_all_ctx (plane->dev, &ctx);if (ret)
@@ -560,8 +560,9 @@ static int setplane_internal(struct drm_plane *plane, fail:if (ret == -EDEADLK ) { -drm_modeset_backoff (&ctx); - goto retry; + ret =drm_modeset_backoff (&ctx); +if (!ret) + goto retry; }drm_modeset_drop_locks (&ctx);drm_modeset_acquire_fini (&ctx);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/atomic: Interruptible locks for everyone!
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/atomic: Interruptible locks for everyone!
URL : https://patchwork.freedesktop.org/series/27987/
State : success
== Summary ==
Series 27987v1 drm/atomic: Interruptible locks for everyone!
https://patchwork.freedesktop.org/api/1.0/series/27987/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-pnv-d510) fdo#101597 +1
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-j1900) fdo#101705 +1fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:443s fi-bdw-gvtdvm total:280 pass:266 dwarn:0 dfail:0 fail:0 skip:14 time:432s fi-blb-e6850 total:280 pass:225 dwarn:1 dfail:0 fail:0 skip:54 time:358s fi-bsw-n3050 total:280 pass:244 dwarn:0 dfail:0 fail:0 skip:36 time:542s fi-bxt-j4205 total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:516s fi-byt-j1900 total:280 pass:255 dwarn:1 dfail:0 fail:0 skip:24 time:500s fi-byt-n2820 total:280 pass:251 dwarn:1 dfail:0 fail:0 skip:28 time:490s fi-glk-2a total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:610s fi-hsw-4770 total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:445s fi-hsw-4770r total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:414s fi-ilk-650 total:280 pass:230 dwarn:0 dfail:0 fail:0 skip:50 time:412s fi-ivb-3520m total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:509s fi-ivb-3770 total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:471s fi-kbl-7500u total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:466s fi-kbl-7560u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:581s fi-kbl-r total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:587s fi-pnv-d510 total:280 pass:222 dwarn:3 dfail:0 fail:0 skip:55 time:567s fi-skl-6260u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:468s fi-skl-6700hq total:280 pass:263 dwarn:0 dfail:0 fail:0 skip:17 time:590s fi-skl-6700k total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-skl-6770hq total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:469s fi-skl-gvtdvm total:280 pass:267 dwarn:0 dfail:0 fail:0 skip:13 time:439s fi-skl-x1585l total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:469s fi-snb-2520m total:280 pass:252 dwarn:0 dfail:0 fail:0 skip:28 time:543s fi-snb-2600 total:280 pass:250 dwarn:0 dfail:0 fail:1 skip:29 time:408s
5465067d2b92b8da2212cedd461c3336d8e9fefb drm-tip: 2017y-07m-27d-11h-43m-00s UTC integration manifest ae59b73f0649 drm/legacy: Convert setplane ioctl locking to interruptible. 95f7d5f728de drm/legacy: Convert cursor ioctl locking to interruptible.7a730f43861e drm/atomic: Convert pageflip ioctl locking to interruptible. e5a47432048c drm/atomic: Convert atomic ioctl locking to interruptible.ecc2575eb9de drm/atomic: Prepare drm_modeset_lock infrastructure for interruptible waiting
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5291/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Maarten
Quoted 8 lines · Maarten Lankhorst
drm_atomic_commitcould previous have always failed when waits failed, but locking was always done uninterruptibly. Add infrastructure to make it possible for callers to choose interruptible locking, and convert the 4 most common ioctl's to use it.All other atomic helpers can be converted when Daniel's "
acquire_ctxfor everyone!" patch series lands.
There's a KMS locking documentation/example in drm_modeset_lock.c. Can you please update that as well?
Thanks
Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Emil Velikov
Hi Maarten
Quoted 5 lines · Maarten Lankhorst
drm_atomic_commitcould previous have always failed when waits failed, but locking was always done uninterruptibly. Add infrastructure to make it possible for callers to choose interruptible locking, and convert the 4 most common ioctl's to use it.
Quoted 5 lines
Quoted 3 lines
All other atomic helpers can be converted when Daniel's "
acquire_ctxfor everyone!" patch series lands.There's a KMS locking documentation/example in
drm_modeset_lock.c. Can you please update that as well?
Not sure what we should update there? As-is it still works for the non-interruptible case. Or do you mean we should have an interruptible variant of it too?
Anyway, with the testcase added also for cursor and plane code, patches 4&5 also get my Reviewed-by: Daniel Vetter <[email protected]>
Any reason you didn't convert the set_config path too? That's probably the one most will be stuck in when something goes wrong ... Another one is the various get* and setprop calls (but the later needs my patch series first).
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Emil Velikov
Hi Maarten
Quoted 8 lines · Maarten Lankhorst
drm_atomic_commitcould previous have always failed when waits failed, but locking was always done uninterruptibly. Add infrastructure to make it possible for callers to choose interruptible locking, and convert the 4 most common ioctl's to use it.All other atomic helpers can be converted when Daniel's "
acquire_ctxfor everyone!" patch series lands.
Quoted 7 lines
Quoted 2 lines
There's a KMS locking documentation/example in
drm_modeset_lock.c. Can you please update that as well?Not sure what we should update there? As-is it still works for the non-interruptible case. Or do you mean we should have an interruptible variant of it too?
Don't think another example is needed.
After the example add a line which says "hey you can have Interruptable locking", pointing to drm_modeset_acquire_init and/or drm_modeset_backoff.
Updating the drm_modeset_acquire_init() call to have the flags argument would also be nice.
-Emil
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerOp 27-07-17 om 17:30 schreef Daniel Vetter:
Quoted 19 lines · Emil Velikov
Quoted 9 lines
Hi Maarten
Quoted 5 lines · Maarten Lankhorst
drm_atomic_commitcould previous have always failed when waits failed, but locking was always done uninterruptibly. Add infrastructure to make it possible for callers to choose interruptible locking, and convert the 4 most common ioctl's to use it.Quoted 5 lines
Quoted 3 lines
All other atomic helpers can be converted when Daniel's "
acquire_ctxfor everyone!" patch series lands.There's a KMS locking documentation/example in
drm_modeset_lock.c. Can you please update that as well?Not sure what we should update there? As-is it still works for the non-interruptible case. Or do you mean we should have an interruptible variant of it too?
Quoted 8 lines
Anyway, with the testcase added also for cursor and plane code, patches 4&5 also get my Reviewed-by: Daniel Vetter <[email protected]>
Any reason you didn't convert the
set_configpath too? That's probably the one most will be stuck in when something goes wrong ... Another one is the various get* and setprop calls (but the later needs my patch series first).
-Daniel
I only did the ones I expect to be called most often by frequency. The atomic ioctl, pageflip, cursor update and setplane for overlays are likely to be done most. I think we could test all additions like that, perhaps even the interruptible backoff case, at least for the atomic ioctl. :)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel