From: "Coelho, Luciano" <luciano.coelho@intel.com>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"mcgrof@kernel.org" <mcgrof@kernel.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"pjones@redhat.com" <pjones@redhat.com>,
"moritz.fischer@ettus.com" <moritz.fischer@ettus.com>,
"takahiro.akashi@linaro.org" <takahiro.akashi@linaro.org>,
"dhowells@redhat.com" <dhowells@redhat.com>,
"pmladek@suse.com" <pmladek@suse.com>,
"Berg, Johannes" <johannes.berg@intel.com>,
"rjw@rjwysocki.net" <rjw@rjwysocki.net>,
"yi1.li@linux.intel.com" <yi1.li@linux.intel.com>,
"kvalo@codeaurora.org" <kvalo@codeaurora.org>,
"luto@kernel.org" <luto@kernel.org>,
"arend.vanspriel@broadcom.com" <arend.vanspriel@broadcom.com>,
"rafal@milecki.pl" <rafal@milecki.pl>,
"dwmw2@infradead.org" <dwmw2@infradead.org>,
"wagi@monom.org" <wagi@monom.org>,
"atull@opensource.altera.com" <atull@opensource.altera.com>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
Subject: Re: [PATCH 1/5] firmware: share fw fallback killing on reboot/suspend
Date: Thu, 6 Apr 2017 06:38:47 +0000 [thread overview]
Message-ID: <1491460726.28535.42.camel@intel.com> (raw)
In-Reply-To: <20170330032450.17121-2-mcgrof@kernel.org>
Hi Luis,
On Wed, 2017-03-29 at 20:24 -0700, Luis R. Rodriguez wrote:
> We kill pending fallback requests on suspend and reboot,
> the only difference is that on suspend we only kill custom
> fallback requests. Provide a wrapper that lets us customize
> the request with a flag.
>
> This also lets us simplify the #ifdef'ery over the calls.
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
> ---
> drivers/base/firmware_class.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index ac350c518e0c..d2e2d83aaf26 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -562,16 +562,15 @@ static void fw_load_abort(struct firmware_priv *fw_priv)
>
> static LIST_HEAD(pending_fw_head);
>
> -/* reboot notifier for avoid deadlock with usermode_lock */
> static int fw_shutdown_notify(struct notifier_block *unused1,
> unsigned long unused2, void *unused3)
> {
> - mutex_lock(&fw_lock);
> - while (!list_empty(&pending_fw_head))
> - __fw_load_abort(list_first_entry(&pending_fw_head,
> - struct firmware_buf,
> - pending_list));
> - mutex_unlock(&fw_lock);
> + /*
> + * Kill all pending fallback requests to avoid both stalling shutdown,
> + * and avoid a deadlock with the usermode_lock.
> + */
> + kill_pending_fw_fallback_reqs(false);
You are calling this function before you declare it, this won't compile
when CONFIG_FW_LOADER_USER_HELPER is not set.
> +
> return NOTIFY_DONE;
> }
>
> @@ -1048,21 +1047,20 @@ static int fw_load_from_user_helper(struct firmware *firmware,
> return _request_firmware_load(fw_priv, opt_flags, timeout);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> -/* kill pending requests without uevent to avoid blocking suspend */
> -static void kill_requests_without_uevent(void)
> +static void kill_pending_fw_fallback_reqs(bool only_kill_custom)
> {
> struct firmware_buf *buf;
> struct firmware_buf *next;
>
> mutex_lock(&fw_lock);
> list_for_each_entry_safe(buf, next, &pending_fw_head, pending_list) {
> - if (!buf->need_uevent)
> + if (!only_kill_custom)
> + __fw_load_abort(buf);
> + else if (!buf->need_uevent)
> __fw_load_abort(buf);
Why not use this?
if (!only_kill_custom || !buf->need_uevent)
__fw_load_abort(buf);
--
Cheers,
Luca.
next prev parent reply other threads:[~2017-04-06 6:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 3:24 [PATCH 0/5] firmware: move UMH locks onto fallback code Luis R. Rodriguez
2017-03-30 3:24 ` [PATCH 1/5] firmware: share fw fallback killing on reboot/suspend Luis R. Rodriguez
2017-04-06 6:38 ` Coelho, Luciano [this message]
2017-04-27 1:56 ` Luis R. Rodriguez
2017-03-30 3:24 ` [PATCH 2/5] firmware: always enable the reboot notifier Luis R. Rodriguez
2017-03-30 3:24 ` [PATCH 3/5] firmware: add sanity check on shutdown/suspend Luis R. Rodriguez
2017-03-30 3:24 ` [PATCH 4/5] firmware: move assign_firmware_buf() further up Luis R. Rodriguez
2017-03-30 3:24 ` [PATCH 5/5] firmware: move umh try locks into the umh code Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 0/6] firmware: move UMH locks onto fallback code Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 1/6] firmware: move kill_requests_without_uevent() up above Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 2/6] firmware: share fw fallback killing on reboot/suspend Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 3/6] firmware: always enable the reboot notifier Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 4/6] firmware: add sanity check on shutdown/suspend Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 5/6] firmware: move assign_firmware_buf() further up Luis R. Rodriguez
2017-05-02 8:31 ` [PATCH v2 6/6] firmware: move umh try locks into the umh code Luis R. Rodriguez
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=1491460726.28535.42.camel@intel.com \
--to=luciano.coelho@intel.com \
--cc=arend.vanspriel@broadcom.com \
--cc=atull@opensource.altera.com \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=emmanuel.grumbach@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mcgrof@kernel.org \
--cc=moritz.fischer@ettus.com \
--cc=pjones@redhat.com \
--cc=pmladek@suse.com \
--cc=rafal@milecki.pl \
--cc=rjw@rjwysocki.net \
--cc=takahiro.akashi@linaro.org \
--cc=wagi@monom.org \
--cc=yi1.li@linux.intel.com \
/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).