Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
MIME-Version: 1.0
References: <87wmuwo7i3.fsf@gentoo.org> <20231105160652.374422-1-sam@gentoo.org>
In-Reply-To: <20231105160652.374422-1-sam@gentoo.org>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Mon, 6 Nov 2023 13:48:38 -0500
Message-ID: <CADnq5_OvEsUD5wcvk8YtvHO+=89WJra4YFRoKe8JANvM_R9AKg@mail.gmail.com>
Subject: Re: [PATCH] amdgpu: Adjust kmalloc_array calls for new -Walloc-size
To:     Sam James <sam@gentoo.org>
Cc:     amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

Alex

On Sun, Nov 5, 2023 at 11:07=E2=80=AFAM Sam James <sam@gentoo.org> wrote:
>
> GCC 14 introduces a new -Walloc-size included in -Wextra which errors out
> on various files in drivers/gpu/drm/amd/amdgpu like:
> ```
> amdgpu_amdkfd_gfx_v8.c:241:15: error: allocation of insufficient size =E2=
=80=984=E2=80=99 for type =E2=80=98uint32_t[2]=E2=80=99 {aka =E2=80=98unsig=
ned int[2]'} with size =E2=80=988=E2=80=99 [-Werror=3Dalloc-size]
> ```
>
> This is because each HQD_N_REGS is actually a uint32_t[2]. Move the * 2 t=
o
> the size argument so GCC sees we're allocating enough.
>
> Originally did 'sizeof(uint32_t) * 2' for the size but a friend suggested
> 'sizeof(**dump)' better communicates the intent.
>
> Link: https://lore.kernel.org/all/87wmuwo7i3.fsf@gentoo.org/
> Signed-off-by: Sam James <sam@gentoo.org>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c   | 4 ++--
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c   | 4 ++--
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c   | 4 ++--
>  5 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/driver=
s/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> index 625db444df1c..0ba15dcbe4e1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> @@ -200,7 +200,7 @@ int kgd_arcturus_hqd_sdma_dump(struct amdgpu_device *=
adev,
>  #undef HQD_N_REGS
>  #define HQD_N_REGS (19+6+7+10)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c b/driver=
s/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
> index 490c8f5ddb60..ca7238b5535b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
> @@ -141,7 +141,7 @@ static int kgd_gfx_v9_4_3_hqd_sdma_dump(struct amdgpu=
_device *adev,
>                 (*dump)[i++][1] =3D RREG32(addr);         \
>         } while (0)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/=
gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index 6bf448ab3dff..ca4a6b82817f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -214,7 +214,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev,
>                 (*dump)[i++][1] =3D RREG32(addr);         \
>         } while (0)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> @@ -301,7 +301,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *ad=
ev,
>  #undef HQD_N_REGS
>  #define HQD_N_REGS (19+4)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/=
gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index cd06e4a6d1da..0f3e2944edd7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -238,7 +238,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev,
>                 (*dump)[i++][1] =3D RREG32(addr);         \
>         } while (0)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> @@ -324,7 +324,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *ad=
ev,
>  #undef HQD_N_REGS
>  #define HQD_N_REGS (19+4+2+3+7)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/=
gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index 51011e8ee90d..a3355b90aac5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -365,7 +365,7 @@ int kgd_gfx_v9_hqd_dump(struct amdgpu_device *adev,
>                 (*dump)[i++][1] =3D RREG32(addr);         \
>         } while (0)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> @@ -462,7 +462,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *ad=
ev,
>  #undef HQD_N_REGS
>  #define HQD_N_REGS (19+6+7+10)
>
> -       *dump =3D kmalloc_array(HQD_N_REGS * 2, sizeof(uint32_t), GFP_KER=
NEL);
> +       *dump =3D kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);
>         if (*dump =3D=3D NULL)
>                 return -ENOMEM;
>
> --
> 2.42.1
>