Commit 56d16d44 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "driver core: separate function to shutdown one device" 



This reverts commit 95dc7565.

The series is being reverted before -rc1 as there are still reports of
lockups on shutdown, so it's not quite ready for "prime time."

Reported-by: default avatarAndrey Skvortsov <andrej.skvortzov@gmail.com>
Link: https://lore.kernel.org/r/ZvMkkhyJrohaajuk@skv.local


Cc: Christoph Hellwig <hch@lst.de>
Cc: David Jeffery <djeffery@redhat.com>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Stuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2efddb55

drivers/base/core.c

+30 −36
Original line number Diff line number Diff line
@@ -4779,41 +4779,6 @@ int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid) 
}

EXPORT_SYMBOL_GPL(device_change_owner);



static void shutdown_one_device(struct device *dev)

{

	/* hold lock to avoid race with probe/release */

	if (dev->parent && dev->bus && dev->bus->need_parent_lock)

		device_lock(dev->parent);

	device_lock(dev);



	/* Don't allow any more runtime suspends */

	pm_runtime_get_noresume(dev);

	pm_runtime_barrier(dev);



	if (dev->class && dev->class->shutdown_pre) {

		if (initcall_debug)

			dev_info(dev, "shutdown_pre\n");

		dev->class->shutdown_pre(dev);

	}

	if (dev->bus && dev->bus->shutdown) {

		if (initcall_debug)

			dev_info(dev, "shutdown\n");

		dev->bus->shutdown(dev);

	} else if (dev->driver && dev->driver->shutdown) {

		if (initcall_debug)

			dev_info(dev, "shutdown\n");

		dev->driver->shutdown(dev);

	}



	device_unlock(dev);

	if (dev->parent && dev->bus && dev->bus->need_parent_lock)

		device_unlock(dev->parent);



	put_device(dev);

	if (dev->parent)

		put_device(dev->parent);

}



/**

 * device_shutdown - call ->shutdown() on each device to shutdown.

 */
@@ -4850,7 +4815,36 @@ void device_shutdown(void) 
		list_del_init(&dev->kobj.entry);

		spin_unlock(&devices_kset->list_lock);



		shutdown_one_device(dev);

		/* hold lock to avoid race with probe/release */

		if (parent && dev->bus && dev->bus->need_parent_lock)

			device_lock(parent);

		device_lock(dev);



		/* Don't allow any more runtime suspends */

		pm_runtime_get_noresume(dev);

		pm_runtime_barrier(dev);



		if (dev->class && dev->class->shutdown_pre) {

			if (initcall_debug)

				dev_info(dev, "shutdown_pre\n");

			dev->class->shutdown_pre(dev);

		}

		if (dev->bus && dev->bus->shutdown) {

			if (initcall_debug)

				dev_info(dev, "shutdown\n");

			dev->bus->shutdown(dev);

		} else if (dev->driver && dev->driver->shutdown) {

			if (initcall_debug)

				dev_info(dev, "shutdown\n");

			dev->driver->shutdown(dev);

		}



		device_unlock(dev);

		if (parent && dev->bus && dev->bus->need_parent_lock)

			device_unlock(parent);



		put_device(dev);

		put_device(parent);



		spin_lock(&devices_kset->list_lock);

	}