From: Felix Kuehling <felix.kuehling@amd.com>
To: Aurabindo Pillai <aurabindo.pillai@amd.com>,
alexander.deucher@amd.com, christian.koenig@amd.com
Cc: airlied@linux.ie, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Amber Lin <Amber.Lin@amd.com>
Subject: Re: [PATCH] drm/amd/amdkfd: Fix large framesize for kfd_smi_ev_read()
Date: Wed, 20 May 2020 15:19:40 -0400 [thread overview]
Message-ID: <1c09eb78-f2a4-3f20-1bee-2590c35b982e@amd.com> (raw)
In-Reply-To: <20200520135306.11221-1-aurabindo.pillai@amd.com>
Am 2020-05-20 um 9:53 a.m. schrieb Aurabindo Pillai:
> The buffer allocated is of 1024 bytes. Allocate this from
> heap instead of stack.
>
> Also remove check for stack size since we're allocating from heap
>
> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
> Tested-by: Amber Lin <Amber.Lin@amd.com>
See one comment inline. With that fixed, the patch is
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 26 +++++++++++++++------
> 1 file changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
> index f5fd18eacf0d..5aebe169f8c6 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
> @@ -77,9 +77,11 @@ static ssize_t kfd_smi_ev_read(struct file *filep, char __user *user,
> int ret;
> size_t to_copy;
> struct kfd_smi_client *client = filep->private_data;
> - unsigned char buf[MAX_KFIFO_SIZE];
> + unsigned char *buf;
>
> - BUILD_BUG_ON(MAX_KFIFO_SIZE > 1024);
> + buf = kzalloc(MAX_KFIFO_SIZE * sizeof(*buf), GFP_KERNEL);
kzalloc is not necessary here, you could use kmalloc. The part of that
allocation that matters will be overwritten by kfifo_out.
Regards,
Felix
> + if (!buf)
> + return -ENOMEM;
>
> /* kfifo_to_user can sleep so we can't use spinlock protection around
> * it. Instead, we kfifo out as spinlocked then copy them to the user.
> @@ -88,19 +90,29 @@ static ssize_t kfd_smi_ev_read(struct file *filep, char __user *user,
> to_copy = kfifo_len(&client->fifo);
> if (!to_copy) {
> spin_unlock(&client->lock);
> - return -EAGAIN;
> + ret = -EAGAIN;
> + goto ret_err;
> }
> to_copy = min3(size, sizeof(buf), to_copy);
> ret = kfifo_out(&client->fifo, buf, to_copy);
> spin_unlock(&client->lock);
> - if (ret <= 0)
> - return -EAGAIN;
> + if (ret <= 0) {
> + ret = -EAGAIN;
> + goto ret_err;
> + }
>
> ret = copy_to_user(user, buf, to_copy);
> - if (ret)
> - return -EFAULT;
> + if (ret) {
> + ret = -EFAULT;
> + goto ret_err;
> + }
>
> + kfree(buf);
> return to_copy;
> +
> +ret_err:
> + kfree(buf);
> + return ret;
> }
>
> static ssize_t kfd_smi_ev_write(struct file *filep, const char __user *user,
next prev parent reply other threads:[~2020-05-20 19:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:53 [PATCH] drm/amd/amdkfd: Fix large framesize for kfd_smi_ev_read() Aurabindo Pillai
2020-05-20 18:21 ` Alex Deucher
2020-05-20 19:19 ` Felix Kuehling [this message]
2020-05-21 13:06 ` Aurabindo Pillai
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=1c09eb78-f2a4-3f20-1bee-2590c35b982e@amd.com \
--to=felix.kuehling@amd.com \
--cc=Amber.Lin@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aurabindo.pillai@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@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).