* [PATCH] PM / OPP: add some lockdep annotations
@ 2014-12-16 0:42 Dmitry Torokhov
2014-12-16 5:31 ` Viresh Kumar
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Torokhov @ 2014-12-16 0:42 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Pavel Machek, Len Brown, Greg Kroah-Hartman, Viresh Kumar,
Nishanth Menon, Chander Kashyap, Inderpal Singh, Paul Gortmaker,
linux-pm, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] PM / OPP: add some lockdep annotations
2014-12-16 0:42 [PATCH] PM / OPP: add some lockdep annotations Dmitry Torokhov
@ 2014-12-16 5:31 ` Viresh Kumar
0 siblings, 0 replies; 2+ messages in thread
From: Viresh Kumar @ 2014-12-16 5:31 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Rafael J. Wysocki, Pavel Machek, Len Brown, Greg Kroah-Hartman,
Nishanth Menon, Chander Kashyap, Inderpal Singh, Paul Gortmaker,
linux-pm@vger.kernel.org, Linux Kernel Mailing List
On 16 December 2014 at 06:12, Dmitry Torokhov <dtor@chromium.org> wrote:
> Certain OPP APIs need to be called under RCU lock; let's add a few
> rcu_lockdep_assert() calls to warn about potential misuse.
Very nice..
> 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");
> +
To get rid of the redundancy a bit, what about something like:
#define opp_rcu_lockdep_assert() \
rcu_lockdep_assert(rcu_read_lock_held() || \
lockdep_is_held(&dev_opp_list_lock), \
"Missing rcu_read_lock() or
dev_opp_list_lock protection");
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-16 5:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-16 0:42 [PATCH] PM / OPP: add some lockdep annotations Dmitry Torokhov
2014-12-16 5:31 ` Viresh Kumar
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 NNTP newsgroup(s).