RE: [PATCH RFC 4/9] drm/amd/pm: Avoid open-coded use of ratelimit_state structure's internals

[Deucher, Alexander]

[Public]

> -----Original Message-----
> From: Paul E. McKenney <paulmck@xxxxxxxxxx>
> Sent: Thursday, April 3, 2025 5:15 PM
> To: linux-kernel@xxxxxxxxxxxxxxx
> Cc: kernel-team@xxxxxxxx; Paul E. McKenney <paulmck@xxxxxxxxxx>; kernel
> test robot <lkp@xxxxxxxxx>; Feng, Kenneth <Kenneth.Feng@xxxxxxx>; Deucher,
> Alexander <Alexander.Deucher@xxxxxxx>; Koenig, Christian
> <Christian.Koenig@xxxxxxx>; Xinhui Pan <Xinhui.Pan@xxxxxxx>; David Airlie
> <airlied@xxxxxxxxx>; Simona Vetter <simona@xxxxxxxx>; amd-
> gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Subject: [PATCH RFC 4/9] drm/amd/pm: Avoid open-coded use of ratelimit_state
> structure's internals
>
> The amdgpu_set_thermal_throttling_logging() function directly accesses the
> ratelimit_state structure's ->missed field, which work, but which also makes it more
> difficult to change this field.  Therefore, make use of the ratelimit_state_reset_miss()
> function instead of directly accessing the ->missed field.
>
> Nevertheless, open-coded use of ->burst and ->interval is still permitted, for
> example, for runtime sysfs adjustment of these fields.
>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Closes: https://lore.kernel.org/oe-kbuild-all/202503180826.EiekA1MB-
> lkp@xxxxxxxxx/
> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>


Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>

Feel free to take this via whatever tree makes sense for the larger series.  Otherwise, let me know, and I will pick it up.

Alex


> Cc: Kenneth Feng <kenneth.feng@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: "Christian König" <christian.koenig@xxxxxxx>
> Cc: Xinhui Pan <Xinhui.Pan@xxxxxxx>
> Cc: David Airlie <airlied@xxxxxxxxx>
> Cc: Simona Vetter <simona@xxxxxxxx>
> Cc: <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>
> Cc: <dri-devel@xxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/gpu/drm/amd/pm/amdgpu_pm.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> index e8ae7681bf0a3..6adf4e8822108 100644
> --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> @@ -1663,7 +1663,6 @@ static ssize_t
> amdgpu_set_thermal_throttling_logging(struct device *dev,
>       struct drm_device *ddev = dev_get_drvdata(dev);
>       struct amdgpu_device *adev = drm_to_adev(ddev);
>       long throttling_logging_interval;
> -     unsigned long flags;
>       int ret = 0;
>
>       ret = kstrtol(buf, 0, &throttling_logging_interval); @@ -1674,18 +1673,12
> @@ static ssize_t amdgpu_set_thermal_throttling_logging(struct device *dev,
>               return -EINVAL;
>
>       if (throttling_logging_interval > 0) {
> -             raw_spin_lock_irqsave(&adev->throttling_logging_rs.lock, flags);
>               /*
>                * Reset the ratelimit timer internals.
>                * This can effectively restart the timer.
>                */
> -             adev->throttling_logging_rs.interval =
> -                     (throttling_logging_interval - 1) * HZ;
> -             adev->throttling_logging_rs.begin = 0;
> -             adev->throttling_logging_rs.printed = 0;
> -             adev->throttling_logging_rs.missed = 0;
> -             raw_spin_unlock_irqrestore(&adev->throttling_logging_rs.lock,
> flags);
> -
> +             ratelimit_state_reset_interval(&adev->throttling_logging_rs,
> +                                            (throttling_logging_interval - 1) * HZ);
>               atomic_set(&adev->throttling_logging_enabled, 1);
>       } else {
>               atomic_set(&adev->throttling_logging_enabled, 0);
> --
> 2.40.1