From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: "Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Gustavo Padovan" <gustavo@padovan.org>,
"Christian König" <christian.koenig@amd.com>,
"Kees Cook" <keescook@chromium.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org, linux-hardening@vger.kernel.org
Subject: Re: [Linaro-mm-sig] [PATCH] dma-buf/fence-array: Add flex array to struct dma_fence_array
Date: Tue, 21 May 2024 13:28:25 +0200 [thread overview]
Message-ID: <473b5f9b-da6d-425b-93c0-5bb6bb49a9bc@gmail.com> (raw)
In-Reply-To: <d3204a5b4776553455c2cfb1def72f1dae0dba25.1716054403.git.christophe.jaillet@wanadoo.fr>
Am 18.05.24 um 19:47 schrieb Christophe JAILLET:
> This is an effort to get rid of all multiplications from allocation
> functions in order to prevent integer overflows [1][2].
>
> The "struct dma_fence_array" can be refactored to add a flex array in order
> to have the "callback structures allocated behind the array" be more
> explicit.
>
> Do so:
> - makes the code more readable and safer.
> - allows using __counted_by() for additional checks
> - avoids some pointer arithmetic in dma_fence_array_enable_signaling()
>
> Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1]
> Link: https://github.com/KSPP/linux/issues/160 [2]
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only.
>
> Also, I don't think that 'cb' is a great name and the associated kernel-doc
> description could certainly be improved.
> Any proposal welcomed :)
Ah, yes. That was also on my TODO list for a very long time.
> ---
> drivers/dma-buf/dma-fence-array.c | 10 ++++------
> include/linux/dma-fence-array.h | 3 +++
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c
> index 9b3ce8948351..9c55afaca607 100644
> --- a/drivers/dma-buf/dma-fence-array.c
> +++ b/drivers/dma-buf/dma-fence-array.c
> @@ -70,7 +70,7 @@ static void dma_fence_array_cb_func(struct dma_fence *f,
> static bool dma_fence_array_enable_signaling(struct dma_fence *fence)
> {
> struct dma_fence_array *array = to_dma_fence_array(fence);
> - struct dma_fence_array_cb *cb = (void *)(&array[1]);
> + struct dma_fence_array_cb *cb = array->cb;
> unsigned i;
>
> for (i = 0; i < array->num_fences; ++i) {
> @@ -168,22 +168,20 @@ struct dma_fence_array *dma_fence_array_create(int num_fences,
> bool signal_on_any)
> {
> struct dma_fence_array *array;
> - size_t size = sizeof(*array);
>
> WARN_ON(!num_fences || !fences);
>
> - /* Allocate the callback structures behind the array. */
> - size += num_fences * sizeof(struct dma_fence_array_cb);
> - array = kzalloc(size, GFP_KERNEL);
> + array = kzalloc(struct_size(array, cb, num_fences), GFP_KERNEL);
> if (!array)
> return NULL;
>
> + array->num_fences = num_fences;
> +
> spin_lock_init(&array->lock);
> dma_fence_init(&array->base, &dma_fence_array_ops, &array->lock,
> context, seqno);
> init_irq_work(&array->work, irq_dma_fence_array_work);
>
> - array->num_fences = num_fences;
> atomic_set(&array->num_pending, signal_on_any ? 1 : num_fences);
> array->fences = fences;
>
> diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h
> index ec7f25def392..a793f9d5c73b 100644
> --- a/include/linux/dma-fence-array.h
> +++ b/include/linux/dma-fence-array.h
> @@ -33,6 +33,7 @@ struct dma_fence_array_cb {
> * @num_pending: fences in the array still pending
> * @fences: array of the fences
> * @work: internal irq_work function
> + * @cb: array of callback helpers
> */
> struct dma_fence_array {
> struct dma_fence base;
> @@ -43,6 +44,8 @@ struct dma_fence_array {
> struct dma_fence **fences;
>
> struct irq_work work;
> +
> + struct dma_fence_array_cb cb[] __counted_by(num_fences);
Please name that callbacks, apart from that looks good to me.
Regards,
Christian.
> };
>
> /**
prev parent reply other threads:[~2024-05-21 11:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-18 17:47 [PATCH] dma-buf/fence-array: Add flex array to struct dma_fence_array Christophe JAILLET
2024-05-18 18:06 ` Kees Cook
2024-05-21 11:28 ` Christian König [this message]
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=473b5f9b-da6d-425b-93c0-5bb6bb49a9bc@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=christian.koenig@amd.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo@padovan.org \
--cc=gustavoars@kernel.org \
--cc=keescook@chromium.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=sumit.semwal@linaro.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 read-only IMAP folder(s) and NNTP newsgroup(s).