thermal: Defer thermal wakups to threads
On RT the spin lock in pkg_temp_thermal_platfrom_thermal_notify will call schedule while we run in irq context. [<ffffffff816850ac>] dump_stack+0x4e/0x8f [<ffffffff81680f7d>] __schedule_bug+0xa6/0xb4 [<ffffffff816896b4>] __schedule+0x5b4/0x700 [<ffffffff8168982a>] schedule+0x2a/0x90 [<ffffffff8168a8b5>] rt_spin_lock_slowlock+0xe5/0x2d0 [<ffffffff8168afd5>] rt_spin_lock+0x25/0x30 [<ffffffffa03a7b75>] pkg_temp_thermal_platform_thermal_notify+0x45/0x134 [x86_pkg_temp_thermal] [<ffffffff8103d4db>] ? therm_throt_process+0x1b/0x160 [<ffffffff8103d831>] intel_thermal_interrupt+0x211/0x250 [<ffffffff8103d8c1>] smp_thermal_interrupt+0x21/0x40 [<ffffffff8169415d>] thermal_interrupt+0x6d/0x80 Let's defer the work to a kthread. Cc: stable-rt@vger.kernel.org Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> [bigeasy: reoder init/denit position. TODO: flush swork on exit] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
This commit is contained in:
parent
faa7968040
commit
2207ec6666
|
@ -29,6 +29,7 @@
|
||||||
#include <linux/pm.h>
|
#include <linux/pm.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
#include <linux/debugfs.h>
|
#include <linux/debugfs.h>
|
||||||
|
#include <linux/work-simple.h>
|
||||||
#include <asm/cpu_device_id.h>
|
#include <asm/cpu_device_id.h>
|
||||||
#include <asm/mce.h>
|
#include <asm/mce.h>
|
||||||
|
|
||||||
|
@ -352,7 +353,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
|
static void platform_thermal_notify_work(struct swork_event *event)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int cpu = smp_processor_id();
|
int cpu = smp_processor_id();
|
||||||
|
@ -369,7 +370,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
|
||||||
pkg_work_scheduled[phy_id]) {
|
pkg_work_scheduled[phy_id]) {
|
||||||
disable_pkg_thres_interrupt();
|
disable_pkg_thres_interrupt();
|
||||||
spin_unlock_irqrestore(&pkg_work_lock, flags);
|
spin_unlock_irqrestore(&pkg_work_lock, flags);
|
||||||
return -EINVAL;
|
return;
|
||||||
}
|
}
|
||||||
pkg_work_scheduled[phy_id] = 1;
|
pkg_work_scheduled[phy_id] = 1;
|
||||||
spin_unlock_irqrestore(&pkg_work_lock, flags);
|
spin_unlock_irqrestore(&pkg_work_lock, flags);
|
||||||
|
@ -378,9 +379,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
|
||||||
schedule_delayed_work_on(cpu,
|
schedule_delayed_work_on(cpu,
|
||||||
&per_cpu(pkg_temp_thermal_threshold_work, cpu),
|
&per_cpu(pkg_temp_thermal_threshold_work, cpu),
|
||||||
msecs_to_jiffies(notify_delay_ms));
|
msecs_to_jiffies(notify_delay_ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PREEMPT_RT_FULL
|
||||||
|
static struct swork_event notify_work;
|
||||||
|
|
||||||
|
static int thermal_notify_work_init(void)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = swork_get();
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
INIT_SWORK(¬ify_work, platform_thermal_notify_work);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void thermal_notify_work_cleanup(void)
|
||||||
|
{
|
||||||
|
swork_put();
|
||||||
|
}
|
||||||
|
|
||||||
|
static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
|
||||||
|
{
|
||||||
|
swork_queue(¬ify_work);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* !CONFIG_PREEMPT_RT_FULL */
|
||||||
|
|
||||||
|
static int thermal_notify_work_init(void) { return 0; }
|
||||||
|
|
||||||
|
static int thermal_notify_work_cleanup(void) { }
|
||||||
|
|
||||||
|
static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
|
||||||
|
{
|
||||||
|
platform_thermal_notify_work(NULL);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_PREEMPT_RT_FULL */
|
||||||
|
|
||||||
static int find_siblings_cpu(int cpu)
|
static int find_siblings_cpu(int cpu)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -584,6 +624,9 @@ static int __init pkg_temp_thermal_init(void)
|
||||||
if (!x86_match_cpu(pkg_temp_thermal_ids))
|
if (!x86_match_cpu(pkg_temp_thermal_ids))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
if (!thermal_notify_work_init())
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
spin_lock_init(&pkg_work_lock);
|
spin_lock_init(&pkg_work_lock);
|
||||||
platform_thermal_package_notify =
|
platform_thermal_package_notify =
|
||||||
pkg_temp_thermal_platform_thermal_notify;
|
pkg_temp_thermal_platform_thermal_notify;
|
||||||
|
@ -608,7 +651,7 @@ err_ret:
|
||||||
kfree(pkg_work_scheduled);
|
kfree(pkg_work_scheduled);
|
||||||
platform_thermal_package_notify = NULL;
|
platform_thermal_package_notify = NULL;
|
||||||
platform_thermal_package_rate_control = NULL;
|
platform_thermal_package_rate_control = NULL;
|
||||||
|
thermal_notify_work_cleanup();
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -633,6 +676,7 @@ static void __exit pkg_temp_thermal_exit(void)
|
||||||
mutex_unlock(&phy_dev_list_mutex);
|
mutex_unlock(&phy_dev_list_mutex);
|
||||||
platform_thermal_package_notify = NULL;
|
platform_thermal_package_notify = NULL;
|
||||||
platform_thermal_package_rate_control = NULL;
|
platform_thermal_package_rate_control = NULL;
|
||||||
|
thermal_notify_work_cleanup();
|
||||||
for_each_online_cpu(i)
|
for_each_online_cpu(i)
|
||||||
cancel_delayed_work_sync(
|
cancel_delayed_work_sync(
|
||||||
&per_cpu(pkg_temp_thermal_threshold_work, i));
|
&per_cpu(pkg_temp_thermal_threshold_work, i));
|
||||||
|
|
Loading…
Reference in New Issue