2022-03-08 23:50:56

by Rob Clark

Subject: [PATCH] drm/msm/gpu: Fix crash on devices without devfreq support (v2)

From: Rob Clark <[email protected]>

Avoid going down devfreq paths on devices where devfreq is not
initialized.

v2: Change has_devfreq() logic [Dmitry]

Reported-by: Linux Kernel Functional Testing <[email protected]>
Reported-by: Anders Roxell <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
---
drivers/gpu/drm/msm/msm_gpu_devfreq.c | 30 ++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
index 9bf319be11f6..12641616acd3 100644
--- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c
+++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
@@ -83,6 +83,12 @@ static struct devfreq_dev_profile msm_devfreq_profile = {
static void msm_devfreq_boost_work(struct kthread_work *work);
static void msm_devfreq_idle_work(struct kthread_work *work);

+static bool has_devfreq(struct msm_gpu *gpu)
+{
+ struct msm_gpu_devfreq *df = &gpu->devfreq;
+ return !!df->devfreq;
+}
+
void msm_devfreq_init(struct msm_gpu *gpu)
{
struct msm_gpu_devfreq *df = &gpu->devfreq;
@@ -149,6 +155,9 @@ void msm_devfreq_cleanup(struct msm_gpu *gpu)
{
struct msm_gpu_devfreq *df = &gpu->devfreq;

+ if (!has_devfreq(gpu))
+ return;
+
devfreq_cooling_unregister(gpu->cooling);
dev_pm_qos_remove_request(&df->boost_freq);
dev_pm_qos_remove_request(&df->idle_freq);
@@ -156,16 +165,24 @@ void msm_devfreq_cleanup(struct msm_gpu *gpu)

void msm_devfreq_resume(struct msm_gpu *gpu)
{
- gpu->devfreq.busy_cycles = 0;
- gpu->devfreq.time = ktime_get();
+ struct msm_gpu_devfreq *df = &gpu->devfreq;

- devfreq_resume_device(gpu->devfreq.devfreq);
+ if (!has_devfreq(gpu))
+ return;
+
+ df->busy_cycles = 0;
+ df->time = ktime_get();
+
+ devfreq_resume_device(df->devfreq);
}

void msm_devfreq_suspend(struct msm_gpu *gpu)
{
struct msm_gpu_devfreq *df = &gpu->devfreq;

+ if (!has_devfreq(gpu))
+ return;
+
devfreq_suspend_device(df->devfreq);

cancel_idle_work(df);
@@ -185,6 +202,9 @@ void msm_devfreq_boost(struct msm_gpu *gpu, unsigned factor)
struct msm_gpu_devfreq *df = &gpu->devfreq;
uint64_t freq;

+ if (!has_devfreq(gpu))
+ return;
+
freq = get_freq(gpu);
freq *= factor;

@@ -207,7 +227,7 @@ void msm_devfreq_active(struct msm_gpu *gpu)
struct devfreq_dev_status status;
unsigned int idle_time;

- if (!df->devfreq)
+ if (!has_devfreq(gpu))
return;

/*
@@ -253,7 +273,7 @@ void msm_devfreq_idle(struct msm_gpu *gpu)
{
struct msm_gpu_devfreq *df = &gpu->devfreq;

- if (!df->devfreq)
+ if (!has_devfreq(gpu))
return;

msm_hrtimer_queue_work(&df->idle_work, ms_to_ktime(1),
--
2.35.1

2022-03-09 01:44:37

by Fabio Estevam

Subject: Re: [PATCH] drm/msm/gpu: Fix crash on devices without devfreq support (v2)

On Tue, Mar 8, 2022 at 3:48 PM Rob Clark <[email protected]> wrote:
>
> From: Rob Clark <[email protected]>
>
> Avoid going down devfreq paths on devices where devfreq is not
> initialized.
>
> v2: Change has_devfreq() logic [Dmitry]
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Reported-by: Anders Roxell <[email protected]>
> Signed-off-by: Rob Clark <[email protected]>

Does this need a Fixes tag?

2022-03-09 01:48:01

by Dmitry Baryshkov

Subject: Re: [PATCH] drm/msm/gpu: Fix crash on devices without devfreq support (v2)

On Tue, 8 Mar 2022 at 21:48, Rob Clark <[email protected]> wrote:
>
> From: Rob Clark <[email protected]>
>
> Avoid going down devfreq paths on devices where devfreq is not
> initialized.
>
> v2: Change has_devfreq() logic [Dmitry]
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Reported-by: Anders Roxell <[email protected]>
> Signed-off-by: Rob Clark <[email protected]>

Reviewed-by: Dmitry Baryshkov <[email protected]>

> ---
> drivers/gpu/drm/msm/msm_gpu_devfreq.c | 30 ++++++++++++++++++++++-----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>



--
With best wishes
Dmitry