From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel@ffwll.ch, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, yuq825@gmail.com, eric@anholt.net, peterz@infradead.org, thellstrom@vmware.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, lima@lists.freedesktop.org Subject: [PATCH 3/6] drm/gem: use new ww_mutex_(un)lock_for_each macros Date: Fri, 14 Jun 2019 14:41:22 +0200 [thread overview] Message-ID: <20190614124125.124181-4-christian.koenig@amd.com> (raw) In-Reply-To: <20190614124125.124181-1-christian.koenig@amd.com> Use the provided macros instead of implementing deadlock handling on our own. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/drm_gem.c | 49 ++++++++++----------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 50de138c89e0..6e4623d3bee2 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1307,51 +1307,26 @@ int drm_gem_lock_reservations(struct drm_gem_object **objs, int count, struct ww_acquire_ctx *acquire_ctx) { - int contended = -1; + struct ww_mutex *contended; int i, ret; ww_acquire_init(acquire_ctx, &reservation_ww_class); -retry: - if (contended != -1) { - struct drm_gem_object *obj = objs[contended]; - - ret = ww_mutex_lock_slow_interruptible(&obj->resv->lock, - acquire_ctx); - if (ret) { - ww_acquire_done(acquire_ctx); - return ret; - } - } - - for (i = 0; i < count; i++) { - if (i == contended) - continue; - - ret = ww_mutex_lock_interruptible(&objs[i]->resv->lock, - acquire_ctx); - if (ret) { - int j; - - for (j = 0; j < i; j++) - ww_mutex_unlock(&objs[j]->resv->lock); - - if (contended != -1 && contended >= i) - ww_mutex_unlock(&objs[contended]->resv->lock); - - if (ret == -EDEADLK) { - contended = i; - goto retry; - } - - ww_acquire_done(acquire_ctx); - return ret; - } - } + ww_mutex_lock_for_each(for (i = 0; i < count; i++), + &objs[i]->resv->lock, contended, ret, true, + acquire_ctx) + if (ret) + goto error; ww_acquire_done(acquire_ctx); return 0; + +error: + ww_mutex_unlock_for_each(for (i = 0; i < count; i++), + &objs[i]->resv->lock, contended); + ww_acquire_done(acquire_ctx); + return ret; } EXPORT_SYMBOL(drm_gem_lock_reservations); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: daniel@ffwll.ch, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, yuq825@gmail.com, eric@anholt.net, peterz@infradead.org, thellstrom@vmware.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, lima@lists.freedesktop.org Subject: [PATCH 3/6] drm/gem: use new ww_mutex_(un)lock_for_each macros Date: Fri, 14 Jun 2019 14:41:22 +0200 [thread overview] Message-ID: <20190614124125.124181-4-christian.koenig@amd.com> (raw) In-Reply-To: <20190614124125.124181-1-christian.koenig@amd.com> Use the provided macros instead of implementing deadlock handling on our own. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/drm_gem.c | 49 ++++++++++----------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 50de138c89e0..6e4623d3bee2 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1307,51 +1307,26 @@ int drm_gem_lock_reservations(struct drm_gem_object **objs, int count, struct ww_acquire_ctx *acquire_ctx) { - int contended = -1; + struct ww_mutex *contended; int i, ret; ww_acquire_init(acquire_ctx, &reservation_ww_class); -retry: - if (contended != -1) { - struct drm_gem_object *obj = objs[contended]; - - ret = ww_mutex_lock_slow_interruptible(&obj->resv->lock, - acquire_ctx); - if (ret) { - ww_acquire_done(acquire_ctx); - return ret; - } - } - - for (i = 0; i < count; i++) { - if (i == contended) - continue; - - ret = ww_mutex_lock_interruptible(&objs[i]->resv->lock, - acquire_ctx); - if (ret) { - int j; - - for (j = 0; j < i; j++) - ww_mutex_unlock(&objs[j]->resv->lock); - - if (contended != -1 && contended >= i) - ww_mutex_unlock(&objs[contended]->resv->lock); - - if (ret == -EDEADLK) { - contended = i; - goto retry; - } - - ww_acquire_done(acquire_ctx); - return ret; - } - } + ww_mutex_lock_for_each(for (i = 0; i < count; i++), + &objs[i]->resv->lock, contended, ret, true, + acquire_ctx) + if (ret) + goto error; ww_acquire_done(acquire_ctx); return 0; + +error: + ww_mutex_unlock_for_each(for (i = 0; i < count; i++), + &objs[i]->resv->lock, contended); + ww_acquire_done(acquire_ctx); + return ret; } EXPORT_SYMBOL(drm_gem_lock_reservations); -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-06-14 12:41 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-14 12:41 ww_mutex deadlock handling cleanup Christian König 2019-06-14 12:41 ` [PATCH 1/6] locking: add ww_mutex_(un)lock_for_each helpers Christian König 2019-06-14 12:56 ` Peter Zijlstra 2019-06-14 12:56 ` Peter Zijlstra 2019-06-14 13:04 ` Christian König 2019-06-14 12:41 ` [PATCH 2/6] drm/ttm: use new ww_mutex_(un)lock_for_each macros Christian König 2019-06-14 12:41 ` Christian König [this message] 2019-06-14 12:41 ` [PATCH 3/6] drm/gem: " Christian König 2019-06-14 12:59 ` Peter Zijlstra 2019-06-14 12:59 ` Peter Zijlstra 2019-06-14 13:06 ` Christian König 2019-06-14 13:21 ` Peter Zijlstra 2019-06-14 13:19 ` Peter Zijlstra 2019-06-14 15:22 ` Daniel Vetter 2019-06-14 18:10 ` Christian König 2019-06-14 18:24 ` Daniel Vetter 2019-06-14 18:24 ` Daniel Vetter 2019-06-14 18:51 ` Christian König 2019-06-14 20:30 ` Daniel Vetter 2019-06-14 20:30 ` Daniel Vetter 2019-06-15 13:56 ` Daniel Vetter 2019-06-15 13:56 ` Daniel Vetter 2019-06-17 9:30 ` Christian König 2019-06-14 12:41 ` [PATCH 4/6] drm/etnaviv: " Christian König 2019-06-14 12:41 ` Christian König 2019-06-14 12:41 ` [PATCH 5/6] drm/lima: " Christian König 2019-06-14 12:41 ` Christian König 2019-06-14 12:41 ` [PATCH 6/6] drm/vc4: " Christian König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190614124125.124181-4-christian.koenig@amd.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=christian.gmeiner@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=eric@anholt.net \ --cc=etnaviv@lists.freedesktop.org \ --cc=l.stach@pengutronix.de \ --cc=lima@lists.freedesktop.org \ --cc=linux+etnaviv@armlinux.org.uk \ --cc=linux-kernel@vger.kernel.org \ --cc=peterz@infradead.org \ --cc=thellstrom@vmware.com \ --cc=yuq825@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.