* [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl_remove()
@ 2019-07-22 10:22 Rafael J. Wysocki
2019-07-23 7:30 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2019-07-22 10:22 UTC (permalink / raw)
To: Linux PM, Zhang Rui; +Cc: Srinivas Pandruvada, Linux ACPI, LKML
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Passing 0 to cpuhp_remove_state() triggers the BUG_ON() in
__cpuhp_remove_state_cpuslocked() and the argument passed to
powercap_unregister_control_type() is expected to be a valid
pointer, so avoid calling these functions with incorrect
arguments from proc_thermal_rapl_remove().
Fixes: 555c45fe0d04 ("int340X/processor_thermal_device: add support for MMIO RAPL")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 4 ++++
1 file changed, 4 insertions(+)
Index: linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct
rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep);
if (ret < 0) {
powercap_unregister_control_type(rapl_mmio_priv.control_type);
+ rapl_mmio_priv.control_type = NULL;
return ret;
}
rapl_mmio_priv.pcap_rapl_online = ret;
@@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct
static void proc_thermal_rapl_remove(void)
{
+ if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
+ return;
+
cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
powercap_unregister_control_type(rapl_mmio_priv.control_type);
}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl_remove()
2019-07-22 10:22 [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl_remove() Rafael J. Wysocki
@ 2019-07-23 7:30 ` Rafael J. Wysocki
2019-07-23 7:32 ` Zhang Rui
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2019-07-23 7:30 UTC (permalink / raw)
To: Linux PM; +Cc: Zhang Rui, Srinivas Pandruvada, Linux ACPI, LKML
On Mon, Jul 22, 2019 at 12:23 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Passing 0 to cpuhp_remove_state() triggers the BUG_ON() in
> __cpuhp_remove_state_cpuslocked() and the argument passed to
> powercap_unregister_control_type() is expected to be a valid
> pointer, so avoid calling these functions with incorrect
> arguments from proc_thermal_rapl_remove().
>
> Fixes: 555c45fe0d04 ("int340X/processor_thermal_device: add support for MMIO RAPL")
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Any comments?
If not, I'll queue this up along with the other RAPL-related fix
(https://patchwork.kernel.org/patch/11050999/).
> ---
> drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> @@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct
> rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep);
> if (ret < 0) {
> powercap_unregister_control_type(rapl_mmio_priv.control_type);
> + rapl_mmio_priv.control_type = NULL;
> return ret;
> }
> rapl_mmio_priv.pcap_rapl_online = ret;
> @@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct
>
> static void proc_thermal_rapl_remove(void)
> {
> + if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
> + return;
> +
> cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
> powercap_unregister_control_type(rapl_mmio_priv.control_type);
> }
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl_remove()
2019-07-23 7:30 ` Rafael J. Wysocki
@ 2019-07-23 7:32 ` Zhang Rui
0 siblings, 0 replies; 3+ messages in thread
From: Zhang Rui @ 2019-07-23 7:32 UTC (permalink / raw)
To: Rafael J. Wysocki, Linux PM; +Cc: Srinivas Pandruvada, Linux ACPI, LKML
On 二, 2019-07-23 at 09:30 +0200, Rafael J. Wysocki wrote:
> On Mon, Jul 22, 2019 at 12:23 PM Rafael J. Wysocki <rjw@rjwysocki.net
> > wrote:
> >
> >
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > Passing 0 to cpuhp_remove_state() triggers the BUG_ON() in
> > __cpuhp_remove_state_cpuslocked() and the argument passed to
> > powercap_unregister_control_type() is expected to be a valid
> > pointer, so avoid calling these functions with incorrect
> > arguments from proc_thermal_rapl_remove().
> >
> > Fixes: 555c45fe0d04 ("int340X/processor_thermal_device: add support
> > for MMIO RAPL")
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
> Any comments?
>
> If not, I'll queue this up along with the other RAPL-related fix
> (https://patchwork.kernel.org/patch/11050999/).
>
> >
> > ---
> > drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > Index: linux-
> > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > ===================================================================
> > --- linux-
> > pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_dev
> > ice.c
> > +++ linux-
> > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > @@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct
> > rapl_mmio_cpu_online,
> > rapl_mmio_cpu_down_prep);
> > if (ret < 0) {
> > powercap_unregister_control_type(rapl_mmio_priv.con
> > trol_type);
> > + rapl_mmio_priv.control_type = NULL;
> > return ret;
> > }
> > rapl_mmio_priv.pcap_rapl_online = ret;
> > @@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct
> >
> > static void proc_thermal_rapl_remove(void)
> > {
> > + if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
> > + return;
> > +
> > cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
> > powercap_unregister_control_type(rapl_mmio_priv.control_typ
> > e);
> > }
> >
> >
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-23 7:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-22 10:22 [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl_remove() Rafael J. Wysocki
2019-07-23 7:30 ` Rafael J. Wysocki
2019-07-23 7:32 ` Zhang Rui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).