From patchwork Tue Nov 18 07:31:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 5326061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2C8899F472 for ; Tue, 18 Nov 2014 07:36:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D46A320176 for ; Tue, 18 Nov 2014 07:36:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2F37200FF for ; Tue, 18 Nov 2014 07:36:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqdI3-0001Es-1R; Tue, 18 Nov 2014 07:33:31 +0000 Received: from mail-ie0-f169.google.com ([209.85.223.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqdHt-0001BL-QG for linux-arm-kernel@lists.infradead.org; Tue, 18 Nov 2014 07:33:23 +0000 Received: by mail-ie0-f169.google.com with SMTP id y20so6724587ier.14 for ; Mon, 17 Nov 2014 23:33:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mVlKLYhJ+fRd2tRsrVfW/Yktfsg02QMBzJrUMbS0qNI=; b=IJv95aXFsw/peHwR2YvajuwkZjKmZjcvZZ3nEFbuBc3THs5krdjI3c1w12dSI+YBrc jTyUXil8tSi628Z8AwInxhqN2a0k2TEQvdVN14mpGiWGg/ld9tZYQBbp/Ra0SBrsNm2P Y/gRfQNBgkBiNITgYAVLpviUugVieJrmX+v04i1+JAOKMXA14qc1SuY3Q2IG7LrBBeZz d/IzM3vbp8q9e2ds0Y2jQvUh60sTKPsdXCKP+RqrLg2wSyFFKEcr8OlGungVPApYxwUN 1ZSFojUyya1Vv3I5Zq6q5uV2oe/25K5kaRZa9yFyCj24TYdJN1qNzI+gCmvH4pkoRbA8 n5dw== X-Gm-Message-State: ALoCoQm3SAgoKzhYgNibTv0IaFcxqbCU6eqgjb1aMjPzyh4kPgj2ceyHEfAXovqjULh2S8ykuoeE X-Received: by 10.42.155.197 with SMTP id v5mr12134857icw.52.1416295981850; Mon, 17 Nov 2014 23:33:01 -0800 (PST) Received: from localhost.localdomain (c-24-8-37-141.hsd1.co.comcast.net. [24.8.37.141]) by mx.google.com with ESMTPSA id w197sm20175215iod.24.2014.11.17.23.33.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Nov 2014 23:33:01 -0800 (PST) From: Lina Iyer To: khilman@linaro.org, ulf.hansson@linaro.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@rjwysocki.net, daniel.lezcano@linaro.org Subject: [PATCH v4/RFC 2/4] QoS: Enhance PM QoS framework to support per-cpu QoS request Date: Tue, 18 Nov 2014 00:31:48 -0700 Message-Id: <1416295910-40433-3-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416295910-40433-1-git-send-email-lina.iyer@linaro.org> References: <1416295910-40433-1-git-send-email-lina.iyer@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141117_233322_003893_2C573F34 X-CRM114-Status: GOOD ( 23.39 ) X-Spam-Score: -0.7 (/) Cc: Lina Iyer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP QoS request can be better optimized if the request can be set only for the required cpus and not all cpus. This helps save power on other cores, while still guaranteeing the quality of service on the desired cores. Add a new enumeration to specify the PM QoS request type. The enums help specify what is the intended target cpu of the request. Enhance the QoS constraints data structures to support target value for each core. Requests specify if the QoS is applicable to all cores (default) or to a selective subset of the cores or to a core(s). Idle and interested drivers can request a PM QoS value for a constraint across all cpus, or a specific cpu or a set of cpus. Separate APIs have been added to request for individual cpu or a cpumask. The default behaviour of PM QoS is maintained i.e, requests that do not specify a type of the request will continue to be effected on all cores. The userspace sysfs interface does not support setting cpumask of a PM QoS request. Signed-off-by: Lina Iyer Based on work by: Praveen Chidambaram https://www.codeaurora.org/cgit/quic/la/kernel/msm-3.10/tree/kernel/power?h=LNX.LA.3.7 --- Documentation/power/pm_qos_interface.txt | 16 ++++ include/linux/pm_qos.h | 12 +++ kernel/power/qos.c | 130 ++++++++++++++++++++++++++++++- 3 files changed, 157 insertions(+), 1 deletion(-) diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt index 129f7c0..7f7a774 100644 --- a/Documentation/power/pm_qos_interface.txt +++ b/Documentation/power/pm_qos_interface.txt @@ -43,6 +43,15 @@ registered notifiers are called only if the target value is now different. Clients of pm_qos need to save the returned handle for future use in other pm_qos API functions. +The handle is a pm_qos_request object. By default the request object sets the +request type to PM_QOS_REQ_ALL_CORES, in which case, the PM QoS request +applies to all cores. However, the driver can also specify a request type to +be either of + PM_QOS_REQ_ALL_CORES, + PM_QOS_REQ_AFFINE_CORES, + +Specify the cpumask when type is set to PM_QOS_REQ_AFFINE_CORES. + void pm_qos_update_request(handle, new_target_value): Will update the list element pointed to by the handle with the new target value and recompute the new aggregated target, calling the notification tree if the @@ -56,6 +65,13 @@ the request. int pm_qos_request(param_class): Returns the aggregated value for a given PM QoS class. +int pm_qos_request_for_cpu(param_class, cpu): +Returns the aggregated value for a given PM QoS class for the specified cpu. + +int pm_qos_request_for_cpumask(param_class, cpumask): +Returns the aggregated value for a given PM QoS class for the specified +cpumask. + int pm_qos_request_active(handle): Returns if the request is still active, i.e. it has not been removed from a PM QoS class constraints list. diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index c4d859e..de9b04b 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -9,6 +9,7 @@ #include #include #include +#include enum { PM_QOS_RESERVED = 0, @@ -42,7 +43,15 @@ enum pm_qos_flags_status { #define PM_QOS_FLAG_NO_POWER_OFF (1 << 0) #define PM_QOS_FLAG_REMOTE_WAKEUP (1 << 1) +enum pm_qos_req_type { + PM_QOS_REQ_ALL_CORES = 0, + PM_QOS_REQ_AFFINE_CORES, +}; + struct pm_qos_request { + enum pm_qos_req_type type; + struct cpumask cpus_affine; + /* Internal structure members */ struct plist_node node; int pm_qos_class; struct delayed_work work; /* for pm_qos_update_request_timeout */ @@ -83,6 +92,7 @@ enum pm_qos_type { struct pm_qos_constraints { struct plist_head list; s32 target_value; /* Do not change to 64 bit */ + s32 __percpu *target_per_cpu; s32 default_value; s32 no_constraint_value; enum pm_qos_type type; @@ -130,6 +140,8 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, void pm_qos_remove_request(struct pm_qos_request *req); int pm_qos_request(int pm_qos_class); +int pm_qos_request_for_cpu(int pm_qos_class, int cpu); +int pm_qos_request_for_cpumask(int pm_qos_class, struct cpumask *mask); int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier); int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier); int pm_qos_request_active(struct pm_qos_request *req); diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 602f5cb..36b4414 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -182,6 +183,49 @@ static inline void pm_qos_set_value(struct pm_qos_constraints *c, s32 value) c->target_value = value; } +static inline int pm_qos_set_value_for_cpus(struct pm_qos_constraints *c) +{ + struct pm_qos_request *req; + int cpu; + s32 *qos_val; + + if (!c->target_per_cpu) { + c->target_per_cpu = alloc_percpu_gfp(s32, GFP_ATOMIC); + if (!c->target_per_cpu) + return -ENOMEM; + } + + for_each_possible_cpu(cpu) + *per_cpu_ptr(c->target_per_cpu, cpu) = c->no_constraint_value; + + if (plist_head_empty(&c->list)) + return 0; + + plist_for_each_entry(req, &c->list, node) { + for_each_cpu(cpu, &req->cpus_affine) { + qos_val = per_cpu_ptr(c->target_per_cpu, cpu); + switch (c->type) { + case PM_QOS_MIN: + if (*qos_val > req->node.prio) + *qos_val = req->node.prio; + break; + case PM_QOS_MAX: + if (req->node.prio > *qos_val) + *qos_val = req->node.prio; + break; + case PM_QOS_SUM: + *qos_val += req->node.prio; + break; + default: + BUG(); + break; + } + } + } + + return 0; +} + /** * pm_qos_update_target - manages the constraints list and calls the notifiers * if needed @@ -231,9 +275,12 @@ int pm_qos_update_target(struct pm_qos_constraints *c, curr_value = pm_qos_get_value(c); pm_qos_set_value(c, curr_value); - + ret = pm_qos_set_value_for_cpus(c); spin_unlock_irqrestore(&pm_qos_lock, flags); + if (ret) + return ret; + trace_pm_qos_update_target(action, prev_value, curr_value); if (prev_value != curr_value) { ret = 1; @@ -323,6 +370,64 @@ int pm_qos_request(int pm_qos_class) } EXPORT_SYMBOL_GPL(pm_qos_request); +int pm_qos_request_for_cpu(int pm_qos_class, int cpu) +{ + s32 qos_val; + unsigned long flags; + struct pm_qos_constraints *c; + + spin_lock_irqsave(&pm_qos_lock, flags); + c = pm_qos_array[pm_qos_class]->constraints; + if (c->target_per_cpu) + qos_val = per_cpu(*c->target_per_cpu, cpu); + else + qos_val = c->no_constraint_value; + spin_unlock_irqrestore(&pm_qos_lock, flags); + + return qos_val; +} +EXPORT_SYMBOL(pm_qos_request_for_cpu); + +int pm_qos_request_for_cpumask(int pm_qos_class, struct cpumask *mask) +{ + unsigned long irqflags; + int cpu; + struct pm_qos_constraints *c; + s32 val, qos_val; + + spin_lock_irqsave(&pm_qos_lock, irqflags); + c = pm_qos_array[pm_qos_class]->constraints; + val = c->no_constraint_value; + if (!c->target_per_cpu) + goto skip_loop; + + for_each_cpu(cpu, mask) { + qos_val = *per_cpu_ptr(c->target_per_cpu, cpu); + switch (c->type) { + case PM_QOS_MIN: + if (val < qos_val) + val = qos_val; + break; + case PM_QOS_MAX: + if (qos_val > val) + val = qos_val; + break; + case PM_QOS_SUM: + val += qos_val; + break; + default: + BUG(); + break; + } + } + +skip_loop: + spin_unlock_irqrestore(&pm_qos_lock, irqflags); + + return val; +} +EXPORT_SYMBOL(pm_qos_request_for_cpumask); + int pm_qos_request_active(struct pm_qos_request *req) { return req->pm_qos_class != 0; @@ -378,6 +483,27 @@ void pm_qos_add_request(struct pm_qos_request *req, WARN(1, KERN_ERR "pm_qos_add_request() called for already added request\n"); return; } + + switch (req->type) { + case PM_QOS_REQ_AFFINE_CORES: + if (cpumask_empty(&req->cpus_affine)) + req->type = PM_QOS_REQ_ALL_CORES; + else + cpumask_and(&req->cpus_affine, &req->cpus_affine, + cpu_possible_mask); + break; + + default: + req->type = PM_QOS_REQ_ALL_CORES; + break; + + case PM_QOS_REQ_ALL_CORES: + break; + } + + if (req->type == PM_QOS_REQ_ALL_CORES) + cpumask_copy(&req->cpus_affine, cpu_possible_mask); + req->pm_qos_class = pm_qos_class; INIT_DELAYED_WORK(&req->work, pm_qos_work_fn); trace_pm_qos_add_request(pm_qos_class, value); @@ -451,6 +577,7 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, s32 new_value, */ void pm_qos_remove_request(struct pm_qos_request *req) { + if (!req) /*guard against callers passing in null */ return; /* silent return to keep pcm code cleaner */ @@ -466,6 +593,7 @@ void pm_qos_remove_request(struct pm_qos_request *req) pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints, req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE); + memset(req, 0, sizeof(*req)); } EXPORT_SYMBOL_GPL(pm_qos_remove_request);