From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Juri Lelli <juri.lelli@arm.com>,
Steve Muckle <steve.muckle@linaro.org>,
Saravana Kannan <skannan@codeaurora.org>
Subject: [PATCH 2/11] cpufreq: governor: Use common mutex for dbs_data protection
Date: Thu, 04 Feb 2016 00:16:05 +0100 [thread overview]
Message-ID: <1529283.0IedZktI9q@vostro.rjw.lan> (raw)
In-Reply-To: <3705929.bslqXH980s@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Every governor relying on the common code in cpufreq_governor.c
has to provide its own mutex in struct common_dbs_data. However,
those mutexes are never used at the same time and doing it this
way makes it rather difficult to follow the code. Moreover,
if two governor modules are loaded we end up with two mutexes
used for the same purpose one at a time.
Introduce a single common mutex for that instead and drop the
mutex field from struct common_dbs_data. That at least will
ensure that the mutex is always present and initialized regardless
of what the particular governors do.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/cpufreq/cpufreq_conservative.c | 1 -
drivers/cpufreq/cpufreq_governor.c | 7 +++++--
drivers/cpufreq/cpufreq_governor.h | 6 +-----
drivers/cpufreq/cpufreq_ondemand.c | 5 ++---
4 files changed, 8 insertions(+), 11 deletions(-)
Index: linux-pm/drivers/cpufreq/cpufreq_governor.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_governor.c
+++ linux-pm/drivers/cpufreq/cpufreq_governor.c
@@ -22,6 +22,9 @@
#include "cpufreq_governor.h"
+DEFINE_MUTEX(dbs_data_mutex);
+EXPORT_SYMBOL_GPL(dbs_data_mutex);
+
static struct attribute_group *get_sysfs_attr(struct dbs_data *dbs_data)
{
if (have_governor_per_policy())
@@ -542,7 +545,7 @@ int cpufreq_governor_dbs(struct cpufreq_
int ret;
/* Lock governor to block concurrent initialization of governor */
- mutex_lock(&cdata->mutex);
+ mutex_lock(&dbs_data_mutex);
if (have_governor_per_policy())
dbs_data = policy->governor_data;
@@ -575,7 +578,7 @@ int cpufreq_governor_dbs(struct cpufreq_
}
unlock:
- mutex_unlock(&cdata->mutex);
+ mutex_unlock(&dbs_data_mutex);
return ret;
}
Index: linux-pm/drivers/cpufreq/cpufreq_governor.h
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_governor.h
+++ linux-pm/drivers/cpufreq/cpufreq_governor.h
@@ -223,11 +223,6 @@ struct common_dbs_data {
/* Governor specific ops, see below */
void *gov_ops;
-
- /*
- * Protects governor's data (struct dbs_data and struct common_dbs_data)
- */
- struct mutex mutex;
};
/* Governor Per policy data */
@@ -272,6 +267,7 @@ static ssize_t show_sampling_rate_min_go
return sprintf(buf, "%u\n", dbs_data->min_sampling_rate); \
}
+extern struct mutex dbs_data_mutex;
extern struct mutex cpufreq_governor_lock;
void gov_set_update_util(struct cpu_common_dbs_info *shared,
unsigned int delay_us);
Index: linux-pm/drivers/cpufreq/cpufreq_ondemand.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_ondemand.c
+++ linux-pm/drivers/cpufreq/cpufreq_ondemand.c
@@ -251,7 +251,7 @@ static void update_sampling_rate(struct
/*
* Lock governor so that governor start/stop can't execute in parallel.
*/
- mutex_lock(&od_dbs_cdata.mutex);
+ mutex_lock(&dbs_data_mutex);
cpumask_copy(&cpumask, cpu_online_mask);
@@ -304,7 +304,7 @@ static void update_sampling_rate(struct
}
}
- mutex_unlock(&od_dbs_cdata.mutex);
+ mutex_unlock(&dbs_data_mutex);
}
static ssize_t store_sampling_rate(struct dbs_data *dbs_data, const char *buf,
@@ -550,7 +550,6 @@ static struct common_dbs_data od_dbs_cda
.gov_ops = &od_ops,
.init = od_init,
.exit = od_exit,
- .mutex = __MUTEX_INITIALIZER(od_dbs_cdata.mutex),
};
static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
Index: linux-pm/drivers/cpufreq/cpufreq_conservative.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_conservative.c
+++ linux-pm/drivers/cpufreq/cpufreq_conservative.c
@@ -368,7 +368,6 @@ static struct common_dbs_data cs_dbs_cda
.gov_check_cpu = cs_check_cpu,
.init = cs_init,
.exit = cs_exit,
- .mutex = __MUTEX_INITIALIZER(cs_dbs_cdata.mutex),
};
static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
next prev parent reply other threads:[~2016-02-03 23:39 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-03 23:12 [PATCH 0/11] cpufreq: governor: ondemand/conservative data structures rework Rafael J. Wysocki
2016-02-03 23:14 ` [PATCH 1/11] cpufreq: Clean up default and fallback governor setup Rafael J. Wysocki
2016-02-04 0:55 ` Saravana Kannan
2016-02-04 5:03 ` Viresh Kumar
2016-02-03 23:16 ` Rafael J. Wysocki [this message]
2016-02-04 0:59 ` [PATCH 2/11] cpufreq: governor: Use common mutex for dbs_data protection Saravana Kannan
2016-02-04 5:09 ` Viresh Kumar
2016-02-04 16:46 ` Rafael J. Wysocki
2016-02-05 2:59 ` Viresh Kumar
2016-02-05 3:06 ` Rafael J. Wysocki
2016-02-05 3:15 ` Rafael J. Wysocki
2016-02-05 3:17 ` Rafael J. Wysocki
2016-02-05 3:24 ` Viresh Kumar
2016-02-05 3:33 ` Rafael J. Wysocki
2016-02-05 3:22 ` Viresh Kumar
2016-02-03 23:22 ` [PATCH 3/11] cpufreq: governor: Use common global_dbs_data pointer Rafael J. Wysocki
2016-02-04 1:11 ` Saravana Kannan
2016-02-04 1:25 ` Rafael J. Wysocki
2016-02-04 1:40 ` Saravana Kannan
2016-02-04 5:38 ` Viresh Kumar
2016-02-04 1:47 ` Saravana Kannan
2016-02-04 5:36 ` Viresh Kumar
[not found] ` <CAHZ_5WxJSDtFyFdCc-D2=HSaPON=3rzUxpxPYsCyZvrV1Nv3qw@mail.gmail.com>
2016-02-04 8:25 ` Viresh Kumar
2016-02-04 11:31 ` Gautham R Shenoy
2016-02-04 11:35 ` Viresh Kumar
2016-02-04 16:52 ` Rafael J. Wysocki
2016-02-05 3:02 ` Viresh Kumar
2016-02-05 3:10 ` Rafael J. Wysocki
2016-02-03 23:29 ` [PATCH 4/11] cpufreq: governor: Avoid passing dbs_data pointers around unnecessarily Rafael J. Wysocki
2016-02-04 1:37 ` Saravana Kannan
2016-02-03 23:31 ` [PATCH 5/11] cpufreq: governor: Put governor structure into common_dbs_data Rafael J. Wysocki
2016-02-04 1:57 ` Saravana Kannan
2016-02-03 23:32 ` [PATCH 6/11] cpufreq: governor: Rename some data types and variables Rafael J. Wysocki
2016-02-03 23:33 ` [PATCH 7/11] cpufreq: governor: Rework cpufreq_governor_dbs() Rafael J. Wysocki
2016-02-04 2:03 ` Saravana Kannan
2016-02-03 23:35 ` [PATCH 8/11] cpufreq: governor: Drop the gov pointer from struct dbs_data Rafael J. Wysocki
2016-02-03 23:35 ` [PATCH 9/11] cpufreq: governor: Rename cpu_common_dbs_info to policy_dbs_info Rafael J. Wysocki
2016-02-03 23:37 ` [PATCH 10/11] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-03 23:38 ` [PATCH 11/11] cpufreq: governor: Drop cpu argument from dbs_check_cpu() Rafael J. Wysocki
2016-02-04 5:40 ` [PATCH 0/11] cpufreq: governor: ondemand/conservative data structures rework Viresh Kumar
2016-02-04 17:22 ` Rafael J. Wysocki
2016-02-05 2:07 ` [PATCH v2 0/10] " Rafael J. Wysocki
2016-02-05 2:11 ` [PATCH v2 1/10] cpufreq: Clean up default and fallback governor setup Rafael J. Wysocki
2016-02-10 5:15 ` Gautham R Shenoy
2016-02-10 5:48 ` Gautham R Shenoy
2016-02-05 2:14 ` [PATCH v2 2/10] cpufreq: governor: Use common mutex for dbs_data protection Rafael J. Wysocki
2016-02-05 6:53 ` Viresh Kumar
2016-02-05 22:59 ` Rafael J. Wysocki
2016-02-07 9:31 ` Viresh Kumar
2016-02-07 14:33 ` Rafael J. Wysocki
2016-02-05 2:15 ` [PATCH v2 3/10] cpufreq: governor: Avoid passing dbs_data pointers around unnecessarily Rafael J. Wysocki
2016-02-05 7:09 ` Viresh Kumar
2016-02-05 2:16 ` [PATCH v2 4/10] cpufreq: governor: Put governor structure into common_dbs_data Rafael J. Wysocki
2016-02-05 7:13 ` Viresh Kumar
2016-02-05 2:17 ` [PATCH v2 5/10] cpufreq: governor: Rename some data types and variables Rafael J. Wysocki
2016-02-05 7:17 ` Viresh Kumar
2016-02-05 2:18 ` [PATCH v2 6/10] cpufreq: governor: Rework cpufreq_governor_dbs() Rafael J. Wysocki
2016-02-05 8:14 ` Viresh Kumar
2016-02-05 2:19 ` [PATCH v2 7/10] cpufreq: governor: Drop the gov pointer from struct dbs_data Rafael J. Wysocki
2016-02-05 8:28 ` Viresh Kumar
2016-02-05 2:20 ` [PATCH v2 8/10] cpufreq: governor: Rename cpu_common_dbs_info to policy_dbs_info Rafael J. Wysocki
2016-02-05 8:34 ` Viresh Kumar
2016-02-05 22:50 ` Rafael J. Wysocki
2016-02-06 12:48 ` [PATCH v3 " Rafael J. Wysocki
2016-02-07 9:31 ` Viresh Kumar
2016-02-05 2:21 ` [PATCH v2 9/10] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-05 9:13 ` Viresh Kumar
2016-02-05 22:47 ` Rafael J. Wysocki
2016-02-07 9:29 ` Viresh Kumar
2016-02-07 14:34 ` Rafael J. Wysocki
2016-02-05 2:21 ` [PATCH v2 10/10] cpufreq: governor: Drop cpu argument from dbs_check_cpu() Rafael J. Wysocki
2016-02-05 9:15 ` Viresh Kumar
2016-02-06 12:50 ` [PATCH v3 " Rafael J. Wysocki
2016-02-07 9:32 ` Viresh Kumar
2016-02-06 12:44 ` [PATCH v2 0/10] cpufreq: governor: ondemand/conservative data structures rework Rafael J. Wysocki
2016-02-07 15:22 ` [PATCH 0/3] cpufreq: governor: Data structure rearrangement Rafael J. Wysocki
2016-02-07 15:23 ` [PATCH 1/3] cpufreq: governor: Simplify cpufreq_governor_limits() Rafael J. Wysocki
2016-02-07 15:40 ` Viresh Kumar
2016-02-08 0:59 ` Rafael J. Wysocki
2016-02-07 15:24 ` [PATCH 2/3] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-07 15:45 ` Viresh Kumar
2016-02-07 15:54 ` Viresh Kumar
2016-02-07 15:55 ` Viresh Kumar
2016-02-07 15:25 ` [PATCH 3/3] cpufreq: governor: Symmetrize cpu_dbs_info initialization and cleanup Rafael J. Wysocki
2016-02-07 15:52 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1529283.0IedZktI9q@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=juri.lelli@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=skannan@codeaurora.org \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=steve.muckle@linaro.org \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).