From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: John Stultz <john.stultz@linaro.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
"Android Team" <kernel-team@android.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Jon Medhurst (Tixy)" <tixy@linaro.org>
Subject: Re: [PATCH] wakeup: Use irqsave/irqrestore for events_lock
Date: Thu, 6 Sep 2012 23:35:22 +0200 [thread overview]
Message-ID: <201209062335.23013.rjw@sisk.pl> (raw)
In-Reply-To: <1346954857-52669-1-git-send-email-john.stultz@linaro.org>
On Thursday, September 06, 2012, John Stultz wrote:
> Jon Medhurst (Tixy) recently noticed a problem with the
> events_lock usage. One of the Android patches that uses
> wakeup_sources calls wakeup_source_add() with irqs disabled.
> However, the event_lock usage in wakeup_source_add() uses
> spin_lock_irq()/spin_unlock_irq(), which reenables interrupts.
> This results in lockdep warnings.
>
> The fix is to use spin_lock_irqsave()/spin_lock_irqrestore()
> instead for the events_lock.
>
> Full bug report here:
> https://bugs.launchpad.net/linaro-landing-team-arm/+bug/1037565
>
> Cc: Rafael J. Wysocki <rjw@sisk.pl>
> Cc: Android Team <kernel-team@android.com>
> Cc: Arve Hjønnevåg <arve@android.com>
> Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
> Reported-and-debugged-by: Jon Medhurst (Tixy) <tixy@linaro.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
Thanks, applied to the linux-next brach of the linux-pm.git tree as v3.7
material.
Please consider CCing PM-related patches to linux-pm@vger.kernel.org in the
future, that makes it much easier for me to handle them.
Thanks,
Rafael
> ---
> drivers/base/power/wakeup.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
> index cbb463b..0e4b093 100644
> --- a/drivers/base/power/wakeup.c
> +++ b/drivers/base/power/wakeup.c
> @@ -127,6 +127,8 @@ EXPORT_SYMBOL_GPL(wakeup_source_destroy);
> */
> void wakeup_source_add(struct wakeup_source *ws)
> {
> + unsigned long flags;
> +
> if (WARN_ON(!ws))
> return;
>
> @@ -135,9 +137,9 @@ void wakeup_source_add(struct wakeup_source *ws)
> ws->active = false;
> ws->last_time = ktime_get();
>
> - spin_lock_irq(&events_lock);
> + spin_lock_irqsave(&events_lock, flags);
> list_add_rcu(&ws->entry, &wakeup_sources);
> - spin_unlock_irq(&events_lock);
> + spin_unlock_irqrestore(&events_lock, flags);
> }
> EXPORT_SYMBOL_GPL(wakeup_source_add);
>
> @@ -147,12 +149,14 @@ EXPORT_SYMBOL_GPL(wakeup_source_add);
> */
> void wakeup_source_remove(struct wakeup_source *ws)
> {
> + unsigned long flags;
> +
> if (WARN_ON(!ws))
> return;
>
> - spin_lock_irq(&events_lock);
> + spin_lock_irqsave(&events_lock, flags);
> list_del_rcu(&ws->entry);
> - spin_unlock_irq(&events_lock);
> + spin_unlock_irqrestore(&events_lock, flags);
> synchronize_rcu();
> }
> EXPORT_SYMBOL_GPL(wakeup_source_remove);
> @@ -723,15 +727,16 @@ bool pm_get_wakeup_count(unsigned int *count, bool block)
> bool pm_save_wakeup_count(unsigned int count)
> {
> unsigned int cnt, inpr;
> + unsigned long flags;
>
> events_check_enabled = false;
> - spin_lock_irq(&events_lock);
> + spin_lock_irqsave(&events_lock, flags);
> split_counters(&cnt, &inpr);
> if (cnt == count && inpr == 0) {
> saved_count = count;
> events_check_enabled = true;
> }
> - spin_unlock_irq(&events_lock);
> + spin_unlock_irqrestore(&events_lock, flags);
> return events_check_enabled;
> }
>
>
prev parent reply other threads:[~2012-09-06 21:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 18:07 [PATCH] wakeup: Use irqsave/irqrestore for events_lock John Stultz
2012-09-06 21:35 ` Rafael J. Wysocki [this message]
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=201209062335.23013.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=arve@android.com \
--cc=john.stultz@linaro.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tixy@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 NNTP newsgroup(s).