Skip to content

Commit

Permalink
drivers: base: power: wakeup.c: Use built-in RCU list checking
Browse files Browse the repository at this point in the history
Pass cond argument to list_for_each_entry_rcu() to fix the
following false positive lockdep warning and other uses of
list_for_each_entry_rcu() in wakeup.c.

[  331.934648] =============================
[  331.934650] WARNING: suspicious RCU usage
[  331.934653] 5.6.0-rc1+ #5 Not tainted
[  331.934655] -----------------------------
[  331.934657] drivers/base/power/wakeup.c:408 RCU-list traversed in non-reader section!!

[  333.025156] =============================
[  333.025161] WARNING: suspicious RCU usage
[  333.025168] 5.6.0-rc1+ #5 Not tainted
[  333.025173] -----------------------------
[  333.025180] drivers/base/power/wakeup.c:424 RCU-list traversed in non-reader section!!

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Link: https://lore.kernel.org/r/20200228174745.9308-1-madhuparnabhowmik10@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Madhuparna Bhowmik authored and gregkh committed Mar 18, 2020
1 parent 14422f1 commit 8ba8880
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/base/power/wakeup.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,8 @@ void device_wakeup_arm_wake_irqs(void)
int srcuidx;

srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry)
list_for_each_entry_rcu(ws, &wakeup_sources, entry,
srcu_read_lock_held(&wakeup_srcu))
dev_pm_arm_wake_irq(ws->wakeirq);
srcu_read_unlock(&wakeup_srcu, srcuidx);
}
Expand All @@ -421,7 +422,8 @@ void device_wakeup_disarm_wake_irqs(void)
int srcuidx;

srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry)
list_for_each_entry_rcu(ws, &wakeup_sources, entry,
srcu_read_lock_held(&wakeup_srcu))
dev_pm_disarm_wake_irq(ws->wakeirq);
srcu_read_unlock(&wakeup_srcu, srcuidx);
}
Expand Down Expand Up @@ -874,7 +876,8 @@ void pm_print_active_wakeup_sources(void)
struct wakeup_source *last_activity_ws = NULL;

srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
list_for_each_entry_rcu(ws, &wakeup_sources, entry,
srcu_read_lock_held(&wakeup_srcu)) {
if (ws->active) {
pm_pr_dbg("active wakeup source: %s\n", ws->name);
active = 1;
Expand Down Expand Up @@ -1025,7 +1028,8 @@ void pm_wakep_autosleep_enabled(bool set)
int srcuidx;

srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
list_for_each_entry_rcu(ws, &wakeup_sources, entry,
srcu_read_lock_held(&wakeup_srcu)) {
spin_lock_irq(&ws->lock);
if (ws->autosleep_enabled != set) {
ws->autosleep_enabled = set;
Expand Down Expand Up @@ -1104,7 +1108,8 @@ static void *wakeup_sources_stats_seq_start(struct seq_file *m,
}

*srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
list_for_each_entry_rcu(ws, &wakeup_sources, entry,
srcu_read_lock_held(&wakeup_srcu)) {
if (n-- <= 0)
return ws;
}
Expand Down

0 comments on commit 8ba8880

Please sign in to comment.