* [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc
@ 2024-06-06 15:43 Eric Huang
2024-06-06 16:36 ` Alex Deucher
2024-06-06 17:32 ` Lazar, Lijo
0 siblings, 2 replies; 3+ messages in thread
From: Eric Huang @ 2024-06-06 15:43 UTC (permalink / raw)
To: amd-gfx; +Cc: Lijo.Lazar, Eric Huang
amdgpu_job_ring may return NULL, which causes kernel NULL
pointer error, using another way to print ring name instead
of ring->name.
Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index 9deb41d61e8d..66c1a868c0e1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -164,16 +164,14 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain)
void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,
size_t len)
{
- struct amdgpu_ring *ring;
-
if (!buf || !len)
return;
switch (rst_ctxt->src) {
case AMDGPU_RESET_SRC_JOB:
if (rst_ctxt->job) {
- ring = amdgpu_job_ring(rst_ctxt->job);
- snprintf(buf, len, "job hang on ring:%s", ring->name);
+ snprintf(buf, len, "job hang on ring:%s",
+ rst_ctxt->job->base.sched->name);
} else {
strscpy(buf, "job hang", len);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc
2024-06-06 15:43 [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc Eric Huang
@ 2024-06-06 16:36 ` Alex Deucher
2024-06-06 17:32 ` Lazar, Lijo
1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2024-06-06 16:36 UTC (permalink / raw)
To: Eric Huang; +Cc: amd-gfx, Lijo.Lazar
On Thu, Jun 6, 2024 at 11:52 AM Eric Huang <jinhuieric.huang@amd.com> wrote:
>
> amdgpu_job_ring may return NULL, which causes kernel NULL
> pointer error, using another way to print ring name instead
> of ring->name.
>
> Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
> Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> index 9deb41d61e8d..66c1a868c0e1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> @@ -164,16 +164,14 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain)
> void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,
> size_t len)
> {
> - struct amdgpu_ring *ring;
> -
> if (!buf || !len)
> return;
>
> switch (rst_ctxt->src) {
> case AMDGPU_RESET_SRC_JOB:
> if (rst_ctxt->job) {
> - ring = amdgpu_job_ring(rst_ctxt->job);
> - snprintf(buf, len, "job hang on ring:%s", ring->name);
> + snprintf(buf, len, "job hang on ring:%s",
> + rst_ctxt->job->base.sched->name);
> } else {
> strscpy(buf, "job hang", len);
> }
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc
2024-06-06 15:43 [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc Eric Huang
2024-06-06 16:36 ` Alex Deucher
@ 2024-06-06 17:32 ` Lazar, Lijo
1 sibling, 0 replies; 3+ messages in thread
From: Lazar, Lijo @ 2024-06-06 17:32 UTC (permalink / raw)
To: Eric Huang, amd-gfx
On 6/6/2024 9:13 PM, Eric Huang wrote:
> amdgpu_job_ring may return NULL, which causes kernel NULL
> pointer error, using another way to print ring name instead
> of ring->name.
>
> Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
> Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Thanks,
Lijo
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> index 9deb41d61e8d..66c1a868c0e1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> @@ -164,16 +164,14 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain)
> void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,
> size_t len)
> {
> - struct amdgpu_ring *ring;
> -
> if (!buf || !len)
> return;
>
> switch (rst_ctxt->src) {
> case AMDGPU_RESET_SRC_JOB:
> if (rst_ctxt->job) {
> - ring = amdgpu_job_ring(rst_ctxt->job);
> - snprintf(buf, len, "job hang on ring:%s", ring->name);
> + snprintf(buf, len, "job hang on ring:%s",
> + rst_ctxt->job->base.sched->name);
> } else {
> strscpy(buf, "job hang", len);
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-06 17:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-06 15:43 [PATCH] drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc Eric Huang
2024-06-06 16:36 ` Alex Deucher
2024-06-06 17:32 ` Lazar, Lijo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox