From: Dmitry Torokhov <dtor@chromium.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Nishanth Menon <nm@ti.com>,
Chander Kashyap <k.chander@samsung.com>,
Inderpal Singh <inderpal.s@samsung.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] PM / OPP: add some lockdep annotations
Date: Mon, 15 Dec 2014 16:42:04 -0800 [thread overview]
Message-ID: <20141216004204.GA30467@dtor-ws> (raw)
Certain OPP APIs need to be called under RCU lock; let's add a few
rcu_lockdep_assert() calls to warn about potential misuse.
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---
drivers/base/power/opp.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index d24dd614a..852eebf 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -218,6 +218,11 @@ int dev_pm_opp_get_opp_count(struct device *dev)
struct dev_pm_opp *temp_opp;
int count = 0;
+ rcu_lockdep_assert(rcu_read_lock_held() ||
+ lockdep_is_held(&dev_opp_list_lock),
+ "dev_pm_opp_get_opp_count() needs rcu_read_lock() "
+ "or dev_opp_list_lock protection");
+
dev_opp = find_device_opp(dev);
if (IS_ERR(dev_opp)) {
int r = PTR_ERR(dev_opp);
@@ -267,6 +272,11 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
struct device_opp *dev_opp;
struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+ rcu_lockdep_assert(rcu_read_lock_held() ||
+ lockdep_is_held(&dev_opp_list_lock),
+ "dev_pm_opp_find_freq_exact() needs rcu_read_lock() "
+ "or dev_opp_list_lock protection");
+
dev_opp = find_device_opp(dev);
if (IS_ERR(dev_opp)) {
int r = PTR_ERR(dev_opp);
@@ -313,6 +323,11 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
struct device_opp *dev_opp;
struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+ rcu_lockdep_assert(rcu_read_lock_held() ||
+ lockdep_is_held(&dev_opp_list_lock),
+ "dev_pm_opp_find_freq_ceil() needs rcu_read_lock() "
+ "or dev_opp_list_lock protection");
+
if (!dev || !freq) {
dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);
return ERR_PTR(-EINVAL);
@@ -361,6 +376,11 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
struct device_opp *dev_opp;
struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+ rcu_lockdep_assert(rcu_read_lock_held() ||
+ lockdep_is_held(&dev_opp_list_lock),
+ "dev_pm_opp_find_freq_floor() needs rcu_read_lock() "
+ "or dev_opp_list_lock protection");
+
if (!dev || !freq) {
dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);
return ERR_PTR(-EINVAL);
--
2.2.0.rc0.207.ga3a616c
--
Dmitry
next reply other threads:[~2014-12-16 0:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-16 0:42 Dmitry Torokhov [this message]
2014-12-16 5:31 ` [PATCH] PM / OPP: add some lockdep annotations 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=20141216004204.GA30467@dtor-ws \
--to=dtor@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=inderpal.s@samsung.com \
--cc=k.chander@samsung.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul.gortmaker@windriver.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.