[PATCH v3] drm/amdkfd: Fix stack size in 'amdgpu_amdkfd_unmap_hiq'

[Chen, Guchun]

[Public]

Acked-by: Guchun Chen <guchun.chen at amd.com>

> -----Original Message-----
> From: SHANMUGAM, SRINIVASAN <SRINIVASAN.SHANMUGAM at amd.com>
> Sent: Monday, July 10, 2023 11:22 AM
> To: Koenig, Christian <Christian.Koenig at amd.com>; Deucher, Alexander
> <Alexander.Deucher at amd.com>; Kuehling, Felix <Felix.Kuehling at amd.com>;
> Chen, Guchun <Guchun.Chen at amd.com>
> Cc: amd-gfx at lists.freedesktop.org; SHANMUGAM, SRINIVASAN
> <SRINIVASAN.SHANMUGAM at amd.com>
> Subject: [PATCH v3] drm/amdkfd: Fix stack size in
> 'amdgpu_amdkfd_unmap_hiq'
>
> Allocate large local variable on heap to avoid exceeding the stack size:
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c: In function
> ‘amdgpu_amdkfd_unmap_hiq’:
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c:868:1: warning: the
> frame size of 1280 bytes is larger than 1024 bytes [-Wframe-larger-than=]
>
> Suggested-by: Guchun Chen <guchun.chen at amd.com>
> Cc: Felix Kuehling <Felix.Kuehling at amd.com>
> Cc: Christian König <christian.koenig at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>
> ---
>
> v3:
>  - free ring_funcs before 'return -ENOMEM' (Guchun).
>  - keep the check of ' kiq->pmf' and 'kiq->pmf->kiq_unmap_queues' ahead
>    of allocation of ring & ring_funcs (Guchun).
>
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 32 ++++++++++++++++-
> -----
>  1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 0040c63e2356..629ca1ad75a8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -836,33 +836,47 @@ int amdgpu_amdkfd_unmap_hiq(struct
> amdgpu_device *adev, u32 doorbell_off,  {
>       struct amdgpu_kiq *kiq = &adev->gfx.kiq[inst];
>       struct amdgpu_ring *kiq_ring = &kiq->ring;
> -     struct amdgpu_ring_funcs ring_funcs;
> -     struct amdgpu_ring ring;
> +     struct amdgpu_ring_funcs *ring_funcs;
> +     struct amdgpu_ring *ring;
>       int r = 0;
>
>       if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)
>               return -EINVAL;
>
> -     memset(&ring, 0x0, sizeof(struct amdgpu_ring));
> -     memset(&ring_funcs, 0x0, sizeof(struct amdgpu_ring_funcs));
> +     ring_funcs = kzalloc(sizeof(*ring_funcs), GFP_KERNEL);
> +     if (!ring_funcs)
> +             return -ENOMEM;
> +
> +     ring = kzalloc(sizeof(*ring), GFP_KERNEL);
> +     if (!ring) {
> +             r = -ENOMEM;
> +             goto free_ring_funcs;
> +     }
>
> -     ring_funcs.type = AMDGPU_RING_TYPE_COMPUTE;
> -     ring.doorbell_index = doorbell_off;
> -     ring.funcs = &ring_funcs;
> +     ring_funcs->type = AMDGPU_RING_TYPE_COMPUTE;
> +     ring->doorbell_index = doorbell_off;
> +     ring->funcs = ring_funcs;
>
>       spin_lock(&kiq->ring_lock);
>
>       if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->unmap_queues_size)) {
>               spin_unlock(&kiq->ring_lock);
> -             return -ENOMEM;
> +             r = -ENOMEM;
> +             goto free_ring;
>       }
>
> -     kiq->pmf->kiq_unmap_queues(kiq_ring, &ring, RESET_QUEUES, 0, 0);
> +     kiq->pmf->kiq_unmap_queues(kiq_ring, ring, RESET_QUEUES, 0, 0);
>
>       if (kiq_ring->sched.ready && !adev->job_hang)
>               r = amdgpu_ring_test_helper(kiq_ring);
>
>       spin_unlock(&kiq->ring_lock);
>
> +free_ring:
> +     kfree(ring);
> +
> +free_ring_funcs:
> +     kfree(ring_funcs);
> +
>       return r;
>  }
> --
> 2.25.1