From patchwork Mon Jul 21 15:52:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 33991 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 456A220672 for ; Mon, 21 Jul 2014 15:52:36 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id s7sf20008981qap.10 for ; Mon, 21 Jul 2014 08:52:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=4PKXNaMBFnKF240WRK0srJZLHBKZa9AAlEeG6LHHOno=; b=B2WkSWh6d2xVKOKDP8AyklZOm2eWKp7FiSxw21jjJp5uuNAQH/BEwtb+H/YI3weG6e /xNg6j/9mm5pA1F42l9ZJcB7zIC78NgYS6bnQDNHLLF+LFPiUfNiJ0C6QfrZuigZGdNK L8+vRjwSX87um2lNhNcvu9le42ETcVvE2bJN/7pALfi3IhorzzddPbSQ3yp3D0xQNmgO LsCSRJHJRTGRbDQ4jz58uyomVCB4eJjHXy75ShfUEsdOsq30tFaqbUbqIesvLnswPSOQ WEYZW+yGrUahP+d1mEO20Ge3BAE4SU/s1ou557EamLQioO4gXPp4iJuKezzHTCRAeJhk p8vw== X-Gm-Message-State: ALoCoQnRdvPsF/Ig+LG1lVBiHAQJkIF7ufxq8+alGiwK+k1aKMQodAhClg8WsODyUgAeHgzagNWh X-Received: by 10.236.92.69 with SMTP id i45mr11620008yhf.20.1405957956721; Mon, 21 Jul 2014 08:52:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.245 with SMTP id l108ls1987427qgf.83.gmail; Mon, 21 Jul 2014 08:52:36 -0700 (PDT) X-Received: by 10.220.252.198 with SMTP id mx6mr30357597vcb.15.1405957956557; Mon, 21 Jul 2014 08:52:36 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id sg10si11660112vec.88.2014.07.21.08.52.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jul 2014 08:52:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so12679777vcb.3 for ; Mon, 21 Jul 2014 08:52:23 -0700 (PDT) X-Received: by 10.220.118.136 with SMTP id v8mr12824723vcq.50.1405957943516; Mon, 21 Jul 2014 08:52:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp123599vcb; Mon, 21 Jul 2014 08:52:23 -0700 (PDT) X-Received: by 10.68.161.101 with SMTP id xr5mr3030712pbb.168.1405957942671; Mon, 21 Jul 2014 08:52:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si7335273pdj.181.2014.07.21.08.52.22; Mon, 21 Jul 2014 08:52:22 -0700 (PDT) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932876AbaGUPwT (ORCPT + 15 others); Mon, 21 Jul 2014 11:52:19 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:39945 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932874AbaGUPwR (ORCPT ); Mon, 21 Jul 2014 11:52:17 -0400 Received: by mail-pd0-f181.google.com with SMTP id g10so7940256pdj.40 for ; Mon, 21 Jul 2014 08:52:17 -0700 (PDT) X-Received: by 10.70.94.42 with SMTP id cz10mr11153972pdb.107.1405957936946; Mon, 21 Jul 2014 08:52:16 -0700 (PDT) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id r1sm19605571pdo.51.2014.07.21.08.52.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jul 2014 08:52:16 -0700 (PDT) From: Lina Iyer To: linux-pm@vger.kernel.org Cc: Thomas Gleixner , Kevin Hilman , Lina Iyer , Praveen Chidambaram Subject: [PATCH, RFC 2/3] QoS: Modify data structures and function arguments for scalability. Date: Mon, 21 Jul 2014 09:52:03 -0600 Message-Id: <1405957924-41292-3-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405957924-41292-1-git-send-email-lina.iyer@linaro.org> References: <1405957924-41292-1-git-send-email-lina.iyer@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lina.iyer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , QoS add requests uses a handle to the priority list that is used internally to save the request, but this does not extend well. Also, dev_pm_qos structure definition seems to use a list object directly. The 'derivative' relationship seems to be broken. Use pm_qos_request objects instead of passing around the protected priority list object. Signed-off-by: Praveen Chidambaram Signed-off-by: Lina Iyer --- drivers/base/power/qos.c | 14 +++++++------- include/linux/pm_qos.h | 7 ++++--- kernel/power/qos.c | 14 ++++++++------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index 36b9eb4..67a66b1 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -143,7 +143,7 @@ static int apply_constraint(struct dev_pm_qos_request *req, switch(req->type) { case DEV_PM_QOS_RESUME_LATENCY: ret = pm_qos_update_target(&qos->resume_latency, - &req->data.pnode, action, value); + &req->data.lat, action, value); if (ret) { value = pm_qos_read_value(&qos->resume_latency); blocking_notifier_call_chain(&dev_pm_notifiers, @@ -153,7 +153,7 @@ static int apply_constraint(struct dev_pm_qos_request *req, break; case DEV_PM_QOS_LATENCY_TOLERANCE: ret = pm_qos_update_target(&qos->latency_tolerance, - &req->data.pnode, action, value); + &req->data.lat, action, value); if (ret) { value = pm_qos_read_value(&qos->latency_tolerance); req->dev->power.set_latency_tolerance(req->dev, value); @@ -254,7 +254,7 @@ void dev_pm_qos_constraints_destroy(struct device *dev) /* Flush the constraints lists for the device. */ c = &qos->resume_latency; - plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) { + plist_for_each_entry_safe(req, tmp, &c->list, data.lat.node) { /* * Update constraints list and call the notification * callbacks if needed @@ -263,7 +263,7 @@ void dev_pm_qos_constraints_destroy(struct device *dev) memset(req, 0, sizeof(*req)); } c = &qos->latency_tolerance; - plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) { + plist_for_each_entry_safe(req, tmp, &c->list, data.lat.node) { apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE); memset(req, 0, sizeof(*req)); } @@ -378,7 +378,7 @@ static int __dev_pm_qos_update_request(struct dev_pm_qos_request *req, switch(req->type) { case DEV_PM_QOS_RESUME_LATENCY: case DEV_PM_QOS_LATENCY_TOLERANCE: - curr_value = req->data.pnode.prio; + curr_value = req->data.lat.node.prio; break; case DEV_PM_QOS_FLAGS: curr_value = req->data.flr.flags; @@ -831,8 +831,8 @@ s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev) mutex_lock(&dev_pm_qos_mtx); ret = IS_ERR_OR_NULL(dev->power.qos) || !dev->power.qos->latency_tolerance_req ? - PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT : - dev->power.qos->latency_tolerance_req->data.pnode.prio; + PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT : + dev->power.qos->latency_tolerance_req->data.lat.node.prio; mutex_unlock(&dev_pm_qos_mtx); return ret; } diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 9ab4bf7..e1b763d 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -60,7 +60,7 @@ enum dev_pm_qos_req_type { struct dev_pm_qos_request { enum dev_pm_qos_req_type type; union { - struct plist_node pnode; + struct pm_qos_request lat; struct pm_qos_flags_request flr; } data; struct device *dev; @@ -112,7 +112,8 @@ static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req) return req->dev != NULL; } -int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, +int pm_qos_update_target(struct pm_qos_constraints *c, + struct pm_qos_request *req, enum pm_qos_req_action action, int value); bool pm_qos_update_flags(struct pm_qos_flags *pqf, struct pm_qos_flags_request *req, @@ -210,7 +211,7 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val); static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev) { - return dev->power.qos->resume_latency_req->data.pnode.prio; + return dev->power.qos->resume_latency_req->data.lat.node.prio; } static inline s32 dev_pm_qos_requested_flags(struct device *dev) diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 884b770..d0b9c0f 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -161,19 +161,21 @@ static inline void pm_qos_set_value(struct pm_qos_constraints *c, s32 value) * pm_qos_update_target - manages the constraints list and calls the notifiers * if needed * @c: constraints data struct - * @node: request to add to the list, to update or to remove + * @req: request to add to the list, to update or to remove * @action: action to take on the constraints list * @value: value of the request to add or update * * This function returns 1 if the aggregated constraint value has changed, 0 * otherwise. */ -int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, +int pm_qos_update_target(struct pm_qos_constraints *c, + struct pm_qos_request *req, enum pm_qos_req_action action, int value) { unsigned long flags; int prev_value, curr_value, new_value; int ret; + struct plist_node *node = &req->node; spin_lock_irqsave(&pm_qos_lock, flags); prev_value = pm_qos_get_value(c); @@ -310,7 +312,7 @@ static void __pm_qos_update_request(struct pm_qos_request *req, if (new_value != req->node.prio) pm_qos_update_target( pm_qos_array[req->pm_qos_class]->constraints, - &req->node, PM_QOS_UPDATE_REQ, new_value); + req, PM_QOS_UPDATE_REQ, new_value); } /** @@ -355,7 +357,7 @@ void pm_qos_add_request(struct pm_qos_request *req, INIT_DELAYED_WORK(&req->work, pm_qos_work_fn); trace_pm_qos_add_request(pm_qos_class, value); pm_qos_update_target(pm_qos_array[pm_qos_class]->constraints, - &req->node, PM_QOS_ADD_REQ, value); + req, PM_QOS_ADD_REQ, value); } EXPORT_SYMBOL_GPL(pm_qos_add_request); @@ -409,7 +411,7 @@ void pm_qos_update_request_timeout(struct pm_qos_request *req, s32 new_value, if (new_value != req->node.prio) pm_qos_update_target( pm_qos_array[req->pm_qos_class]->constraints, - &req->node, PM_QOS_UPDATE_REQ, new_value); + req, PM_QOS_UPDATE_REQ, new_value); schedule_delayed_work(&req->work, usecs_to_jiffies(timeout_us)); } @@ -437,7 +439,7 @@ void pm_qos_remove_request(struct pm_qos_request *req) trace_pm_qos_remove_request(req->pm_qos_class, PM_QOS_DEFAULT_VALUE); pm_qos_update_target(pm_qos_array[req->pm_qos_class]->constraints, - &req->node, PM_QOS_REMOVE_REQ, + req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE); memset(req, 0, sizeof(*req)); }