From: "Christian König" <christian.koenig@amd.com>
To: Jason Ekstrand <jason@jlekstrand.net>, dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH 2/6] dma-buf: Add dma_resv_get_singleton (v6)
Date: Fri, 11 Jun 2021 09:11:27 +0200 [thread overview]
Message-ID: <4f27d6ea-ed7e-1d25-3b8f-9852df1eb2a6@amd.com> (raw)
In-Reply-To: <20210610210925.642582-3-jason@jlekstrand.net>
Am 10.06.21 um 23:09 schrieb Jason Ekstrand:
> 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
>
> v3 (Jason Ekstrand):
> - Add an _rcu suffix because it is read-only
> - Rewrite to use dma_resv_get_fences_rcu so it's RCU-safe
> - Add an EXPORT_SYMBOL_GPL declaration
> - Re-author the patch to Jason since very little is left of Christian
> König's original patch
> - Remove the extra fence argument
>
> v4 (Jason Ekstrand):
> - Restore the extra fence argument
>
> v5 (Daniel Vetter):
> - Rename from _rcu to _unlocked since it doesn't leak RCU details to
> the caller
> - Fix docs
> - Use ERR_PTR for error handling rather than an output dma_fence**
>
> v5 (Jason Ekstrand):
> - Drop the extra fence param and leave that to a separate patch
>
> v6 (Jason Ekstrand):
> - Rename to dma_resv_get_singleton to match the new naming convention
> for dma_resv helpers which work without taking a lock.
>
> Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Christian König <christian.koenig@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/dma-buf/dma-resv.c | 91 ++++++++++++++++++++++++++++++++++++++
> include/linux/dma-resv.h | 1 +
> 2 files changed, 92 insertions(+)
>
> diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
> index f26c71747d43a..1b26aa7e5d81c 100644
> --- a/drivers/dma-buf/dma-resv.c
> +++ b/drivers/dma-buf/dma-resv.c
> @@ -34,6 +34,8 @@
> */
>
> #include <linux/dma-resv.h>
> +#include <linux/dma-fence-chain.h>
> +#include <linux/dma-fence-array.h>
> #include <linux/export.h>
> #include <linux/mm.h>
> #include <linux/sched/mm.h>
> @@ -50,6 +52,10 @@
> * write-side updates.
> */
>
> +#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);
>
> @@ -495,6 +501,91 @@ int dma_resv_get_fences(struct dma_resv *obj, struct dma_fence **pfence_excl,
> }
> EXPORT_SYMBOL_GPL(dma_resv_get_fences);
>
> +/**
> + * dma_resv_get_singleton - get a single fence for the dma_resv object
> + * @obj: the reservation object
> + *
> + * 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
> + * The singleton dma_fence on success or an ERR_PTR on failure
> + */
> +struct dma_fence *dma_resv_get_singleton(struct dma_resv *obj)
> +{
> + struct dma_fence *result, **resv_fences, *fence, *chain, **fences;
> + struct dma_fence_array *array;
> + unsigned int num_resv_fences, num_fences;
> + unsigned int err, i, j;
> +
> + err = dma_resv_get_fences(obj, NULL, &num_resv_fences, &resv_fences);
> + if (err)
> + return ERR_PTR(err);
> +
> + if (num_resv_fences == 0)
> + return NULL;
> +
> + num_fences = 0;
> + result = NULL;
> +
> + for (i = 0; i < num_resv_fences; ++i) {
> + dma_fence_deep_dive_for_each(fence, chain, j, resv_fences[i]) {
> + if (dma_fence_is_signaled(fence))
> + continue;
> +
> + result = fence;
> + ++num_fences;
> + }
> + }
> +
> + if (num_fences <= 1) {
> + result = dma_fence_get(result);
> + goto put_resv_fences;
> + }
> +
> + fences = kmalloc_array(num_fences, sizeof(struct dma_fence *),
> + GFP_KERNEL);
> + if (!fences) {
> + result = ERR_PTR(-ENOMEM);
> + goto put_resv_fences;
> + }
> +
> + num_fences = 0;
> + for (i = 0; i < num_resv_fences; ++i) {
> + dma_fence_deep_dive_for_each(fence, chain, j, resv_fences[i]) {
> + if (!dma_fence_is_signaled(fence))
> + fences[num_fences++] = dma_fence_get(fence);
> + }
> + }
> +
> + if (num_fences <= 1) {
> + result = num_fences ? fences[0] : NULL;
> + kfree(fences);
> + goto put_resv_fences;
> + }
> +
> + array = dma_fence_array_create(num_fences, fences,
> + dma_fence_context_alloc(1),
> + 1, false);
> + if (array) {
> + result = &array->base;
> + } else {
> + result = ERR_PTR(-ENOMEM);
> + while (num_fences--)
> + dma_fence_put(fences[num_fences]);
> + kfree(fences);
> + }
> +
> +put_resv_fences:
> + while (num_resv_fences--)
> + dma_fence_put(resv_fences[num_resv_fences]);
> + kfree(resv_fences);
> +
> + return result;
> +}
> +EXPORT_SYMBOL_GPL(dma_resv_get_singleton);
> +
> /**
> * dma_resv_wait_timeout - 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 562b885cf9c3d..d60982975a786 100644
> --- a/include/linux/dma-resv.h
> +++ b/include/linux/dma-resv.h
> @@ -275,6 +275,7 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence);
> int dma_resv_get_fences(struct dma_resv *obj, struct dma_fence **pfence_excl,
> unsigned *pshared_count, struct dma_fence ***pshared);
> int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src);
> +struct dma_fence *dma_resv_get_singleton(struct dma_resv *obj);
> long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
> unsigned long timeout);
> bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all);
next prev parent reply other threads:[~2021-06-11 7:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 21:09 [PATCH 0/6] dma-buf: Add an API for exporting sync files (v12) Jason Ekstrand
2021-06-10 21:09 ` [PATCH 1/6] dma-buf: Add dma_fence_array_for_each (v2) Jason Ekstrand
2021-06-10 21:09 ` [PATCH 2/6] dma-buf: Add dma_resv_get_singleton (v6) Jason Ekstrand
2021-06-11 7:11 ` Christian König [this message]
2021-06-10 21:09 ` [PATCH 3/6] dma-buf: Document DMA_BUF_IOCTL_SYNC (v2) Jason Ekstrand
2021-06-10 21:14 ` Jason Ekstrand
2021-06-15 7:10 ` Pekka Paalanen
2021-06-11 7:24 ` Christian König
2021-06-10 21:09 ` [PATCH 4/6] dma-buf: Add an API for exporting sync files (v12) Jason Ekstrand
2021-06-13 18:26 ` Jason Ekstrand
2021-10-20 20:31 ` Simon Ser
2021-06-10 21:09 ` [PATCH 5/6] RFC: dma-buf: Add an extra fence to dma_resv_get_singleton_unlocked Jason Ekstrand
2021-06-11 7:44 ` Christian König
2021-06-10 21:09 ` [PATCH 6/6] RFC: dma-buf: Add an API for importing sync files (v7) Jason Ekstrand
2022-03-22 15:02 ` msizanoen
2021-06-15 8:41 ` [Mesa-dev] [PATCH 0/6] dma-buf: Add an API for exporting sync files (v12) Christian König
2021-06-16 18:30 ` Jason Ekstrand
2021-06-17 7:37 ` Christian König
2021-06-17 19:58 ` Daniel Vetter
2021-06-18 9:15 ` Christian König
2021-06-18 13:54 ` Jason Ekstrand
2021-06-18 14:31 ` Daniel Vetter
2021-06-18 14:42 ` Christian König
2021-06-18 15:17 ` Daniel Vetter
2021-06-18 16:42 ` Christian König
2021-06-18 17:20 ` Daniel Vetter
2021-06-18 18:01 ` Christian König
2021-06-18 18:45 ` Daniel Vetter
2021-06-21 10:16 ` Christian König
2021-06-21 13:57 ` Daniel Vetter
2021-06-18 18:20 ` Daniel Stone
2021-06-18 18:44 ` 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=4f27d6ea-ed7e-1d25-3b8f-9852df1eb2a6@amd.com \
--to=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jason@jlekstrand.net \
/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).