[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230117020742.2760307-5-srinivas.pandruvada@linux.intel.com>
Date: Mon, 16 Jan 2023 18:07:42 -0800
From: Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
To: rafael@...nel.org
Cc: linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
daniel.lezcano@...aro.org, rui.zhang@...el.com, amitk@...nel.org,
Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
Subject: [PATCH v3 4/4] thermal/drivers/intel_cpu_idle_cooling: Introduce Intel cpu idle cooling driver
The cpu idle cooling is used to cool down a CPU by injecting idle cycles
at runtime. The objective is similar to intel_powerclamp driver, which is
used for system wide cooling by injecting idle on each CPU.
This driver is modeled after drivers/thermal/cpuidle_cooling.c by reusing
powercap/idle_inject framework.
On each CPU online a thermal cooling device is registered. The minimum
state of the cooling device is 0 and maximum is 100. When user space
changes the current state to non zero, then register with idle inject
framework and start idle inject.
The default idle duration is 24 milli seconds, matching intel_powerclamp,
which doesn't change based on the current state of cooling device. The
runtime is changed based on the current state.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
---
v3:
Suggestion from Daniel:
- Remove unused cpuidle_cpu_mask
- Why not register idle_inject here before calling
thermal_cooling_device_register() so you get ride of the lock?
We can't as cooling device is registered during CPU online. But if you also register idle,
then every CPU is registered with idle inject core. So intel_powerclamp can't
use those CPUs to register again.
Here the logic is only register when user actually changing the state of cooling
device from 0 to 1. In this way either per CPU or all cpu (intel_powerclamp)
can be used one at a time.
Reuse cpuidle_cooling_device.c. The RFC tried to do that, But you don't
save lots of reuse. The of_device separation and separate idle_injection
register will need a separate function.
To be clean implementation, added a new module. This module adds very few lines
of new code.
v2:
- Removed callback arguments for idle_inject_register
drivers/thermal/intel/Kconfig | 10 +
drivers/thermal/intel/Makefile | 1 +
.../thermal/intel/intel_cpu_idle_cooling.c | 259 ++++++++++++++++++
3 files changed, 270 insertions(+)
create mode 100644 drivers/thermal/intel/intel_cpu_idle_cooling.c
diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig
index 6c2a95f41c81..8c88d6e18414 100644
--- a/drivers/thermal/intel/Kconfig
+++ b/drivers/thermal/intel/Kconfig
@@ -115,3 +115,13 @@ config INTEL_HFI_THERMAL
These capabilities may change as a result of changes in the operating
conditions of the system such power and thermal limits. If selected,
the kernel relays updates in CPUs' capabilities to userspace.
+
+config INTEL_CPU_IDLE_COOLING
+ tristate "Intel CPU idle cooling device"
+ depends on IDLE_INJECT
+ help
+ This implements the CPU cooling mechanism through
+ idle injection. This will throttle the CPU by injecting
+ idle cycle.
+ Unlike Intel Power clamp driver, this driver provides
+ idle injection for each CPU.
diff --git a/drivers/thermal/intel/Makefile b/drivers/thermal/intel/Makefile
index 9a8d8054f316..8d5f7b5cf9b7 100644
--- a/drivers/thermal/intel/Makefile
+++ b/drivers/thermal/intel/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_INTEL_TCC_COOLING) += intel_tcc_cooling.o
obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
obj-$(CONFIG_INTEL_HFI_THERMAL) += intel_hfi.o
+obj-$(CONFIG_INTEL_CPU_IDLE_COOLING) += intel_cpu_idle_cooling.o
diff --git a/drivers/thermal/intel/intel_cpu_idle_cooling.c b/drivers/thermal/intel/intel_cpu_idle_cooling.c
new file mode 100644
index 000000000000..f157018ffb63
--- /dev/null
+++ b/drivers/thermal/intel/intel_cpu_idle_cooling.c
@@ -0,0 +1,259 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Per CPU Idle injection cooling device implementation
+ *
+ * Copyright (c) 2022, Intel Corporation.
+ * All rights reserved.
+ *
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/cpufeature.h>
+#include <linux/cpuhotplug.h>
+#include <linux/idle_inject.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+#include <linux/topology.h>
+
+#include <asm/cpu_device_id.h>
+
+/* Duration match with intel_powerclamp driver */
+#define IDLE_DURATION 24000
+#define IDLE_LATENCY UINT_MAX
+
+static int idle_duration_us = IDLE_DURATION;
+static int idle_latency_us = IDLE_LATENCY;
+
+module_param(idle_duration_us, int, 0644);
+MODULE_PARM_DESC(idle_duration_us,
+ "Idle duration in us.");
+
+module_param(idle_latency_us, int, 0644);
+MODULE_PARM_DESC(idle_latency_us,
+ "Idle latency in us.");
+
+/**
+ * struct cpuidle_cooling - Per instance data for cooling device
+ * @cpu: CPU number for this cooling device
+ * @ii_dev: Idle inject core instance pointer
+ * @cdev: Thermal core cooling device instance
+ * @state: Current cooling device state
+ *
+ * Stores per instance cooling device state.
+ */
+struct cpuidle_cooling {
+ int cpu;
+ struct idle_inject_device *ii_dev;
+ struct thermal_cooling_device *cdev;
+ unsigned long state;
+};
+
+static DEFINE_PER_CPU(struct cpuidle_cooling, cooling_devs);
+
+/* Used for module unload protection with idle injection operations */
+static DEFINE_MUTEX(idle_cooling_lock);
+
+static unsigned int cpuidle_cooling_runtime(unsigned int idle_duration_us,
+ unsigned long state)
+{
+ if (!state)
+ return 0;
+
+ return ((idle_duration_us * 100) / state) - idle_duration_us;
+}
+
+static int cpuidle_idle_injection_register(struct cpuidle_cooling *cooling_dev)
+{
+ struct idle_inject_device *ii_dev;
+
+ ii_dev = idle_inject_register((struct cpumask *)cpumask_of(cooling_dev->cpu));
+ if (!ii_dev) {
+ /*
+ * It is busy as some other device claimed idle injection for this CPU
+ * Also it is possible that memory allocation failure.
+ */
+ pr_err("idle_inject_register failed for cpu:%d\n", cooling_dev->cpu);
+ return -EAGAIN;
+ }
+
+ idle_inject_set_duration(ii_dev, TICK_USEC, idle_duration_us);
+ idle_inject_set_latency(ii_dev, idle_latency_us);
+
+ cooling_dev->ii_dev = ii_dev;
+
+ return 0;
+}
+
+static void cpuidle_idle_injection_unregister(struct cpuidle_cooling *cooling_dev)
+{
+ idle_inject_unregister(cooling_dev->ii_dev);
+}
+
+static int cpuidle_cooling_get_max_state(struct thermal_cooling_device *cdev,
+ unsigned long *state)
+{
+ *state = 100;
+
+ return 0;
+}
+
+static int cpuidle_cooling_get_cur_state(struct thermal_cooling_device *cdev,
+ unsigned long *state)
+{
+ struct cpuidle_cooling *cooling_dev = cdev->devdata;
+
+ *state = READ_ONCE(cooling_dev->state);
+
+ return 0;
+}
+
+static int cpuidle_cooling_set_cur_state(struct thermal_cooling_device *cdev,
+ unsigned long state)
+{
+ struct cpuidle_cooling *cooling_dev = cdev->devdata;
+ unsigned int runtime_us;
+ unsigned long curr_state;
+ int ret = 0;
+
+ mutex_lock(&idle_cooling_lock);
+
+ curr_state = READ_ONCE(cooling_dev->state);
+
+ if (!curr_state && state > 0) {
+ /*
+ * This is the first time to start cooling, so register with
+ * idle injection framework.
+ */
+ if (!cooling_dev->ii_dev) {
+ ret = cpuidle_idle_injection_register(cooling_dev);
+ if (ret)
+ goto unlock_set_state;
+ }
+
+ runtime_us = cpuidle_cooling_runtime(idle_duration_us, state);
+
+ idle_inject_set_duration(cooling_dev->ii_dev, runtime_us, idle_duration_us);
+ idle_inject_start(cooling_dev->ii_dev);
+ } else if (curr_state > 0 && state) {
+ /* Simply update runtime */
+ runtime_us = cpuidle_cooling_runtime(idle_duration_us, state);
+ idle_inject_set_duration(cooling_dev->ii_dev, runtime_us, idle_duration_us);
+ } else if (curr_state > 0 && !state) {
+ idle_inject_stop(cooling_dev->ii_dev);
+ cpuidle_idle_injection_unregister(cooling_dev);
+ cooling_dev->ii_dev = NULL;
+ }
+
+ WRITE_ONCE(cooling_dev->state, state);
+
+unlock_set_state:
+ mutex_unlock(&idle_cooling_lock);
+
+ return ret;
+}
+
+/**
+ * cpuidle_cooling_ops - thermal cooling device ops
+ */
+static struct thermal_cooling_device_ops cpuidle_cooling_ops = {
+ .get_max_state = cpuidle_cooling_get_max_state,
+ .get_cur_state = cpuidle_cooling_get_cur_state,
+ .set_cur_state = cpuidle_cooling_set_cur_state,
+};
+
+static int cpuidle_cooling_register(int cpu)
+{
+ struct cpuidle_cooling *cooling_dev = &per_cpu(cooling_devs, cpu);
+ struct thermal_cooling_device *cdev;
+ char name[14]; /* storage for cpuidle-XXXX */
+ int ret = 0;
+
+ mutex_lock(&idle_cooling_lock);
+
+ snprintf(name, sizeof(name), "cpuidle-%d", cpu);
+ cdev = thermal_cooling_device_register(name, cooling_dev, &cpuidle_cooling_ops);
+ if (IS_ERR(cdev)) {
+ ret = PTR_ERR(cdev);
+ goto unlock_register;
+ }
+
+ cooling_dev->cdev = cdev;
+ cooling_dev->cpu = cpu;
+
+unlock_register:
+ mutex_unlock(&idle_cooling_lock);
+
+ return ret;
+}
+
+static void cpuidle_cooling_unregister(int cpu)
+{
+ struct cpuidle_cooling *cooling_dev = &per_cpu(cooling_devs, cpu);
+
+ mutex_lock(&idle_cooling_lock);
+
+ if (cooling_dev->state) {
+ idle_inject_stop(cooling_dev->ii_dev);
+ cpuidle_idle_injection_unregister(cooling_dev);
+ }
+
+ thermal_cooling_device_unregister(cooling_dev->cdev);
+ cooling_dev->state = 0;
+
+ mutex_unlock(&idle_cooling_lock);
+}
+
+static int cpuidle_cooling_cpu_online(unsigned int cpu)
+{
+ cpuidle_cooling_register(cpu);
+
+ return 0;
+}
+
+static int cpuidle_cooling_cpu_offline(unsigned int cpu)
+{
+ cpuidle_cooling_unregister(cpu);
+
+ return 0;
+}
+
+static enum cpuhp_state cpuidle_cooling_hp_state __read_mostly;
+
+static const struct x86_cpu_id intel_cpuidle_cooling_ids[] __initconst = {
+ X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_MWAIT, NULL),
+ {}
+};
+MODULE_DEVICE_TABLE(x86cpu, intel_cpuidle_cooling_ids);
+
+static int __init cpuidle_cooling_init(void)
+{
+ int ret;
+
+ if (!x86_match_cpu(intel_cpuidle_cooling_ids))
+ return -ENODEV;
+
+ ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+ "thermal/cpuidle_cooling:online",
+ cpuidle_cooling_cpu_online,
+ cpuidle_cooling_cpu_offline);
+ if (ret < 0)
+ return ret;
+
+ cpuidle_cooling_hp_state = ret;
+
+ return 0;
+}
+module_init(cpuidle_cooling_init)
+
+static void __exit cpuidle_cooling_exit(void)
+{
+ cpuhp_remove_state(cpuidle_cooling_hp_state);
+}
+module_exit(cpuidle_cooling_exit)
+
+MODULE_IMPORT_NS(IDLE_INJECT);
+
+MODULE_LICENSE("GPL");
--
2.31.1
Powered by blists - more mailing lists