PM fixes in Metric Steamer code
Subsystems (3)
cover PM fixes in Metric Steamer code
This patches contains two fixes for Metric Stream:
- Fix deadlock that may occur when executing runtime resume during cold boot where ms_lock will be already held there,
- Fix warning to warn for suspend status only if the runtime PM is enabled.
Jacek Lawrynowicz (2):
accel/ivpu: Fix deadlock in ivpu_ms_cleanup() accel/ivpu: Fix PM related deadlocks in MS IOCTLs
drivers/accel/ivpu/ivpu_debugfs.c | 4 ++-- drivers/accel/ivpu/ivpu_ms.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in ivpu_ms_cleanup() by preventing runtime resume after file_priv->ms_lock is acquired.
During a failure in runtime resume, a cold boot is executed, which calls ivpu_ms_cleanup_all(). This function calls ivpu_ms_cleanup() that acquires file_priv->ms_lock and causes the deadlock.
--- drivers/accel/ivpu/ivpu_ms.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/accel/ivpu/ivpu_ms.c +6 -0
@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"
@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file *void ivpu_ms_cleanup (struct ivpu_file_priv *file_priv) {struct ivpu_ms_instance *ms, *tmp; +struct ivpu_device *vdev = file_priv->vdev; + +pm_runtime_get_sync (vdev->drm.dev);mutex_lock (&file_priv->ms_lock);
@@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv)free_instance (file_priv, ms);mutex_unlock (&file_priv->ms_lock); + +pm_runtime_put_autosuspend (vdev->drm.dev); }void ivpu_ms_cleanup_all (struct ivpu_device *vdev)
Signature · 1 line
2.43.0
Re: [PATCH 1/2] accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
Quoted 30 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in
ivpu_ms_cleanup()by preventing runtime resume afterfile_priv->ms_lockis acquired.During a failure in runtime resume, a cold boot is executed, which calls
ivpu_ms_cleanup_all(). This function callsivpu_ms_cleanup()that acquiresfile_priv->ms_lockand causes the deadlock.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>--- drivers/accel/ivpu/ivpu_ms.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"
drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * · line 287
Quoted 6 lines
drivers/accel/ivpu/ivpu_ms.c +3
-0@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file *void ivpu_ms_cleanup (struct ivpu_file_priv *file_priv) {struct ivpu_ms_instance *ms, *tmp; +struct ivpu_device *vdev = file_priv->vdev; + +pm_runtime_get_sync (vdev->drm.dev);
Could get_sync() be failed here? Maybe it is better to add warning for failure?
Lizhi
Quoted 12 lines
drivers/accel/ivpu/ivpu_ms.c +2
-0mutex_lock (&file_priv->ms_lock);@@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv)free_instance (file_priv, ms);mutex_unlock (&file_priv->ms_lock); + +pm_runtime_put_autosuspend (vdev->drm.dev); }void ivpu_ms_cleanup_all (struct ivpu_device *vdev)
Re: [PATCH 1/2] accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
Hi,
Quoted 30 lines · Lizhi Hou
Quoted 28 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in
ivpu_ms_cleanup()by preventing runtime resume afterfile_priv->ms_lockis acquired.During a failure in runtime resume, a cold boot is executed, which calls
ivpu_ms_cleanup_all(). This function callsivpu_ms_cleanup()that acquiresfile_priv->ms_lockand causes the deadlock.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>---
drivers/accel/ivpu/ivpu_ms.c| 6 ++++++1 file changed, 6 insertions(+)drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file *
Quoted 8 lines
drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * · line 287
Quoted 6 lines
drivers/accel/ivpu/ivpu_ms.c +3
-0void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) { struct ivpu_ms_instance *ms, *tmp; + struct ivpu_device *vdev = file_priv->vdev; + + pm_runtime_get_sync(vdev->drm.dev);Could
get_sync()be failed here? Maybe it is better to add warning for failure?
Yes, this could fail but we already have detailed warnings in runtime resume callback (ivpu_pm_runtime_resume_cb()).
Quoted 9 lines
Quoted 9 lines
drivers/accel/ivpu/ivpu_ms.c +0
-0mutex_lock(&file_priv->ms_lock); @@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) free_instance(file_priv, ms);
mutex_unlock(&file_priv->ms_lock);
+
+pm_runtime_put_autosuspend(vdev->drm.dev); }
voidivpu_ms_cleanup_all(struct ivpu_device *vdev)
Regards,
Jacek
Re: [PATCH 1/2] accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
Quoted 39 lines · Jacek Lawrynowicz
Hi,
Quoted 28 lines · Lizhi Hou
Quoted 27 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in
ivpu_ms_cleanup()by preventing runtime resume afterfile_priv->ms_lockis acquired.During a failure in runtime resume, a cold boot is executed, which calls
ivpu_ms_cleanup_all(). This function callsivpu_ms_cleanup()that acquiresfile_priv->ms_lockand causes the deadlock.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>--- drivers/accel/ivpu/ivpu_ms.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"Quoted 8 lines
drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * · line 287
Quoted 7 lines
drivers/accel/ivpu/ivpu_ms.c +3
-0@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) { struct ivpu_ms_instance *ms, *tmp; + struct ivpu_device *vdev = file_priv->vdev; + + pm_runtime_get_sync(vdev->drm.dev);Could
get_sync()be failed here? Maybe it is better to add warning for failure?
Quoted 1 line
Yes, this could fail but we already have detailed warnings in runtime resume callback (
ivpu_pm_runtime_resume_cb()).
Will the deadlock still happens if this function fails?
Lizhi
Quoted 11 lines
Quoted 8 lines
Quoted 8 lines
drivers/accel/ivpu/ivpu_ms.c +0
-0mutex_lock(&file_priv->ms_lock); @@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) free_instance(file_priv, ms);
mutex_unlock(&file_priv->ms_lock);
+
+pm_runtime_put_autosuspend(vdev->drm.dev);
}
voidivpu_ms_cleanup_all(struct ivpu_device *vdev)Regards,
Jacek
Re: [PATCH 1/2] accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
Quoted 41 lines · Lizhi Hou
Quoted 39 lines · Jacek Lawrynowicz
Hi,
Quoted 36 lines · Lizhi Hou
Quoted 28 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in
ivpu_ms_cleanup()by preventing runtime resume afterfile_priv->ms_lockis acquired.During a failure in runtime resume, a cold boot is executed, which calls
ivpu_ms_cleanup_all(). This function callsivpu_ms_cleanup()that acquiresfile_priv->ms_lockand causes the deadlock.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>---
drivers/accel/ivpu/ivpu_ms.c| 6 ++++++1 file changed, 6 insertions(+)drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * · line 287
Quoted 6 lines
drivers/accel/ivpu/ivpu_ms.c +3
-0@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) { struct ivpu_ms_instance *ms, *tmp; + struct ivpu_device *vdev = file_priv->vdev; + + pm_runtime_get_sync(vdev->drm.dev);Could
get_sync()be failed here? Maybe it is better to add warning for failure?
Quoted 3 lines
Quoted 1 line
Yes, this could fail but we already have detailed warnings in runtime resume callback (
ivpu_pm_runtime_resume_cb()).Will the deadlock still happens if this function fails?
No. The deadlock was caused by runtime resume in free_instance().pm_runtime_get_sync() will always bump PM usage counter, so there will be no resume regardless if it fails or not.
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 8 lines
drivers/accel/ivpu/ivpu_ms.c +0
-0mutex_lock(&file_priv->ms_lock); @@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) free_instance(file_priv, ms);
mutex_unlock(&file_priv->ms_lock);
+
+pm_runtime_put_autosuspend(vdev->drm.dev); }
voidivpu_ms_cleanup_all(struct ivpu_device *vdev)Regards,
Jacek
Lizhi Hou
Reviewed-byRe: [PATCH 1/2] accel/ivpu: Fix deadlock in ivpu_ms_cleanup()
Quoted 42 lines · Jacek Lawrynowicz
Quoted 40 lines · Lizhi Hou
Quoted 39 lines · Jacek Lawrynowicz
Hi,
Quoted 36 lines · Lizhi Hou
Quoted 28 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Fix deadlock in
ivpu_ms_cleanup()by preventing runtime resume afterfile_priv->ms_lockis acquired.During a failure in runtime resume, a cold boot is executed, which calls
ivpu_ms_cleanup_all(). This function callsivpu_ms_cleanup()that acquiresfile_priv->ms_lockand causes the deadlock.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>--- drivers/accel/ivpu/ivpu_ms.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -4,6 +4,7 @@*/ #include <drm/drm_file.h> +#include <linux/pm_runtime.h> #include "ivpu_drv.h" #include "ivpu_gem.h"drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * · line 287
Quoted 6 lines
drivers/accel/ivpu/ivpu_ms.c +3
-0@@ -281,6 +282,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) { struct ivpu_ms_instance *ms, *tmp; + struct ivpu_device *vdev = file_priv->vdev; + + pm_runtime_get_sync(vdev->drm.dev);Could
get_sync()be failed here? Maybe it is better to add warning for failure?
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Yes, this could fail but we already have detailed warnings in runtime resume callback (
ivpu_pm_runtime_resume_cb()).Will the deadlock still happens if this function fails?
No. The deadlock was caused by runtime resume in
free_instance().pm_runtime_get_sync()will always bump PM usage counter, so there will be no resume regardless if it fails or not.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 8 lines
Quoted 8 lines
drivers/accel/ivpu/ivpu_ms.c +0
-0mutex_lock(&file_priv->ms_lock); @@ -293,6 +297,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) free_instance(file_priv, ms);
mutex_unlock(&file_priv->ms_lock);
+
+pm_runtime_put_autosuspend(vdev->drm.dev);
}
voidivpu_ms_cleanup_all(struct ivpu_device *vdev)Regards,
Jacek
PATCH 2/2 accel/ivpu: Fix PM related deadlocks in MS IOCTLs
In reply to Maciej FalkowskiFrom: Jacek Lawrynowicz <[email protected]>
Prevent runtime resume/suspend while MS IOCTLs are in progress. Failed suspend will call ivpu_ms_cleanup() that would try to acquire file_priv->ms_lock, which is already held by the IOCTLs.
--- drivers/accel/ivpu/ivpu_debugfs.c | 4 ++-- drivers/accel/ivpu/ivpu_ms.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/accel/ivpu/ivpu_debugfs.c +2 -2
@@ -332,7 +332,7 @@ ivpu_force_recovery_fn(struct file *file, const char __user *user_buf, size_t sireturn -EINVAL ; ret =ivpu_rpm_get (vdev); -if (ret) +if (ret <0 )return ret;ivpu_pm_trigger_recovery (vdev,"debugfs" );
@@ -383,7 +383,7 @@ static int dct_active_set(void *data, u64 active_percent)return -EINVAL ; ret =ivpu_rpm_get (vdev); -if (ret) +if (ret <0 )return ret;if (active_percent)
drivers/accel/ivpu/ivpu_ms.c +18 -0
@@ -45,6 +45,10 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *fil args->sampling_period_ns < MS_MIN_SAMPLE_PERIOD_NS)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock);if (get_instance_by_mask (file_priv, args->metric_group_mask)) {
@@ -97,6 +101,8 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *filkfree (ms); unlock:mutex_unlock (&file_priv->ms_lock); + +ivpu_rpm_put (vdev);return ret; }
@@ -161,6 +167,10 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file *if (!args->metric_group_mask)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock); ms =get_instance_by_mask (file_priv, args->metric_group_mask);
@@ -188,6 +198,7 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file * unlock:mutex_unlock (&file_priv->ms_lock); +ivpu_rpm_put (vdev);return ret; }
@@ -205,11 +216,17 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *file {struct ivpu_file_priv *file_priv = file->driver_priv;struct drm_ivpu_metric_streamer_stop *args = data; +struct ivpu_device *vdev = file_priv->vdev;struct ivpu_ms_instance *ms; +int ret;if (!args->metric_group_mask)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock); ms =get_instance_by_mask (file_priv, args->metric_group_mask);
@@ -218,6 +235,7 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *filemutex_unlock (&file_priv->ms_lock); +ivpu_rpm_put (vdev);return ms ?0 : -EINVAL ; }
Signature · 1 line
2.43.0
Re: [PATCH 2/2] accel/ivpu: Fix PM related deadlocks in MS IOCTLs
Quoted 99 lines · Maciej Falkowski
From: Jacek Lawrynowicz <[email protected]>
Prevent runtime resume/suspend while MS IOCTLs are in progress. Failed suspend will call
ivpu_ms_cleanup()that would try to acquirefile_priv->ms_lock, which is already held by the IOCTLs.Fixes cdfad4db7756 ("accel/ivpu: Add NPU profiling support")Cc <[email protected]> # v6.11+Signed-off-by Jacek Lawrynowicz <[email protected]>Signed-off-by Maciej Falkowski <[email protected]>--- drivers/accel/ivpu/ivpu_debugfs.c | 4 ++-- drivers/accel/ivpu/ivpu_ms.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)drivers/accel/ivpu/ivpu_debugfs.c +2
-2@@ -332,7 +332,7 @@ ivpu_force_recovery_fn(struct file *file, const char __user *user_buf, size_t sireturn -EINVAL ; ret =ivpu_rpm_get (vdev); -if (ret) +if (ret <0 )return ret;ivpu_pm_trigger_recovery (vdev,"debugfs" );@@ -383,7 +383,7 @@ static int dct_active_set(void *data, u64 active_percent)return -EINVAL ; ret =ivpu_rpm_get (vdev); -if (ret) +if (ret <0 )return ret;if (active_percent)drivers/accel/ivpu/ivpu_ms.c +17
-0@@ -45,6 +45,10 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *fil args->sampling_period_ns < MS_MIN_SAMPLE_PERIOD_NS)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock);if (get_instance_by_mask (file_priv, args->metric_group_mask)) {@@ -97,6 +101,8 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *filkfree (ms); unlock:mutex_unlock (&file_priv->ms_lock); + +ivpu_rpm_put (vdev);return ret; }@@ -161,6 +167,10 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file *if (!args->metric_group_mask)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock); ms =get_instance_by_mask (file_priv, args->metric_group_mask);@@ -188,6 +198,7 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file * unlock:mutex_unlock (&file_priv->ms_lock); +ivpu_rpm_put (vdev);return ret; }@@ -205,11 +216,17 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *file {struct ivpu_file_priv *file_priv = file->driver_priv;struct drm_ivpu_metric_streamer_stop *args = data; +struct ivpu_device *vdev = file_priv->vdev;struct ivpu_ms_instance *ms; +int ret;if (!args->metric_group_mask)return -EINVAL ; + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; +mutex_lock (&file_priv->ms_lock); ms =get_instance_by_mask (file_priv, args->metric_group_mask);
drivers/accel/ivpu/ivpu_ms.c int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *file · line 238
Quoted 4 lines
drivers/accel/ivpu/ivpu_ms.c +1
-0@@ -218,6 +235,7 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *filemutex_unlock (&file_priv->ms_lock); +ivpu_rpm_put (vdev);
Quoted 3 lines
drivers/accel/ivpu/ivpu_ms.c +0
-0return ms ?0 : -EINVAL ; }
Jacek Lawrynowicz
AppliedApplied to drm-misc-fixes
Quoted 15 lines · Maciej Falkowski
This patches contains two fixes for Metric Stream:
- Fix deadlock that may occur when executing runtime resume during cold boot wherems_lockwill be already held there,
- Fix warning to warn for suspend status only if the runtime PM is enabled.Jacek Lawrynowicz (2):
accel/ivpu: Fix deadlock inivpu_ms_cleanup()accel/ivpu: Fix PM related deadlocks in MS IOCTLsdrivers/accel/ivpu/ivpu_debugfs.c | 4 ++-- drivers/accel/ivpu/ivpu_ms.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-)