From: Jason Ekstrand <jason@jlekstrand.net>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Chenbo Feng" <fengc@google.com>,
daniels@collabora.com, daniel.vetter@ffwll.ch,
jajones@nvidia.com, linux-kernel@vger.kernel.org,
"Greg Hackmann" <ghackmann@google.com>,
linaro-mm-sig@lists.linaro.org, hoegsberg@google.com,
dri-devel@lists.freedesktop.org,
"Jason Ekstrand" <jason@jlekstrand.net>,
jessehall@google.com, airlied@redhat.com,
christian.koenig@amd.com, linux-media@vger.kernel.org
Subject: [PATCH 2/3] dma-buf: add dma_resv_get_singleton (v2)
Date: Tue, 10 Mar 2020 22:43:47 -0500 [thread overview]
Message-ID: <20200311034351.1275197-2-jason@jlekstrand.net> (raw)
In-Reply-To: <20200311034351.1275197-1-jason@jlekstrand.net>
From: Christian König <ckoenig.leichtzumerken@gmail.com>
Add a helper function to get a single fence representing
all fences in a dma_resv object.
This fence is either the only one in the object or all not
signaled fences of the object in a flatted out dma_fence_array.
v2 (Jason Ekstrand):
- Take reference of fences both for creating the dma_fence_array and in
the case where we return one fence.
- Handle the case where dma_resv_get_list() returns NULL
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
---
drivers/dma-buf/dma-resv.c | 118 +++++++++++++++++++++++++++++++++++++
include/linux/dma-resv.h | 3 +
2 files changed, 121 insertions(+)
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 4264e64788c4..66591d8ab7ef 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -33,6 +33,8 @@
*/
#include <linux/dma-resv.h>
+#include <linux/dma-fence-chain.h>
+#include <linux/dma-fence-array.h>
#include <linux/export.h>
#include <linux/sched/mm.h>
@@ -47,6 +49,19 @@
* write-side updates.
*/
+/**
+ * dma_fence_deep_dive_for_each - deep dive into the fence containers
+ * @fence: resulting fence
+ * @chain: variable for a dma_fence_chain
+ * @index: index into a dma_fence_array
+ * @head: starting point
+ *
+ * Helper to deep dive into the fence containers for flattening them.
+ */
+#define dma_fence_deep_dive_for_each(fence, chain, index, head) \
+ dma_fence_chain_for_each(chain, head) \
+ dma_fence_array_for_each(fence, index, chain)
+
DEFINE_WD_CLASS(reservation_ww_class);
EXPORT_SYMBOL(reservation_ww_class);
@@ -516,6 +531,109 @@ int dma_resv_get_fences_rcu(struct dma_resv *obj,
}
EXPORT_SYMBOL_GPL(dma_resv_get_fences_rcu);
+/**
+ * dma_resv_get_singleton - get a single fence for the dma_resv object
+ * @obj: the reservation object
+ * @extra: extra fence to add to the resulting array
+ * @result: resulting dma_fence
+ *
+ * Get a single fence representing all unsignaled fences in the dma_resv object
+ * plus the given extra fence. If we got only one fence return a new
+ * reference to that, otherwise return a dma_fence_array object.
+ *
+ * RETURNS
+ * Returns -NOMEM if allocations fail, zero otherwise.
+ */
+int dma_resv_get_singleton(struct dma_resv *obj, struct dma_fence *extra,
+ struct dma_fence **result)
+{
+ struct dma_resv_list *fobj = dma_resv_get_list(obj);
+ struct dma_fence *excl = dma_resv_get_excl(obj);
+ struct dma_fence *fence, *chain, **fences;
+ struct dma_fence_array *array;
+ unsigned int num_fences, shared_count;
+ unsigned int i, j;
+
+ num_fences = 0;
+ *result = NULL;
+
+ dma_fence_deep_dive_for_each(fence, chain, i, extra) {
+ if (dma_fence_is_signaled(fence))
+ continue;
+
+ *result = fence;
+ ++num_fences;
+ }
+
+ dma_fence_deep_dive_for_each(fence, chain, i, excl) {
+ if (dma_fence_is_signaled(fence))
+ continue;
+
+ *result = fence;
+ ++num_fences;
+ }
+
+ shared_count = fobj ? fobj->shared_count : 0;
+ for (i = 0; i < shared_count; ++i) {
+ struct dma_fence *f;
+
+ f = rcu_dereference_protected(fobj->shared[i],
+ dma_resv_held(obj));
+ dma_fence_deep_dive_for_each(fence, chain, j, f) {
+ if (dma_fence_is_signaled(fence))
+ continue;
+
+ *result = fence;
+ ++num_fences;
+ }
+ }
+
+ if (num_fences <= 1) {
+ *result = dma_fence_get(*result);
+ return 0;
+ }
+
+ fences = kmalloc_array(num_fences, sizeof(struct dma_fence*),
+ GFP_KERNEL);
+ if (!fences)
+ return -ENOMEM;
+
+ num_fences = 0;
+
+ dma_fence_deep_dive_for_each(fence, chain, i, extra)
+ if (!dma_fence_is_signaled(fence))
+ fences[num_fences++] = dma_fence_get(fence);
+
+ dma_fence_deep_dive_for_each(fence, chain, i, excl)
+ if (!dma_fence_is_signaled(fence))
+ fences[num_fences++] = dma_fence_get(fence);
+
+ for (i = 0; i < shared_count; ++i) {
+ struct dma_fence *f;
+
+ f = rcu_dereference_protected(fobj->shared[i],
+ dma_resv_held(obj));
+ dma_fence_deep_dive_for_each(fence, chain, j, f)
+ if (!dma_fence_is_signaled(fence))
+ fences[num_fences++] = dma_fence_get(fence);
+ }
+
+ array = dma_fence_array_create(num_fences, fences,
+ dma_fence_context_alloc(1),
+ 1, false);
+ if (!array)
+ goto error_free;
+
+ *result = &array->base;
+ return 0;
+
+error_free:
+ while (num_fences--)
+ dma_fence_put(fences[num_fences]);
+ kfree(fences);
+ return -ENOMEM;
+}
+
/**
* dma_resv_wait_timeout_rcu - Wait on reservation's objects
* shared and/or exclusive fences.
diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h
index ee50d10f052b..d50e753e4550 100644
--- a/include/linux/dma-resv.h
+++ b/include/linux/dma-resv.h
@@ -287,6 +287,9 @@ int dma_resv_get_fences_rcu(struct dma_resv *obj,
int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src);
+int dma_resv_get_singleton(struct dma_resv *obj, struct dma_fence *extra,
+ struct dma_fence **result);
+
long dma_resv_wait_timeout_rcu(struct dma_resv *obj, bool wait_all, bool intr,
unsigned long timeout);
--
2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-03-11 3:44 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 23:58 [PATCH] RFC: dma-buf: Add an API for importing and exporting sync files Jason Ekstrand
2020-02-26 9:16 ` Christian König
2020-02-26 10:05 ` Daniel Vetter
2020-02-26 15:28 ` Jason Ekstrand
2020-02-26 16:46 ` Bas Nieuwenhuizen
2020-02-27 8:28 ` Christian König
2020-03-03 19:10 ` Jason Ekstrand
2020-03-04 8:34 ` Christian König
2020-03-04 16:27 ` Jason Ekstrand
2020-03-04 16:41 ` Jason Ekstrand
2020-03-05 13:06 ` Christian König
2020-03-05 15:54 ` Jason Ekstrand
2020-03-09 16:21 ` Christian König
2020-03-11 3:43 ` Jason Ekstrand
2020-02-26 18:09 ` [PATCH] RFC: dma-buf: Add an API for importing and exporting sync files (v2) Jason Ekstrand
2020-03-03 19:03 ` [PATCH] RFC: dma-buf: Add an API for importing and exporting sync files (v3) Jason Ekstrand
2020-03-03 19:05 ` Jason Ekstrand
2020-03-11 3:43 ` [PATCH 1/3] dma-buf: add dma_fence_array_for_each (v2) Jason Ekstrand
2020-03-11 3:43 ` Jason Ekstrand [this message]
2020-03-11 3:43 ` [PATCH 3/3] RFC: dma-buf: Add an API for importing and exporting sync files (v4) Jason Ekstrand
2020-03-11 13:18 ` Christian König
2020-03-12 15:57 ` Jason Ekstrand
2020-03-13 10:33 ` Christian König
2020-03-17 21:21 ` [PATCH 3/3] RFC: dma-buf: Add an API for importing and exporting sync files (v5) Jason Ekstrand
2020-09-30 9:39 ` Michel Dänzer
2020-09-30 9:55 ` Daniel Vetter
2021-03-15 21:11 ` Jason Ekstrand
2021-03-15 21:30 ` Daniel Vetter
2021-03-15 21:04 ` [PATCH 0/3] dma-buf: Add an API for exporting sync files (v6) Jason Ekstrand
2021-03-15 21:04 ` [PATCH 1/3] dma-buf: add dma_fence_array_for_each (v2) Jason Ekstrand
2021-03-15 21:04 ` [PATCH 2/3] dma-buf: add dma_resv_get_singleton (v2) Jason Ekstrand
2021-03-15 21:04 ` [PATCH 3/3] dma-buf: Add an API for exporting sync files (v6) Jason Ekstrand
2021-03-15 23:10 ` Jason Ekstrand
2021-03-16 8:51 ` Michel Dänzer
2021-03-16 14:35 ` Jason Ekstrand
2021-03-16 0:10 ` kernel test robot
2021-03-16 2:37 ` kernel test robot
2021-03-16 0:15 ` [PATCH 0/3] " Jason Ekstrand
2021-03-16 4:53 ` [PATCH 0/3] dma-buf: Add an API for exporting sync files (v7) Jason Ekstrand
2021-03-16 4:53 ` [PATCH 1/3] dma-buf: add dma_fence_array_for_each (v2) Jason Ekstrand
2021-03-16 4:53 ` [PATCH 2/3] dma-buf: add dma_resv_get_singleton_rcu (v3) Jason Ekstrand
2021-03-16 4:53 ` [PATCH 3/3] dma-buf: Add an API for exporting sync files (v7) Jason Ekstrand
2021-03-16 8:06 ` kernel test robot
2021-03-17 22:19 ` [PATCH 0/3] dma-buf: Add an API for exporting sync files (v8) Jason Ekstrand
2021-03-17 22:19 ` [PATCH 1/3] dma-buf: add dma_fence_array_for_each (v2) Jason Ekstrand
2021-03-18 9:38 ` Christian König
2021-03-18 13:13 ` Daniel Vetter
2021-03-19 1:40 ` Jason Ekstrand
2021-03-17 22:19 ` [PATCH 2/3] dma-buf: add dma_resv_get_singleton_rcu (v3) Jason Ekstrand
2021-03-17 22:19 ` [PATCH 3/3] dma-buf: Add an API for exporting sync files (v8) Jason Ekstrand
2021-03-23 17:57 ` Jason Ekstrand
2021-03-23 19:06 ` Simon Ser
2021-03-23 19:34 ` Jason Ekstrand
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=20200311034351.1275197-2-jason@jlekstrand.net \
--to=jason@jlekstrand.net \
--cc=airlied@redhat.com \
--cc=christian.koenig@amd.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fengc@google.com \
--cc=ghackmann@google.com \
--cc=hoegsberg@google.com \
--cc=jajones@nvidia.com \
--cc=jessehall@google.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).