cpufreq: intel_pstate: Delete intel_pstate sysfs if failed to register the driver
Subsystems (2)
RFC PATCH 1/1 cpufreq: intel_pstate: Delete intel_pstate sysfs if failed to register the driver
There is a corner case that if the intel_pstate driver failed to be registered(might be due to invalid MSR access) and with the acpi_cpufreq loaded, the intel_pstate sysfs might still be created, which makes the user confusing(turbostat for example):
grep . /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver acpi-cpufreq
grep . /sys/devices/system/cpu/intel_pstate/* /sys/devices/system/cpu/intel_pstate/max_perf_pct:0 /sys/devices/system/cpu/intel_pstate/min_perf_pct:0
grep: /sys/devices/system/cpu/intel_pstate/no_turbo: Resource temporarily unavailable
grep: /sys/devices/system/cpu/intel_pstate/num_pstates: Resource temporarily unavailable /sys/devices/system/cpu/intel_pstate/status:off
grep: /sys/devices/system/cpu/intel_pstate/turbo_pct: Resource temporarily unavailable
The existing of intel_pstate sysfs does not mean that the intel_pstate driver has been successfully loaded(for example, echo off to status), but the intel_pstate sysfs should not co-exist when acpi-cpufreq is also present. Fix this issue by deleting the intel_pstate sysfs if the driver failed to be loaded during bootup.
--- drivers/cpufreq/intel_pstate.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/cpufreq/intel_pstate.c +23 -1
@@ -1420,6 +1420,26 @@ static void __init intel_pstate_sysfs_expose_params(void) } } +static void __init intel_pstate_sysfs_clean (void ) +{ +if (!intel_pstate_kobject) +return ; + +sysfs_remove_group (intel_pstate_kobject, &intel_pstate_attr_group); + +if (per_cpu_limits) + goto release_kobj; + +sysfs_remove_file (intel_pstate_kobject, &max_perf_pct.attr); +sysfs_remove_file (intel_pstate_kobject, &min_perf_pct.attr); + +if (x86_match_cpu (intel_pstate_cpu_ee_disable_ids)) +sysfs_remove_file (intel_pstate_kobject, &energy_efficiency.attr); + +release_kobj: +kobject_put (intel_pstate_kobject); +} +static void intel_pstate_sysfs_expose_hwp_dynamic_boost (void ) {int rc;
@@ -3063,8 +3083,10 @@ static int __init intel_pstate_init(void)mutex_lock (&intel_pstate_driver_lock); rc =intel_pstate_register_driver (default_driver);mutex_unlock (&intel_pstate_driver_lock); -if (rc) +if (rc) { +intel_pstate_sysfs_clean ();return rc; + }if (hwp_active) {const struct x86_cpu_id *id;
Signature · 1 line
2.17.1
Quoted 2 lines · Chen Yu
There is a corner case that if the
intel_pstatedriver failed to be registered(might be due to invalid MSR access)
Do you have logs why it is not loaded? On supported platforms MSRs should be invalid.
It may be a case when we are trying to bring up pre-production systems where some instability in MSRs on certain CPUs.
But the patch is correct. We can't have invalid folder when intel_pstate is not used.
Quoted 29 lines
and with the
acpi_cpufreq
loaded, theintel_pstatesysfs might still be created, which makes the
user confusing(turbostat for example):grep .
/sys/devices/system/cpu/cpu0/cpufreq/scaling_driveracpi-cpufreqgrep .
/sys/devices/system/cpu/intel_pstate/*/sys/devices/system/cpu/intel_pstate/max_perf_pct:0/sys/devices/system/cpu/intel_pstate/min_perf_pct:0
grep:/sys/devices/system/cpu/intel_pstate/no_turbo: Resource temporarily unavailable
grep:/sys/devices/system/cpu/intel_pstate/num_pstates: Resource temporarily unavailable /sys/devices/system/cpu/intel_pstate/status:off
grep:/sys/devices/system/cpu/intel_pstate/turbo_pct: Resource temporarily unavailableThe existing of
intel_pstatesysfs does not mean that theintel_pstatedriver
has been successfullyloaded(for example, echo off to status), but theintel_pstatesysfs should not co-exist when acpi-cpufreq is also present.
Fix this issue by deleting theintel_pstatesysfs if the driver failed
to be loaded during bootup.
Quoted 3 lines
Reported-by Wendy Wang <[email protected]>Suggested-by Zhang Rui <[email protected]>Signed-off-by Chen Yu <[email protected]>
Quoted 51 lines
--->
drivers/cpufreq/intel_pstate.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)drivers/cpufreq/intel_pstate.c +20
-0@@ -1420,6 +1420,26 @@ static void __init intel_pstate_sysfs_expose_params(void) } } +static void __init intel_pstate_sysfs_clean (void ) +{ +if (!intel_pstate_kobject) +return ; + +sysfs_remove_group (intel_pstate_kobject, &intel_pstate_attr_group); + +if (per_cpu_limits) + goto release_kobj; + +sysfs_remove_file (intel_pstate_kobject, &max_perf_pct.attr); +sysfs_remove_file (intel_pstate_kobject, &min_perf_pct.attr); + +if (x86_match_cpu (intel_pstate_cpu_ee_disable_ids)) +sysfs_remove_file (intel_pstate_kobject, &energy_efficiency.attr); + +release_kobj: +kobject_put (intel_pstate_kobject); +} +static void
intel_pstate_sysfs_expose_hwp_dynamic_boost(void){drivers/cpufreq/intel_pstate.c +3
-1int rc;@@ -3063,8 +3083,10 @@ static int __init intel_pstate_init(void)mutex_lock (&intel_pstate_driver_lock); rc =intel_pstate_register_driver (default_driver);mutex_unlock (&intel_pstate_driver_lock); -if (rc) +if (rc) { +intel_pstate_sysfs_clean ();return rc; + }if (hwp_active) {const struct x86_cpu_id *id;
Hi Srinivas,
Quoted 5 lines · srinivas pandruvada
Quoted 2 lines · Chen Yu
There is a corner case that if the
intel_pstatedriver failed to be registered(might be due to invalid MSR access)Do you have logs why it is not loaded? On supported platforms MSRs should be invalid.
Unfortunately we don't have the boot up log for now, as it is a pre-production platform and the low-level simulation(for MSR) might be unstable.( And there seems to be some environment issue on pre-production platform to reproduce this issue). But we can hack the code in intel_pstate to make the driver failed to be loaded and the issue was reproduced.
Quoted 35 lines
It may be a case when we are trying to bring up pre-production systems where some instability in MSRs on certain CPUs.
But the patch is correct. We can't have invalid folder when
intel_pstateis not used.Quoted 29 lines
and with the
acpi_cpufreq
loaded, theintel_pstatesysfs might still be created, which makes the
user confusing(turbostat for example):grep .
/sys/devices/system/cpu/cpu0/cpufreq/scaling_driveracpi-cpufreqgrep .
/sys/devices/system/cpu/intel_pstate/*/sys/devices/system/cpu/intel_pstate/max_perf_pct:0/sys/devices/system/cpu/intel_pstate/min_perf_pct:0
grep:/sys/devices/system/cpu/intel_pstate/no_turbo: Resource temporarily unavailable
grep:/sys/devices/system/cpu/intel_pstate/num_pstates: Resource temporarily unavailable /sys/devices/system/cpu/intel_pstate/status:off
grep:/sys/devices/system/cpu/intel_pstate/turbo_pct: Resource temporarily unavailableThe existing of
intel_pstatesysfs does not mean that theintel_pstatedriver
has been successfullyloaded(for example, echo off to status), but theintel_pstatesysfs should not co-exist when acpi-cpufreq is also present.
Fix this issue by deleting theintel_pstatesysfs if the driver failed
to be loaded during bootup.
Quoted 4 lines
Quoted 3 lines
Reported-by Wendy Wang <[email protected]>Suggested-by Zhang Rui <[email protected]>Signed-off-by Chen Yu <[email protected]>
Thanks!
Best,
Chenyu
Quoted 64 lines · Chen Yu
There is a corner case that if the
intel_pstatedriver failed to be registered(might be due to invalid MSR access) and with theacpi_cpufreqloaded, theintel_pstatesysfs might still be created, which makes the user confusing(turbostat for example):grep .
/sys/devices/system/cpu/cpu0/cpufreq/scaling_driveracpi-cpufreqgrep .
/sys/devices/system/cpu/intel_pstate/*/sys/devices/system/cpu/intel_pstate/max_perf_pct:0/sys/devices/system/cpu/intel_pstate/min_perf_pct:0
grep:/sys/devices/system/cpu/intel_pstate/no_turbo: Resource temporarily unavailable
grep:/sys/devices/system/cpu/intel_pstate/num_pstates: Resource temporarily unavailable /sys/devices/system/cpu/intel_pstate/status:off
grep:/sys/devices/system/cpu/intel_pstate/turbo_pct: Resource temporarily unavailableThe existing of
intel_pstatesysfs does not mean that theintel_pstatedriver has been successfullyloaded(for example, echo off to status), but theintel_pstatesysfs should not co-exist when acpi-cpufreq is also present. Fix this issue by deleting theintel_pstatesysfs if the driver failed to be loaded during bootup.Reported-by Wendy Wang <[email protected]>Suggested-by Zhang Rui <[email protected]>Signed-off-by Chen Yu <[email protected]>--- drivers/cpufreq/intel_pstate.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)drivers/cpufreq/intel_pstate.c +20
-0@@ -1420,6 +1420,26 @@ static void __init intel_pstate_sysfs_expose_params(void) } } +static void __init intel_pstate_sysfs_clean (void ) +{ +if (!intel_pstate_kobject) +return ; + +sysfs_remove_group (intel_pstate_kobject, &intel_pstate_attr_group); + +if (per_cpu_limits) + goto release_kobj; + +sysfs_remove_file (intel_pstate_kobject, &max_perf_pct.attr); +sysfs_remove_file (intel_pstate_kobject, &min_perf_pct.attr); + +if (x86_match_cpu (intel_pstate_cpu_ee_disable_ids)) +sysfs_remove_file (intel_pstate_kobject, &energy_efficiency.attr); + +release_kobj: +kobject_put (intel_pstate_kobject); +} +static void intel_pstate_sysfs_expose_hwp_dynamic_boost (void ) {int rc;@@ -3063,8 +3083,10 @@ static int __init intel_pstate_init(void)mutex_lock (&intel_pstate_driver_lock); rc =intel_pstate_register_driver (default_driver);
drivers/cpufreq/intel_pstate.c static int __init intel_pstate_init(void)
Quoted 10 lines
drivers/cpufreq/intel_pstate.c +3
-2mutex_unlock (&intel_pstate_driver_lock); -if (rc) +if (rc) { +intel_pstate_sysfs_clean ();return rc; + }if (hwp_active) {const struct x86_cpu_id *id; --
Applied as 5.10-rc material with some minor changes and the Srinivas' ACK, thanks!