Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: [PATCH 09/12] reservation: Annotate dma_fence waits
Date: Fri,  2 Nov 2018 10:15:28 +0100	[thread overview]
Message-ID: <20181102091531.7775-9-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20181102091531.7775-1-daniel.vetter@ffwll.ch>

reservations have an optimized fastpath that bypasses dma_fence_wait(),
make sure we still catch all dependencies in lockdep.

To avoid lockdep complaining about recursion on the fake
dma_fence_wait lock we use the dma_fence_might_sleep annotation.

Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/dma-buf/reservation.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index c1618335ca99..599b88c75cd5 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -429,6 +429,8 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
 	long ret = timeout ? timeout : 1;
 	int i;
 
+	dma_fence_might_wait();
+
 retry:
 	shared_count = 0;
 	seq = read_seqcount_begin(&obj->seq);
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-11-02  9:15 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-02  9:15 [PATCH 01/12] locking/lockdep: restore cross-release checks Daniel Vetter
2018-11-02  9:15 ` [PATCH 02/12] kthread: finer-grained lockdep/cross-release completion Daniel Vetter
2018-11-02  9:15 ` [PATCH 03/12] lockdep: Remove GFP_NOLOCKDEP annotation Daniel Vetter
2018-11-02  9:15 ` [PATCH 04/12] kernel/lockdep: Make cross-release a config option Daniel Vetter
2018-11-02  9:15 ` [PATCH 05/12] mm: Check if mmu notifier callbacks are allowed to fail Daniel Vetter
2018-11-02  9:15 ` [PATCH 06/12] mm, notifier: Catch sleeping/blocking for !blockable Daniel Vetter
2018-11-02  9:15 ` [PATCH 07/12] mm, notifier: Add a lockdep map for invalidate_range_start Daniel Vetter
2018-11-02  9:15 ` [PATCH 08/12] dma-fence: cross-release annotations Daniel Vetter
2018-11-02  9:15 ` Daniel Vetter [this message]
2018-11-02  9:15 ` [PATCH 10/12] drm/i915: Annotate dma_fence waits Daniel Vetter
2018-11-06 13:55   ` [PATCH] " Daniel Vetter
2018-11-06 16:48     ` kbuild test robot
2018-11-06 16:48     ` kbuild test robot
2018-11-02  9:15 ` [PATCH 11/12] drm/i915: annotate intel_atomic_commit_fence_wait Daniel Vetter
2018-11-02  9:15 ` [PATCH 12/12] HAX FOR CI: Enable cross-release Daniel Vetter
2018-11-02  9:43 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/12] locking/lockdep: restore cross-release checks Patchwork
2018-11-02  9:49 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-11-02 10:04 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-11-06 14:14 ` ✗ Fi.CI.BAT: failure for series starting with [01/12] locking/lockdep: restore cross-release checks (rev2) Patchwork
2018-11-06 15:05 ` [PATCH] locking/lockdep: restore cross-release checks Daniel Vetter
2018-11-06 15:50 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with locking/lockdep: restore cross-release checks (rev3) Patchwork
2018-11-06 15:56 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-11-07  9:14 ` ✗ Fi.CI.BAT: failure " Patchwork

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=20181102091531.7775-9-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox