From patchwork Tue Jan 13 06:04:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 42977 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 544352055F for ; Tue, 13 Jan 2015 06:04:26 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf761893wiw.0 for ; Mon, 12 Jan 2015 22:04:25 -0800 (PST) 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=cFHtRjpha4MA7aKqf5kuoTooOnAbzEaycJCkPGwe2U8=; b=VvO1EMBiM0/FK4DDtm8KaCrIbS4p3GeWD4i7aw1RGgN6hiNcIJAdaKkSFpA7B+MW+V k5WRN9zObISOpeuiIr0Q5JjFiiPnqQ5SutBGHTWkT9DZD+fjT0I609MsgjJm0gzIQwCX V4yil4tAMRIGHBy0B/ePNj7QWWB4tcipb21kIcyeaS7A5GUcQz2wxjcMEPghgEmvrZGC r4hGJjlrNk7BBT2zwMj91Uczj950UJ35tuj7sctmJajV4i2XKv+G3iNkph8LsyeIY8Gk UmfVdaMJxtzMyv7xE0s/TFiOVAKLzQiFWA6/deHnqYV0VIJo42MJpYAMVSm0W9CefUaZ gECg== X-Gm-Message-State: ALoCoQl5/hx6+l7/2bphpBlFz41AQe+YoT9S1oVhmimT9Qa6qyJeckKATWd3Un4/I+p7Pv/9O0YK X-Received: by 10.112.72.228 with SMTP id g4mr4239149lbv.4.1421129065516; Mon, 12 Jan 2015 22:04:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.132 with SMTP id ue4ls562819lac.58.gmail; Mon, 12 Jan 2015 22:04:25 -0800 (PST) X-Received: by 10.112.150.194 with SMTP id uk2mr40628075lbb.84.1421129065374; Mon, 12 Jan 2015 22:04:25 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id pr6si23328138lbb.30.2015.01.12.22.04.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 12 Jan 2015 22:04:25 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id q1so907288lam.5 for ; Mon, 12 Jan 2015 22:04:25 -0800 (PST) X-Received: by 10.152.234.35 with SMTP id ub3mr40623834lac.70.1421129065099; Mon, 12 Jan 2015 22:04:25 -0800 (PST) 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.112.9.200 with SMTP id c8csp1284097lbb; Mon, 12 Jan 2015 22:04:24 -0800 (PST) X-Received: by 10.68.203.226 with SMTP id kt2mr48230794pbc.141.1421129062875; Mon, 12 Jan 2015 22:04:22 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lp6si25838597pab.176.2015.01.12.22.04.21; Mon, 12 Jan 2015 22:04:22 -0800 (PST) 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 S1751566AbbAMGEV (ORCPT + 12 others); Tue, 13 Jan 2015 01:04:21 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:39705 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751248AbbAMGEU (ORCPT ); Tue, 13 Jan 2015 01:04:20 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so1655416pab.4 for ; Mon, 12 Jan 2015 22:04:19 -0800 (PST) X-Received: by 10.66.231.141 with SMTP id tg13mr50287845pac.122.1421129059745; Mon, 12 Jan 2015 22:04:19 -0800 (PST) Received: from localhost ([122.167.116.116]) by mx.google.com with ESMTPSA id a13sm15916643pdm.44.2015.01.12.22.04.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 12 Jan 2015 22:04:19 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, prarit@redhat.com, skannan@codeaurora.org, Viresh Kumar Subject: [PATCH V3 Resend 07/16] cpufreq: stats: get rid of per-cpu cpufreq_stats_table Date: Tue, 13 Jan 2015 11:34:00 +0530 Message-Id: <6a075d926f65e72bf9c099e50deca54899ea91c7.1421128708.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.2.0 In-Reply-To: References: 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: viresh.kumar@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.215.46 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: , All CPUs sharing a cpufreq policy share stats too. For this reason, add a stats pointer to struct cpufreq_policy and drop per-CPU variable cpufreq_stats_table used for accessing cpufreq stats so as to reduce code complexity. Reviewed-by: Prarit Bhargava Signed-off-by: Viresh Kumar --- Resending only a single patch as found a issue with it while testing with my newly written cpufreq-test suite. The problem was that we haven't done cpufreq_cpu_put() for few failure cases and that restricts the cpufreq driver module to unload. Here is the diff to V3: @@ -265,14 +265,14 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb, struct cpufreq_stats *stats; int old_index, new_index; - if (val != CPUFREQ_POSTCHANGE) - return 0; - if (!policy) { pr_err("%s: No policy found\n", __func__); return 0; } + if (val != CPUFREQ_POSTCHANGE) + goto put_policy; + if (!policy->stats) { pr_debug("%s: No stats found\n", __func__); goto put_policy; @@ -285,10 +285,10 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb, /* We can't do stats->time_in_state[-1]= .. */ if (old_index == -1 || new_index == -1) - return 0; + goto put_policy; if (old_index == new_index) - return 0; + goto put_policy; cpufreq_stats_update(stats); drivers/cpufreq/cpufreq_stats.c | 62 +++++++++++++++++++---------------------- include/linux/cpufreq.h | 3 ++ 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 6c234f548601..3792b2e2f4a8 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -31,8 +31,6 @@ struct cpufreq_stats { #endif }; -static DEFINE_PER_CPU(struct cpufreq_stats *, cpufreq_stats_table); - static int cpufreq_stats_update(struct cpufreq_stats *stat) { unsigned long long cur_time = get_jiffies_64(); @@ -48,20 +46,15 @@ static int cpufreq_stats_update(struct cpufreq_stats *stat) static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf) { - struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu); - if (!stat) - return 0; - return sprintf(buf, "%d\n", - per_cpu(cpufreq_stats_table, stat->cpu)->total_trans); + return sprintf(buf, "%d\n", policy->stats->total_trans); } static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf) { + struct cpufreq_stats *stat = policy->stats; ssize_t len = 0; int i; - struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu); - if (!stat) - return 0; + cpufreq_stats_update(stat); for (i = 0; i < stat->state_num; i++) { len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i], @@ -74,12 +67,10 @@ static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf) #ifdef CONFIG_CPU_FREQ_STAT_DETAILS static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) { + struct cpufreq_stats *stat = policy->stats; ssize_t len = 0; int i, j; - struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu); - if (!stat) - return 0; cpufreq_stats_update(stat); len += snprintf(buf + len, PAGE_SIZE - len, " From : To\n"); len += snprintf(buf + len, PAGE_SIZE - len, " : "); @@ -145,8 +136,9 @@ static int freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq) static void __cpufreq_stats_free_table(struct cpufreq_policy *policy) { - struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu); + struct cpufreq_stats *stat = policy->stats; + /* Already freed */ if (!stat) return; @@ -155,7 +147,7 @@ static void __cpufreq_stats_free_table(struct cpufreq_policy *policy) sysfs_remove_group(&policy->kobj, &stats_attr_group); kfree(stat->time_in_state); kfree(stat); - per_cpu(cpufreq_stats_table, policy->cpu) = NULL; + policy->stats = NULL; } static void cpufreq_stats_free_table(unsigned int cpu) @@ -184,7 +176,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) return 0; /* stats already initialized */ - if (per_cpu(cpufreq_stats_table, cpu)) + if (policy->stats) return -EEXIST; stat = kzalloc(sizeof(*stat), GFP_KERNEL); @@ -196,7 +188,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) goto error_out; stat->cpu = cpu; - per_cpu(cpufreq_stats_table, cpu) = stat; + policy->stats = stat; cpufreq_for_each_valid_entry(pos, table) count++; @@ -231,7 +223,7 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) sysfs_remove_group(&policy->kobj, &stats_attr_group); error_out: kfree(stat); - per_cpu(cpufreq_stats_table, cpu) = NULL; + policy->stats = NULL; return ret; } @@ -254,15 +246,7 @@ static void cpufreq_stats_create_table(unsigned int cpu) static void cpufreq_stats_update_policy_cpu(struct cpufreq_policy *policy) { - struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, - policy->last_cpu); - - pr_debug("Updating stats_table for new_cpu %u from last_cpu %u\n", - policy->cpu, policy->last_cpu); - per_cpu(cpufreq_stats_table, policy->cpu) = per_cpu(cpufreq_stats_table, - policy->last_cpu); - per_cpu(cpufreq_stats_table, policy->last_cpu) = NULL; - stat->cpu = policy->cpu; + policy->stats->cpu = policy->cpu; } static int cpufreq_stat_notifier_policy(struct notifier_block *nb, @@ -288,27 +272,36 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb, unsigned long val, void *data) { struct cpufreq_freqs *freq = data; + struct cpufreq_policy *policy = cpufreq_cpu_get(freq->cpu); struct cpufreq_stats *stat; int old_index, new_index; - if (val != CPUFREQ_POSTCHANGE) + if (!policy) { + pr_err("%s: No policy found\n", __func__); return 0; + } - stat = per_cpu(cpufreq_stats_table, freq->cpu); - if (!stat) - return 0; + if (val != CPUFREQ_POSTCHANGE) + goto put_policy; + + if (!policy->stats) { + pr_debug("%s: No stats found\n", __func__); + goto put_policy; + } + + stat = policy->stats; old_index = stat->last_index; new_index = freq_table_get_index(stat, freq->new); /* We can't do stat->time_in_state[-1]= .. */ if (old_index == -1 || new_index == -1) - return 0; + goto put_policy; cpufreq_stats_update(stat); if (old_index == new_index) - return 0; + goto put_policy; spin_lock(&cpufreq_stats_lock); stat->last_index = new_index; @@ -317,6 +310,9 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb, #endif stat->total_trans++; spin_unlock(&cpufreq_stats_lock); + +put_policy: + cpufreq_cpu_put(policy); return 0; } diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4d078cebafd2..60b7b496565d 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -113,6 +113,9 @@ struct cpufreq_policy { wait_queue_head_t transition_wait; struct task_struct *transition_task; /* Task which is doing the transition */ + /* cpufreq-stats */ + struct cpufreq_stats *stats; + /* For cpufreq driver's internal use */ void *driver_data; };