From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Jin Qian <jinqian@android.com>
Cc: Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] power: validate wakeup source before activating it.
Date: Thu, 07 May 2015 00:00:44 +0200 [thread overview]
Message-ID: <2043095.ifDvYKem54@vostro.rjw.lan> (raw)
In-Reply-To: <1430938267-14951-1-git-send-email-jinqian@android.com>
On Wednesday, May 06, 2015 11:51:07 AM Jin Qian wrote:
> A rogue wakeup source not registered in wakeup_sources list is not visible
> from wakeup_sources_stats_show. Check if the wakeup source is registered
> properly by looking at the timer struct.
>
> Signed-off-by: Jin Qian <jinqian@android.com>
> ---
> drivers/base/power/wakeup.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
> index 7726200..aead738 100644
> --- a/drivers/base/power/wakeup.c
> +++ b/drivers/base/power/wakeup.c
> @@ -351,6 +351,20 @@ int device_set_wakeup_enable(struct device *dev, bool enable)
> }
> EXPORT_SYMBOL_GPL(device_set_wakeup_enable);
>
> +/**
> + * wakeup_source_not_registered - validate the given wakeup source.
> + * @ws: Wakeup source to be validated.
> + */
> +static bool wakeup_source_not_registered(struct wakeup_source *ws)
> +{
> + /*
> + * Use timer struct to check if the given source is initialized
> + * by wakeup_source_add.
> + */
> + return ws->timer.function != pm_wakeup_timer_fn ||
> + ws->timer.data != (unsigned long)ws;
> +}
> +
> /*
> * The functions below use the observation that each wakeup event starts a
> * period in which the system should not be suspended. The moment this period
> @@ -391,6 +405,11 @@ static void wakeup_source_activate(struct wakeup_source *ws)
> {
> unsigned int cec;
>
> + if (WARN_ONCE(wakeup_source_not_registered(ws),
> + "unregistered wakeup source\n")) {
> + return;
> + }
The braces are not necessary and you can use format strings with WARN_ONCE()
too IIRC.
> +
> /*
> * active wakeup source should bring the system
> * out of PM_SUSPEND_FREEZE state
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
next prev parent reply other threads:[~2015-05-06 21:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 18:51 [PATCH v2 1/3] power: validate wakeup source before activating it Jin Qian
2015-05-06 22:00 ` Rafael J. Wysocki [this message]
2015-05-06 22:11 ` Jin Qian
2015-05-06 22:39 ` Rafael J. Wysocki
2015-05-06 22:24 ` Jin Qian
-- strict thread matches above, loose matches on Subject: below --
2015-05-05 22:24 Jin Qian
2015-05-05 23:16 ` Rafael J. Wysocki
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=2043095.ifDvYKem54@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=gregkh@linuxfoundation.org \
--cc=jinqian@android.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
/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