From patchwork Tue Jun 26 10:53:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 139932 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5087595lji; Tue, 26 Jun 2018 03:59:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPkqxhRuHYII0KaO8NpjPqqPNaAB4Qwa2t+DS/caRztRC3oZqfFalcsqN5eMWk0IyVQ7de X-Received: by 2002:a63:ba43:: with SMTP id l3-v6mr893017pgu.295.1530010781712; Tue, 26 Jun 2018 03:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530010781; cv=none; d=google.com; s=arc-20160816; b=GxyRHKFHGHzNeoraC3AqFf0N6nvkim8yR/AMO+nV9W6Q+8kzC2zclKTgwagaY7fVT+ WWpliX8y0y8bsoftvdjoE4G/NUzZykfOiv+TG/6jr3JZ82fxZjJMbRPMODedn2QYmHkO 28D5cxGWmUCVNMO6onBlaqoreeXrvMe7afq87dcJyF/MfCA0bu7b9rbF3q7T8rOwUVUx F6DtrvU/nh9XqV8PjaErzbsgtj1TZ1Rduf1TNDnigSSXs8bFBcl3GaBT2phgciQq/dtL KswlWlxD6FflrP3gktDRZe+s/fnRdYf9hbmegA2DSE7695n3DLru1VTxekX/4vU6Tdwi 6taA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=/igwIDUxpgplUJRqfkBtQprLBvDVjWYEH9idm/qRyA4=; b=diJkBHz2t0zjllh5ZiUds+/3P4PEb/C2eFyI4GoajiuhWdIHx+w+2urrzd/RVQTrEd cYNjAvwae6WLkODMYyk7iIx4JB5rdaTWDBl+ucBNdDUpFPrQv2iUTxF45FvD8qSdTxHl 85SkKomb3zkR6k+cGAFZJZmLcF0bIXo2KIteyG0pNLkQJ8fGfkK/j6B7nLBP2xtYR1iP 6lxF+/dRFp0YNpeJib3WDfARgWGF7rsW/3KDLqV7BeMQi857H3ew/iDsPA68X38+y5e4 iizvPnMWzUWBIFvQs4dVTObUBgAeGhCC2MQMOHotXwYYkUVIwkS2AW9WBcDt3gk8meeJ AD2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WfuB3u3t; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3-v6si1205983pgd.288.2018.06.26.03.59.41; Tue, 26 Jun 2018 03:59:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WfuB3u3t; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934396AbeFZK7j (ORCPT + 31 others); Tue, 26 Jun 2018 06:59:39 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34409 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933969AbeFZK7f (ORCPT ); Tue, 26 Jun 2018 06:59:35 -0400 Received: by mail-wm0-f68.google.com with SMTP id l15-v6so14939319wmc.1 for ; Tue, 26 Jun 2018 03:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=/igwIDUxpgplUJRqfkBtQprLBvDVjWYEH9idm/qRyA4=; b=WfuB3u3tsY6GFNOCWwjeANJvFYl9aJXmuAE9ExfSWitkG9Qek5kU+h6g3cWwfKdwbo EFj5H3fPj1BLBfkxto44qxulTeLC01DrYXkqPsLU53T5Ma0hlWqplzievwoBktBSpv0u HFzY5juaPZ1fKupt5mVEnzk+p/ZLCVDxlmdtI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/igwIDUxpgplUJRqfkBtQprLBvDVjWYEH9idm/qRyA4=; b=PhFL0CscVatHxokrYH+B5MERHIC+JBvpuh70bYwH+MgMX6nEdftoM0VSkCEUrxBAVz dlJ2AMiKTd9DTGzg61EHgjzsXb5NnFS5rK0CKtNO61JqrVHAFdS+rbSrODInE2sr2hsn cQ4dUU1fEEQRMPhSgS8usM90rdPd4vHz9wipEXGkj5O/hgKD4piwq8TwEQx1SBf3Ka5m 4SYWYcmDlwV8DN0+sJijmCEdXgs9vMk0C0yDosXE67E/OxxNoCAGyrfXr5CjX4Eaj8Vs XdWnYxlzXpeQTilJYrtlW8knvqwFcuJFU8+jumOFhwV1e19w/yYcwCL+KPmsPuRE+raX /nSA== X-Gm-Message-State: APt69E0Cjp87H5k2gOMuArMV98oUyRbgheuQgV6VlydCF+o6vKgyBtql 53za5hcT2peaTWOv5GWajKDo4w== X-Received: by 2002:a1c:a406:: with SMTP id n6-v6mr1229617wme.29.1530010773993; Tue, 26 Jun 2018 03:59:33 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:1d00:eafb:d007:f0ff]) by smtp.gmail.com with ESMTPSA id u3-v6sm1570558wrm.60.2018.06.26.03.59.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jun 2018 03:59:33 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: linux-kernel@vger.kernel.org, Viresh Kumar , Eduardo Valentin , Javi Merino , Leo Yan , Kevin Wangtao , Vincent Guittot , Rui Zhang , Daniel Thompson , Peter Zijlstra , Andrea Parri , linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE) Subject: [PATCH V10] powercap/drivers/idle_inject: Add an idle injection framework Date: Tue, 26 Jun 2018 12:53:29 +0200 Message-Id: <1530010416-30692-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Initially, the cpu_cooling device for ARM was changed by adding a new policy inserting idle cycles. The intel_powerclamp driver does a similar action. Instead of implementing idle injections privately in the cpu_cooling device, move the idle injection code in a dedicated framework and give the opportunity to other frameworks to make use of it. The framework relies on the smpboot kthreads which handles via its main loop the common code for hotplugging and [un]parking. This code was previously tested with the cpu cooling device and went through several iterations. It results now in split code and API exported in the header file. It was tested with the cpu cooling device with success. Signed-off-by: Daniel Lezcano Cc: Viresh Kumar Cc: Eduardo Valentin Cc: Javi Merino Cc: Leo Yan Cc: Kevin Wangtao Cc: Vincent Guittot Cc: Rui Zhang Cc: Daniel Thompson Cc: Peter Zijlstra Cc: Andrea Parri --- V10: - Remove set_freezable (Rafael J. Wysocki) - Reduce the prefixed names 'injection' by 'inject" (Rafael J. Wysocki) - Rename 'idle_injection_wakeup_fn()' to 'idle_inject_timer_fn()' (Rafael J. Wysocki) - Shorten label 'out_rollback_per_cpu' to 'out_rollback' (Rafael J. Wysocki) V9: - Unconditionnally reset the should_run flag for all kthreads belonging to the cpumask and remove the park() callback (Viresh Kumar) - Fix up the typos in the comments (Viresh Kumar) V8: - Rollback only what was modified - Add the park() callback to reset the should_run flag V7: - Replace count approach by htimer_forward and restart (Peter Zijlstra) - Wait for task inactive when stopping the idle injections - Changed the comments and description V6: - Move count to wake up function (Viresh Kumar) - Split atomic/non-atomic context to wake up tasks - Add the park callback to handle unplug/inject race - Replace atomic by READ_ONCE and WRITE_ONCE (Peter Zijlstra) V5: - Move init_completion in the init function (Viresh Kumar) - Increment task count in the wakeup function (Viresh Kumar) - Remove rollback at init time (Viresh Kumar) V4: - Wait for completion when stopping (Viresh Kumar) - Check init already done and rollback (Viresh Kumar) V3: - Fixed typos (Viresh Kumar) - Removed extra blank line (Viresh Kumar) - Added full stop (Viresh Kumar) - Fixed Return kerneldoc format (Viresh Kumar) - Fixed multiple kthreads initialization (Viresh Kumar) - Fixed rollbacking the actions in the unregister function (Viresh Kumar) - Make idle injection kthreads name hardcoded - Kthreads are created in the initcall process V2: Fixed checkpatch warnings Signed-off-by: Daniel Lezcano --- drivers/powercap/Kconfig | 10 ++ drivers/powercap/Makefile | 1 + drivers/powercap/idle_inject.c | 359 +++++++++++++++++++++++++++++++++++++++++ include/linux/idle_inject.h | 29 ++++ 4 files changed, 399 insertions(+) create mode 100644 drivers/powercap/idle_inject.c create mode 100644 include/linux/idle_inject.h -- 2.7.4 diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig index 85727ef..6ac27e5 100644 --- a/drivers/powercap/Kconfig +++ b/drivers/powercap/Kconfig @@ -29,4 +29,14 @@ config INTEL_RAPL controller, CPU core (Power Plance 0), graphics uncore (Power Plane 1), etc. +config IDLE_INJECT + bool "Idle injection framework" + depends on CPU_IDLE + default n + help + This enables support for the idle injection framework. It + provides a way to force idle periods on a set of specified + CPUs for power capping. Idle period can be injected + synchronously on a set of specified CPUs or alternatively + on a per CPU basis. endif diff --git a/drivers/powercap/Makefile b/drivers/powercap/Makefile index 0a21ef3..1b32885 100644 --- a/drivers/powercap/Makefile +++ b/drivers/powercap/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_POWERCAP) += powercap_sys.o obj-$(CONFIG_INTEL_RAPL) += intel_rapl.o +obj-$(CONFIG_IDLE_INJECT) += idle_inject.o diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c new file mode 100644 index 0000000..23a96a2 --- /dev/null +++ b/drivers/powercap/idle_inject.c @@ -0,0 +1,359 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2018 Linaro Limited + * + * Author: Daniel Lezcano + * + * The idle injection framework proposes a way to force a cpu to enter + * an idle state during a specified amount of time for a specified + * period. + * + * It relies on the smpboot kthreads which handles, via its main loop, + * the common code for hotplugging and [un]parking. + * + * At init time, all the kthreads are created. + * + * A cpumask is specified as parameter for the idle injection + * registering function. The kthreads will be synchronized regarding + * this cpumask. + * + * The idle + run duration is specified via the helpers and then the + * idle injection can be started at this point. + * + * A kthread will call play_idle() with the specified idle duration + * from above. + * + * A timer is set after waking up all the tasks, to the next idle + * injection cycle. + * + * The task handling the timer interrupt will wakeup all the kthreads + * belonging to the cpumask. + * + * Stopping the idle injection is synchronous, when the function + * returns, there is the guarantee there is no more idle injection + * kthread in activity. + * + * It is up to the user of this framework to provide a lock at an + * upper level to prevent stupid things to happen, like starting while + * we are unregistering. + */ +#define pr_fmt(fmt) "ii_dev: " fmt + +#include +#include +#include +#include +#include +#include + +#include + +/** + * struct idle_inject_thread - task on/off switch structure + * @tsk: a pointer to a task_struct injecting the idle cycles + * @should_run: a integer used as a boolean by the smpboot kthread API + */ +struct idle_inject_thread { + struct task_struct *tsk; + int should_run; +}; + +/** + * struct idle_inject_device - data for the idle injection + * @timer: a hrtimer giving the tempo for the idle injection + * @idle_duration_ms: an unsigned int specifying the idle duration + * @run_duration_ms: an unsigned int specifying the running duration + * @cpumask: a cpumask containing the list of CPUs managed by the device + */ +struct idle_inject_device { + struct hrtimer timer; + unsigned int idle_duration_ms; + unsigned int run_duration_ms; + unsigned long int cpumask[0]; +}; + +static DEFINE_PER_CPU(struct idle_inject_thread, idle_inject_thread); +static DEFINE_PER_CPU(struct idle_inject_device *, idle_inject_device); + +/** + * idle_inject_wakeup - Wake up all idle injection threads + * @ii_dev: the idle injection device + * + * Every idle injection task belonging to the idle injection device + * and running on an online CPU will be wake up by this call. + */ +static void idle_inject_wakeup(struct idle_inject_device *ii_dev) +{ + struct idle_inject_thread *iit; + unsigned int cpu; + + for_each_cpu_and(cpu, to_cpumask(ii_dev->cpumask), cpu_online_mask) { + iit = per_cpu_ptr(&idle_inject_thread, cpu); + iit->should_run = 1; + wake_up_process(iit->tsk); + } +} + +/** + * idle_inject_timer_fn - idle injection timer callback + * @timer: a hrtimer structure + * + * This function is called when the idle injection timer expires which + * will wake up the idle injection tasks and these ones, in turn, play + * idle a specified amount of time. + * + * Return: HRTIMER_RESTART. + */ +static enum hrtimer_restart idle_inject_timer_fn(struct hrtimer *timer) +{ + unsigned int duration_ms; + struct idle_inject_device *ii_dev = + container_of(timer, struct idle_inject_device, timer); + + duration_ms = READ_ONCE(ii_dev->run_duration_ms); + duration_ms += READ_ONCE(ii_dev->idle_duration_ms); + + idle_inject_wakeup(ii_dev); + + hrtimer_forward_now(timer, ms_to_ktime(duration_ms)); + + return HRTIMER_RESTART; +} + +/** + * idle_inject_fn - idle injection routine + * @cpu: the CPU number the task belongs to + * + * The idle injection routine will stay idle the specified amount of + * time + */ +static void idle_inject_fn(unsigned int cpu) +{ + struct idle_inject_device *ii_dev; + struct idle_inject_thread *iit; + + ii_dev = per_cpu(idle_inject_device, cpu); + iit = per_cpu_ptr(&idle_inject_thread, cpu); + + /* + * Boolean used by the smpboot main loop and used as a + * flip-flop in this function. + */ + iit->should_run = 0; + + play_idle(READ_ONCE(ii_dev->idle_duration_ms)); +} + +/** + * idle_inject_set_duration - idle and run duration helper + * @run_duration_ms: an unsigned int giving the running time in milliseconds + * @idle_duration_ms: an unsigned int giving the idle time in milliseconds + */ +void idle_inject_set_duration(struct idle_inject_device *ii_dev, + unsigned int run_duration_ms, + unsigned int idle_duration_ms) +{ + if (run_duration_ms && idle_duration_ms) { + WRITE_ONCE(ii_dev->run_duration_ms, run_duration_ms); + WRITE_ONCE(ii_dev->idle_duration_ms, idle_duration_ms); + } +} + +/** + * idle_inject_get_duration - idle and run duration helper + * @run_duration_ms: a pointer to an unsigned int to store the running time + * @idle_duration_ms: a pointer to an unsigned int to store the idle time + */ +void idle_inject_get_duration(struct idle_inject_device *ii_dev, + unsigned int *run_duration_ms, + unsigned int *idle_duration_ms) +{ + *run_duration_ms = READ_ONCE(ii_dev->run_duration_ms); + *idle_duration_ms = READ_ONCE(ii_dev->idle_duration_ms); +} + +/** + * idle_inject_start - starts the idle injections + * @ii_dev: a pointer to an idle_inject_device structure + * + * The function starts the idle injection cycles by first waking up + * all the tasks the ii_dev is attached to and let them handle the + * idle-run periods. + * + * Return: -EINVAL if the idle or the running durations are not set. + */ +int idle_inject_start(struct idle_inject_device *ii_dev) +{ + unsigned int idle_duration_ms = READ_ONCE(ii_dev->idle_duration_ms); + unsigned int run_duration_ms = READ_ONCE(ii_dev->run_duration_ms); + + if (!idle_duration_ms || !run_duration_ms) + return -EINVAL; + + pr_debug("Starting injecting idle cycles on CPUs '%*pbl'\n", + cpumask_pr_args(to_cpumask(ii_dev->cpumask))); + + idle_inject_wakeup(ii_dev); + + hrtimer_start(&ii_dev->timer, + ms_to_ktime(idle_duration_ms + run_duration_ms), + HRTIMER_MODE_REL); + + return 0; +} + +/** + * idle_inject_stop - stops the idle injections + * @ii_dev: a pointer to an idle injection_device structure + * + * The function stops the idle injection and waits for the threads to + * complete. If we are in the process of injecting an idle cycle, then + * this will wait the end of the cycle. + * + * When the function returns there is no more idle injection + * activity. The kthreads are scheduled out and the periodic timer is + * off. + */ +void idle_inject_stop(struct idle_inject_device *ii_dev) +{ + struct idle_inject_thread *iit; + unsigned int cpu; + + pr_debug("Stopping injecting idle cycles on CPUs '%*pbl'\n", + cpumask_pr_args(to_cpumask(ii_dev->cpumask))); + + hrtimer_cancel(&ii_dev->timer); + + /* + * We want the guarantee we have a quiescent point where + * parked threads stay in there state while we are stopping + * the idle injection. After exiting the loop, if any CPU is + * plugged in, the 'should_run' boolean being false, the + * smpboot main loop schedules the task out. + */ + cpu_hotplug_disable(); + + /* + * Iterate over all (online + offline) CPUs here in case a CPU + * got hotplugged out with "should_run" set to "1" and the + * thread may start running again after the ii_dev is freed + * and the CPU gets hotplugged in. + */ + for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) { + iit = per_cpu_ptr(&idle_inject_thread, cpu); + iit->should_run = 0; + + wait_task_inactive(iit->tsk, 0); + } + + cpu_hotplug_enable(); +} + +/** + * idle_inject_setup - initialize the current task as a RT task + * @cpu: the CPU number where the kthread is running on (not used) + * + * Called one time, this function is in charge of setting the task + * scheduler parameters. + */ +static void idle_inject_setup(unsigned int cpu) +{ + struct sched_param param = { .sched_priority = MAX_USER_RT_PRIO / 2 }; + + sched_setscheduler(current, SCHED_FIFO, ¶m); +} + +/** + * idle_inject_should_run - function helper for the smpboot API + * @cpu: the CPU number where the kthread is running on + * + * Return: a boolean telling if the thread can run. + */ +static int idle_inject_should_run(unsigned int cpu) +{ + struct idle_inject_thread *iit = + per_cpu_ptr(&idle_inject_thread, cpu); + + return iit->should_run; +} + +/** + * idle_inject_register - idle injection init routine + * @cpumask: the list of CPUs managed by the idle injection device + * + * This is the initialization function in charge of creating the + * initializing of the timer and allocate the structures. It does not + * starts the idle injection cycles. + * + * Return: NULL if an allocation fails. + */ +struct idle_inject_device *idle_inject_register(struct cpumask *cpumask) +{ + struct idle_inject_device *ii_dev; + int cpu, cpu_rb; + + ii_dev = kzalloc(sizeof(*ii_dev) + cpumask_size(), GFP_KERNEL); + if (!ii_dev) + return NULL; + + cpumask_copy(to_cpumask(ii_dev->cpumask), cpumask); + hrtimer_init(&ii_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + ii_dev->timer.function = idle_inject_timer_fn; + + for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) { + + if (per_cpu(idle_inject_device, cpu)) { + pr_err("cpu%d is already registered\n", cpu); + goto out_rollback; + } + + per_cpu(idle_inject_device, cpu) = ii_dev; + } + + return ii_dev; + +out_rollback: + for_each_cpu(cpu_rb, to_cpumask(ii_dev->cpumask)) { + if (cpu == cpu_rb) + break; + per_cpu(idle_inject_device, cpu_rb) = NULL; + } + + kfree(ii_dev); + + return NULL; +} + +/** + * idle_inject_unregister - Unregister the idle injection device + * @ii_dev: a pointer to an idle injection device + * + * The function is in charge of stopping the idle injections, + * unregister the kthreads and free the allocated memory in the + * register function. + */ +void idle_inject_unregister(struct idle_inject_device *ii_dev) +{ + unsigned int cpu; + + idle_inject_stop(ii_dev); + + for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) + per_cpu(idle_inject_device, cpu) = NULL; + + kfree(ii_dev); +} + +static struct smp_hotplug_thread idle_inject_threads = { + .store = &idle_inject_thread.tsk, + .setup = idle_inject_setup, + .thread_fn = idle_inject_fn, + .thread_comm = "idle_inject/%u", + .thread_should_run = idle_inject_should_run, +}; + +static int __init idle_inject_init(void) +{ + return smpboot_register_percpu_thread(&idle_inject_threads); +} +early_initcall(idle_inject_init); diff --git a/include/linux/idle_inject.h b/include/linux/idle_inject.h new file mode 100644 index 0000000..bdc0293 --- /dev/null +++ b/include/linux/idle_inject.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2018 Linaro Ltd + * + * Author: Daniel Lezcano + * + */ +#ifndef __IDLE_INJECT_H__ +#define __IDLE_INJECT_H__ + +/* private idle injection device structure */ +struct idle_inject_device; + +struct idle_inject_device *idle_inject_register(struct cpumask *cpumask); + +void idle_inject_unregister(struct idle_inject_device *ii_dev); + +int idle_inject_start(struct idle_inject_device *ii_dev); + +void idle_inject_stop(struct idle_inject_device *ii_dev); + +void idle_inject_set_duration(struct idle_inject_device *ii_dev, + unsigned int run_duration_ms, + unsigned int idle_duration_ms); + +void idle_inject_get_duration(struct idle_inject_device *ii_dev, + unsigned int *run_duration_ms, + unsigned int *idle_duration_ms); +#endif /* __IDLE_INJECT_H__ */