From patchwork Fri Jul 5 08:46:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanwoo Choi X-Patchwork-Id: 2824016 Return-Path: X-Original-To: patchwork-linux-pm@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 5E5EB9F7D6 for ; Fri, 5 Jul 2013 08:47:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19FD420163 for ; Fri, 5 Jul 2013 08:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F109720158 for ; Fri, 5 Jul 2013 08:47:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757208Ab3GEIq6 (ORCPT ); Fri, 5 Jul 2013 04:46:58 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:50509 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756941Ab3GEIqy (ORCPT ); Fri, 5 Jul 2013 04:46:54 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MPG007NVGDKSMS0@mailout3.samsung.com>; Fri, 05 Jul 2013 17:46:53 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 57.80.17404.DF786D15; Fri, 05 Jul 2013 17:46:53 +0900 (KST) X-AuditID: cbfee68d-b7f096d0000043fc-c9-51d687fda3e8 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 4B.C5.28381.DF786D15; Fri, 05 Jul 2013 17:46:53 +0900 (KST) Received: from chan.10.32.193.11 ([10.90.8.51]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MPG008MNGDZ60I0@mmp1.samsung.com>; Fri, 05 Jul 2013 17:46:52 +0900 (KST) From: Chanwoo Choi To: viresh.kumar@linaro.org, rjw@sisk.pl, linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, cpufreq@vger.kernel.org, kyungmin.park@samsung.com, myungjoo.ham@samsung.com, cw00.choi@samsung.com Subject: [PATCH 4/6] cpufreq: performance: Add support to collect CPUs load periodically Date: Fri, 05 Jul 2013 17:46:39 +0900 Message-id: <1373014001-17746-5-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1373014001-17746-1-git-send-email-cw00.choi@samsung.com> References: <1373014001-17746-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRmVeSWpSXmKPExsWyRsSkSPdv+7VAg5ltohZPm36wW1z/8pzV 4mzTG3aLy7vmsFl87j3CaHG7cQWbRf/CXiaLjV89HDg87lzbw+bRt2UVo8ejxS2MHp83yQWw RHHZpKTmZJalFunbJXBlvFtwiLXgnn7FvbfKDYybNboYOTkkBEwk5l5qYYawxSQu3FvP1sXI xSEksJRRYu+npawwRYsPvGKFSCxilDjx/jkThPOfUWLb3YOMIFVsAloS+1/cYAOxRQTcJNZe +8QIUsQs0MwocfjTVLAiYYEoievPeplAbBYBVYlpHx+BreAVcJWYPnczI8Q6OYkPex6xdzFy cHACDdoysRgkLARU8uvOBBaQmRIC89glJi69xQoxR0Di2+RDLCD1EgKyEpsOQL0jKXFwxQ2W CYzCCxgZVjGKphYkFxQnpRcZ6hUn5haX5qXrJefnbmIEBvnpf896dzDePmB9iDEZaNxEZinR 5HxglOSVxBsamxlZmJqYGhuZW5qRJqwkzqvWYh0oJJCeWJKanZpakFoUX1Sak1p8iJGJg1Oq gbFcXCd3wbrrO437zZ5aHvP3NVf8MXku+8TVk5sWhR2857VzUqLxh//t/JM9dl3ZpHCOPz35 128Z3V3KR3NOfP+2zfHt3LmlZ3ql7zAFl2+VbWhXNGFlO8LxfNqezSXR/Q6d7v8ku444bl37 9lvJxcJkAROuorjkVNEpMf4NJ2SbJ2ZcP9J9c6sSS3FGoqEWc1FxIgBqgoXkiAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsVy+t9jAd2/7dcCDSY38Fg8bfrBbnH9y3NW i7NNb9gtLu+aw2bxufcIo8XtxhVsFv0Le5ksNn71cODwuHNtD5tH35ZVjB6PFrcwenzeJBfA EtXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDdIaS QlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCGMePdgkOsBff0K+69VW5g3KzR xcjJISFgIrH4wCtWCFtM4sK99WxdjFwcQgKLGCVOvH/OBOH8Z5TYdvcgI0gVm4CWxP4XN9hA bBEBN4m11z4xghQxCzQzShz+NBWsSFggSuL6s14mEJtFQFVi2sdHYCt4BVwlps/dzAixTk7i w55H7F2MHBycQIO2TCwGCQsBlfy6M4FlAiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5 mxjBMfRMagfjygaLQ4wCHIxKPLwWTVcDhVgTy4orcw8xSnAwK4nw2idcCxTiTUmsrEotyo8v Ks1JLT7EmAx01ERmKdHkfGB855XEGxqbmBlZGpkbWhgZm5MmrCTOe6DVOlBIID2xJDU7NbUg tQhmCxMHp1QDo7pBYkd6XJTSvsvyKyZpLbZ/omBnH5Zn/cHBvH3ujocai1hUeb/oaGT6K6ze KXmh5Sy7z4NVe5eHXK+xTtp64tTU55+KvqoemtVbvCQm6Fne3g9b7wt8n83zP6n0hOnjAgWH Q8E1vyU2T7A++ubhJyZvRvPrU1S/txnz6qkpGH1sjC+52d7qrMRSnJFoqMVcVJwIALO5ilXl AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch collect CPUs load when cpufreq governos is performance. The collected CPUs load is used for providing data through debugfs file. - /sys/kernel/debug/cpufreq/cpuX/load_table And this patch create basic sysfs file as below: - /sys/devices/system/cpu/cpufreq/performance/ignore_nice (rw) - /sys/devices/system/cpu/cpufreq/performance/sampling_rate (rw) - /sys/devices/system/cpu/cpufreq/performance/sampling_rate_min (r) Signed-off-by: Chanwoo Choi Signed-off-by: Kyungmin Park Signed-off-by: Myungjoo Ham --- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_performance.c | 156 +++++++++++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index 55ef8c6..7ad4d3b 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -198,6 +198,7 @@ struct common_dbs_data { /* Common across governors */ #define GOV_ONDEMAND 0 #define GOV_CONSERVATIVE 1 + #define GOV_PERFORMANCE 2 int governor; struct attribute_group *attr_group_gov_sys; /* one governor - system */ struct attribute_group *attr_group_gov_pol; /* one governor - policy */ diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c index ceee068..15195fc9 100644 --- a/drivers/cpufreq/cpufreq_performance.c +++ b/drivers/cpufreq/cpufreq_performance.c @@ -17,10 +17,158 @@ #include #include +#ifdef CONFIG_CPU_FREQ_STAT + +#include +#include + +#include "cpufreq_governor.h" + +#define pf_cpu_dbs_info_s cpu_dbs_info_s +#define pf_dbs_tuners dbs_tuners + +static DEFINE_PER_CPU(struct pf_cpu_dbs_info_s, pf_cpu_dbs_info); +static struct common_dbs_data pf_dbs_cdata; + +static ssize_t store_sampling_rate(struct dbs_data *dbs_data, const char *buf, + size_t count) +{ + struct pf_dbs_tuners *tuners = dbs_data->tuners; + unsigned int input; + int ret; + ret = sscanf(buf, "%u", &input); + + if (ret != 1) + return -EINVAL; + + tuners->sampling_rate = max(input, dbs_data->min_sampling_rate); + return count; +} + +static ssize_t store_ignore_nice(struct dbs_data *dbs_data, const char *buf, + size_t count) +{ + struct pf_dbs_tuners *tuners = dbs_data->tuners; + unsigned int input, j; + int ret; + + ret = sscanf(buf, "%u", &input); + if (ret != 1) + return -EINVAL; + + if (input > 1) + input = 1; + + if (input == tuners->ignore_nice) /* nothing to do */ + return count; + + tuners->ignore_nice = input; + + /* we need to re-evaluate prev_cpu_idle */ + for_each_online_cpu(j) { + struct pf_cpu_dbs_info_s *dbs_info; + dbs_info = &per_cpu(pf_cpu_dbs_info, j); + dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j, + &dbs_info->cdbs.prev_cpu_wall, 0); + if (tuners->ignore_nice) + dbs_info->cdbs.prev_cpu_nice = + kcpustat_cpu(j).cpustat[CPUTIME_NICE]; + } + return count; +} + +show_store_one(pf, sampling_rate); +show_store_one(pf, ignore_nice); +declare_show_sampling_rate_min(pf); + +gov_sys_pol_attr_rw(sampling_rate); +gov_sys_pol_attr_rw(ignore_nice); +gov_sys_pol_attr_ro(sampling_rate_min); + +static struct attribute *dbs_attributes_gov_sys[] = { + &sampling_rate_min_gov_sys.attr, + &sampling_rate_gov_sys.attr, + &ignore_nice_gov_sys.attr, + NULL +}; + +static struct attribute_group pf_attr_group_gov_sys = { + .attrs = dbs_attributes_gov_sys, + .name = "performance", +}; + +static struct attribute *dbs_attributes_gov_pol[] = { + &sampling_rate_min_gov_pol.attr, + &sampling_rate_gov_pol.attr, + &ignore_nice_gov_pol.attr, + NULL +}; + +static struct attribute_group pf_attr_group_gov_pol = { + .attrs = dbs_attributes_gov_pol, + .name = "performance", +}; + +static void pf_dbs_timer(struct work_struct *work) +{ + struct pf_cpu_dbs_info_s *dbs_info = container_of(work, + struct pf_cpu_dbs_info_s, cdbs.work.work); + unsigned int cpu = dbs_info->cdbs.cur_policy->cpu; + struct dbs_data *dbs_data = dbs_info->cdbs.cur_policy->governor_data; + unsigned int delay = 0; + + delay = usecs_to_jiffies(dbs_data->min_sampling_rate); + + mutex_lock(&dbs_info->cdbs.timer_mutex); + dbs_check_cpu(dbs_data, cpu); + gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, delay, false); + mutex_unlock(&dbs_info->cdbs.timer_mutex); +} + +static int pf_init(struct dbs_data *dbs_data) +{ + struct pf_dbs_tuners *tuners; + + tuners = kzalloc(sizeof(struct pf_dbs_tuners), GFP_KERNEL); + if (!tuners) { + pr_err("%s: kzalloc failed\n", __func__); + return -ENOMEM; + } + + tuners->ignore_nice = 0; + + dbs_data->tuners = tuners; + dbs_data->min_sampling_rate = MIN_SAMPLING_RATE_RATIO * + jiffies_to_usecs(100); + + mutex_init(&dbs_data->mutex); + + return 0; +} +static void pf_exit(struct dbs_data *dbs_data) +{ + kfree(dbs_data->tuners); +} + +define_get_cpu_dbs_routines(pf_cpu_dbs_info); + +static struct common_dbs_data pf_dbs_cdata = { + .governor = GOV_PERFORMANCE, + .attr_group_gov_sys = &pf_attr_group_gov_sys, + .attr_group_gov_pol = &pf_attr_group_gov_pol, + .get_cpu_cdbs = get_cpu_cdbs, + .get_cpu_dbs_info_s = get_cpu_dbs_info_s, + .gov_dbs_timer = pf_dbs_timer, + .init = pf_init, + .exit = pf_exit, +}; +#endif /* CONFIG_CPU_FREQ_STAT */ static int cpufreq_governor_performance(struct cpufreq_policy *policy, unsigned int event) { + int ret = 0; + switch (event) { case CPUFREQ_GOV_START: case CPUFREQ_GOV_LIMITS: @@ -29,10 +177,12 @@ static int cpufreq_governor_performance(struct cpufreq_policy *policy, __cpufreq_driver_target(policy, policy->max, CPUFREQ_RELATION_H); break; - default: - break; } - return 0; + +#ifdef CONFIG_CPU_FREQ_STAT + ret = cpufreq_governor_dbs(policy, &pf_dbs_cdata, event); +#endif + return ret; } #ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE_MODULE