From patchwork Wed Mar 27 14:35:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 161264 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp6561659jan; Wed, 27 Mar 2019 07:36:03 -0700 (PDT) X-Received: by 2002:a2e:8316:: with SMTP id a22mr20039555ljh.171.1553697363383; Wed, 27 Mar 2019 07:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553697363; cv=none; d=google.com; s=arc-20160816; b=wCE1G+xmfg/AvUdTsSAofluxYxpR2klmYqC5Wu/m0QE+Id56Y/gK4J+E4HNucEveXV zkmf+0mXo65Hh+nUpETMg/hT5hG9cAP5P1Hy5KCDYNPpvwPjZdSdHK2RTJkcjiPUevrD 8YVaxrFGfx0R3cdl8Bb6NOrm+Sv4E5G4IFGQ1+939NcQ7zcmXj8ru5+JH6lDWsQofkSM txj8TfChANi87nYXn5kDehEmgi8IC34QoNtazrsEyrrM+c0rWPpkmqq7ZCCjl/84F2VK CN9VsT43CRS91NyM9Ypalc+hRMCY2e3h6x+v0DwSODQbdTueFnEBZ8E8cUPqr+e3bsqx 9nfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U/DRGI4bD5hxWQz0RfripmToZCqku1wrBoz6VqQCAxM=; b=hI+QMa8/9dVWqjJAFe6kC041zHTtBh6hVepC+2c9IUuRbbYfzFRiBWRZeMjyOmyqEt t6O60NzWt1Kdj4KPXuPvqDVGIl/Q3IwXyhAeS0yy5bzHwTNPL618GcHI79dj2ToMxPqm 45TjHcpTLdT9VN7UwLi7XRG885fr7rsZujOQeq8Rl3bmrjGYtonz/JK64dIUxSKZ3QJm tyYHlYE7tqRtMj0LaYQ6T1NJPo87ULOmTxFRZq9u+WaB+nBishkWKTuHNou3vn6AplGI 5laYv5p8aCBqsOtDZdnml4RAF84uHWtnn1a5ITlkccdw/cgd0chDu2oSfBbWqyDT8ciO X+Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AoB0C/P6"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 11sor6199348lfr.68.2019.03.27.07.36.03 for (Google Transport Security); Wed, 27 Mar 2019 07:36:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AoB0C/P6"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U/DRGI4bD5hxWQz0RfripmToZCqku1wrBoz6VqQCAxM=; b=AoB0C/P6/wN599c40fA7FnfEHKiR7xeJ7iQmmglTyYj5F7TdqnpFwOiPVkri1hG8sp ARptOc6fXizzOnP4L5FQuk5esopJcWQ+JW8LnKxDNbXzcZ+IAjOG+346RpopY45y7NCv XN9qFMtVdnzZ1twakoIFLSjUOCID5QPM6ZL2TdIVgshdDxw2edfQ5xZpKXu2/bJUNsr6 WujH02a4iLbZyLLKr303Cd/xcwky2IRKn1/FPMIauCLVndH7lwpAi2Cd+OHZjqdPEyrO I01box3+bUsmQsyzJF/nigg3kCfs6jS8swImNBcEH7LbM0wZ5+SJTm1TwdTIr0KUsHSV PstA== 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:in-reply-to :references; bh=U/DRGI4bD5hxWQz0RfripmToZCqku1wrBoz6VqQCAxM=; b=mJu3rqU6LrX7SsPmZMMCFhGZ8SWhdhXGZ3HHjkfF+TkFBDFxcZhtpG98Byo38GWbYM zIgp1jilFeMzJUnYm+x8ONEZdKsSyLB2vRUbQJFOgV1euuBFH6EfB+gJCP+hB68LlXSk 27RBl1qmFhIEfd3gUSpqeJWLXy3wVBXNAAu3hRXWSnycrHF0fiUOqolhSUKQlx4bdjx9 4ic5e+oCt9QmFKmbuE5KU4gnG403MZwtKg87A9xBFQ+J1fnbuFoHUXK0F6DfZOrAIEA3 PbxnjK861huco+rAk+jsFA2UWrqZLRGV9IL7B3Mc5OWI9FltdJx1TVNGDVSNND2WkAev T2AQ== X-Gm-Message-State: APjAAAXi8uxUqwu9oROjxO2mrB+WF9WEz0qrPFPBd1SrF0BneXZ8vmhJ NRBd2x+TiaHWbBC37/fnN5OWvO2E X-Google-Smtp-Source: APXvYqwVSECMJDyPtKk3qdNVbNspLWl8YfiJbJb0coBO8l42U3F7Cr7jGh2Pwe9hzNBWHEBxdliY8A== X-Received: by 2002:a19:4b53:: with SMTP id y80mr20608817lfa.146.1553697362971; Wed, 27 Mar 2019 07:36:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id q2sm4548789lfj.58.2019.03.27.07.36.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 07:36:02 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Frederic Weisbecker , Thomas Gleixner , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , Daniel Lezcano , "Raju P . L . S . S . S . N" , Stephen Boyd , Tony Lindgren , Kevin Hilman , Lina Iyer , Ulf Hansson , Viresh Kumar , Vincent Guittot , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v13 4/4] PM / Domains: Add genpd governor for CPUs Date: Wed, 27 Mar 2019 15:35:48 +0100 Message-Id: <20190327143548.25305-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190327143548.25305-1-ulf.hansson@linaro.org> References: <20190327143548.25305-1-ulf.hansson@linaro.org> As it's now perfectly possible that a PM domain managed by genpd contains devices belonging to CPUs, we should start to take into account the residency values for the idle states during the state selection process. The residency value specifies the minimum duration of time, the CPU or a group of CPUs, needs to spend in an idle state to not waste energy entering it. To deal with this, let's add a new genpd governor, pm_domain_cpu_gov, that may be used for a PM domain that have CPU devices attached or if the CPUs are attached through subdomains. The new governor computes the minimum expected idle duration time for the online CPUs being attached to the PM domain and its subdomains. Then in the state selection process, trying the deepest state first, it verifies that the idle duration time satisfies the state's residency value. It should be noted that, when computing the minimum expected idle duration time, we use the information about the next timer/tick that is stored in the per CPU variable, cpuidle_devices, for the related CPUs. Future wise, this deserves to be improved, as there are obviously more reasons to why a CPU may be woken up from idle. Cc: Lina Iyer Co-developed-by: Lina Iyer Acked-by: Daniel Lezcano Signed-off-by: Ulf Hansson --- Changes in v13: - As suggested by Rafael, use READ_ONCE when reading the next_hrtimer variable. --- drivers/base/power/domain_governor.c | 65 +++++++++++++++++++++++++++- include/linux/pm_domain.h | 3 ++ 2 files changed, 67 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c index 4d07e38a8247..7f9b80f46b3a 100644 --- a/drivers/base/power/domain_governor.c +++ b/drivers/base/power/domain_governor.c @@ -10,6 +10,9 @@ #include #include #include +#include +#include +#include static int dev_update_qos_constraint(struct device *dev, void *data) { @@ -210,8 +213,10 @@ static bool default_power_down_ok(struct dev_pm_domain *pd) struct generic_pm_domain *genpd = pd_to_genpd(pd); struct gpd_link *link; - if (!genpd->max_off_time_changed) + if (!genpd->max_off_time_changed) { + genpd->state_idx = genpd->cached_power_down_state_idx; return genpd->cached_power_down_ok; + } /* * We have to invalidate the cached results for the masters, so @@ -236,6 +241,7 @@ static bool default_power_down_ok(struct dev_pm_domain *pd) genpd->state_idx--; } + genpd->cached_power_down_state_idx = genpd->state_idx; return genpd->cached_power_down_ok; } @@ -244,6 +250,58 @@ static bool always_on_power_down_ok(struct dev_pm_domain *domain) return false; } +static bool cpu_power_down_ok(struct dev_pm_domain *pd) +{ + struct generic_pm_domain *genpd = pd_to_genpd(pd); + struct cpuidle_device *dev; + ktime_t domain_wakeup, next_hrtimer; + s64 idle_duration_ns; + int cpu, i; + + /* Validate dev PM QoS constraints. */ + if (!default_power_down_ok(pd)) + return false; + + if (!(genpd->flags & GENPD_FLAG_CPU_DOMAIN)) + return true; + + /* + * Find the next wakeup for any of the online CPUs within the PM domain + * and its subdomains. Note, we only need the genpd->cpus, as it already + * contains a mask of all CPUs from subdomains. + */ + domain_wakeup = ktime_set(KTIME_SEC_MAX, 0); + for_each_cpu_and(cpu, genpd->cpus, cpu_online_mask) { + dev = per_cpu(cpuidle_devices, cpu); + if (dev) { + next_hrtimer = READ_ONCE(dev->next_hrtimer); + if (ktime_before(next_hrtimer, domain_wakeup)) + domain_wakeup = next_hrtimer; + } + } + + /* The minimum idle duration is from now - until the next wakeup. */ + idle_duration_ns = ktime_to_ns(ktime_sub(domain_wakeup, ktime_get())); + if (idle_duration_ns <= 0) + return false; + + /* + * Find the deepest idle state that has its residency value satisfied + * and by also taking into account the power off latency for the state. + * Start at the state picked by the dev PM QoS constraint validation. + */ + i = genpd->state_idx; + do { + if (idle_duration_ns >= (genpd->states[i].residency_ns + + genpd->states[i].power_off_latency_ns)) { + genpd->state_idx = i; + return true; + } + } while (--i >= 0); + + return false; +} + struct dev_power_governor simple_qos_governor = { .suspend_ok = default_suspend_ok, .power_down_ok = default_power_down_ok, @@ -256,3 +314,8 @@ struct dev_power_governor pm_domain_always_on_gov = { .power_down_ok = always_on_power_down_ok, .suspend_ok = default_suspend_ok, }; + +struct dev_power_governor pm_domain_cpu_gov = { + .suspend_ok = default_suspend_ok, + .power_down_ok = cpu_power_down_ok, +}; diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index a6e251fe9deb..ae7061556a26 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -118,6 +118,7 @@ struct generic_pm_domain { s64 max_off_time_ns; /* Maximum allowed "suspended" time. */ bool max_off_time_changed; bool cached_power_down_ok; + bool cached_power_down_state_idx; int (*attach_dev)(struct generic_pm_domain *domain, struct device *dev); void (*detach_dev)(struct generic_pm_domain *domain, @@ -202,6 +203,7 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state); extern struct dev_power_governor simple_qos_governor; extern struct dev_power_governor pm_domain_always_on_gov; +extern struct dev_power_governor pm_domain_cpu_gov; #else static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) @@ -245,6 +247,7 @@ static inline int dev_pm_genpd_set_performance_state(struct device *dev, #define simple_qos_governor (*(struct dev_power_governor *)(NULL)) #define pm_domain_always_on_gov (*(struct dev_power_governor *)(NULL)) +#define pm_domain_cpu_gov (*(struct dev_power_governor *)(NULL)) #endif #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP