lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jun 2022 12:10:21 +0200 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, John Stultz <jstultz@...gle.com>, "David S. Miller" <davem@...emloft.net>, Alexey Kuznetsov <kuznet@....inr.ac.ru>, Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>, Jakub Kicinski <kuba@...nel.org>, Rob Herring <robh@...nel.org>, Geert Uytterhoeven <geert@...ux-m68k.org>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>, Robin Murphy <robin.murphy@....com>, Andy Shevchenko <andy.shevchenko@...il.com>, Sudeep Holla <sudeep.holla@....com>, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Naresh Kamboju <naresh.kamboju@...aro.org>, Basil Eljuse <Basil.Eljuse@....com>, Ferry Toth <fntoth@...il.com>, Arnd Bergmann <arnd@...db.de>, Anders Roxell <anders.roxell@...aro.org>, linux-pm@...r.kernel.org, Nathan Chancellor <nathan@...nel.org>, Sebastian Andrzej Siewior <bigeasy@...utronix.de>, Geert Uytterhoeven <geert+renesas@...der.be>, Saravana Kannan <saravanak@...gle.com>, "Rafael J. Wysocki" <rafael@...nel.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Sasha Levin <sashal@...nel.org> Subject: [PATCH 5.17 127/298] driver core: Fix wait_for_device_probe() & deferred_probe_timeout interaction From: Saravana Kannan <saravanak@...gle.com> [ Upstream commit 5ee76c256e928455212ab759c51d198fedbe7523 ] Mounting NFS rootfs was timing out when deferred_probe_timeout was non-zero [1]. This was because ip_auto_config() initcall times out waiting for the network interfaces to show up when deferred_probe_timeout was non-zero. While ip_auto_config() calls wait_for_device_probe() to make sure any currently running deferred probe work or asynchronous probe finishes, that wasn't sufficient to account for devices being deferred until deferred_probe_timeout. Commit 35a672363ab3 ("driver core: Ensure wait_for_device_probe() waits until the deferred_probe_timeout fires") tried to fix that by making sure wait_for_device_probe() waits for deferred_probe_timeout to expire before returning. However, if wait_for_device_probe() is called from the kernel_init() context: - Before deferred_probe_initcall() [2], it causes the boot process to hang due to a deadlock. - After deferred_probe_initcall() [3], it blocks kernel_init() from continuing till deferred_probe_timeout expires and beats the point of deferred_probe_timeout that's trying to wait for userspace to load modules. Neither of this is good. So revert the changes to wait_for_device_probe(). [1] - https://lore.kernel.org/lkml/TYAPR01MB45443DF63B9EF29054F7C41FD8C60@TYAPR01MB4544.jpnprd01.prod.outlook.com/ [2] - https://lore.kernel.org/lkml/YowHNo4sBjr9ijZr@dev-arch.thelio-3990X/ [3] - https://lore.kernel.org/lkml/Yo3WvGnNk3LvLb7R@linutronix.de/ Fixes: 35a672363ab3 ("driver core: Ensure wait_for_device_probe() waits until the deferred_probe_timeout fires") Cc: John Stultz <jstultz@...gle.com> Cc: "David S. Miller" <davem@...emloft.net> Cc: Alexey Kuznetsov <kuznet@....inr.ac.ru> Cc: Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org> Cc: Jakub Kicinski <kuba@...nel.org> Cc: Rob Herring <robh@...nel.org> Cc: Geert Uytterhoeven <geert@...ux-m68k.org> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com> Cc: Robin Murphy <robin.murphy@....com> Cc: Andy Shevchenko <andy.shevchenko@...il.com> Cc: Sudeep Holla <sudeep.holla@....com> Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com> Cc: Naresh Kamboju <naresh.kamboju@...aro.org> Cc: Basil Eljuse <Basil.Eljuse@....com> Cc: Ferry Toth <fntoth@...il.com> Cc: Arnd Bergmann <arnd@...db.de> Cc: Anders Roxell <anders.roxell@...aro.org> Cc: linux-pm@...r.kernel.org Reported-by: Nathan Chancellor <nathan@...nel.org> Reported-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de> Tested-by: Geert Uytterhoeven <geert+renesas@...der.be> Acked-by: John Stultz <jstultz@...gle.com> Signed-off-by: Saravana Kannan <saravanak@...gle.com> Link: https://lore.kernel.org/r/20220526034609.480766-2-saravanak@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Reviewed-by: Rafael J. Wysocki <rafael@...nel.org> Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org> Signed-off-by: Sasha Levin <sashal@...nel.org> --- drivers/base/dd.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 977e94cf669e..86fd2ea35656 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -257,7 +257,6 @@ DEFINE_SHOW_ATTRIBUTE(deferred_devs); int driver_deferred_probe_timeout; EXPORT_SYMBOL_GPL(driver_deferred_probe_timeout); -static DECLARE_WAIT_QUEUE_HEAD(probe_timeout_waitqueue); static int __init deferred_probe_timeout_setup(char *str) { @@ -312,7 +311,6 @@ static void deferred_probe_timeout_work_func(struct work_struct *work) list_for_each_entry(p, &deferred_probe_pending_list, deferred_probe) dev_info(p->device, "deferred probe pending\n"); mutex_unlock(&deferred_probe_mutex); - wake_up_all(&probe_timeout_waitqueue); } static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func); @@ -720,9 +718,6 @@ int driver_probe_done(void) */ void wait_for_device_probe(void) { - /* wait for probe timeout */ - wait_event(probe_timeout_waitqueue, !driver_deferred_probe_timeout); - /* wait for the deferred probe workqueue to finish */ flush_work(&deferred_probe_work); -- 2.35.1
Powered by blists - more mailing lists