Skip to content

Commit

Permalink
drivers/base: stop new probing during shutdown
Browse files Browse the repository at this point in the history
There is a race window in device_shutdown(), which may cause
-1. parent device shut down before child or
-2. no shutdown on a new probing device.

For 1st, taking the following scenario:
         device_shutdown                        new plugin device
  list_del_init(parent_dev);
  spin_unlock(list_lock);
                                                  device_add(child)
                                                  probe child
  shutdown parent_dev
       --> now child is on the tail of devices_kset

For 2nd, taking the following scenario:
         device_shutdown                        new plugin device
                                                  device_add(dev)
  device_lock(dev);
  ...
  device_unlock(dev);
                                                  probe dev
       --> now, the new occurred dev has no opportunity to shutdown

To fix this race issue, just prevent the new probing request. With this
logic, device_shutdown() is more similar to dpm_prepare().

Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
Reviewed-by: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Pingfan Liu authored and Greg Kroah-Hartman committed Jul 21, 2018
1 parent 726e410 commit 3297c8f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2811,6 +2811,9 @@ void device_shutdown(void)
{
struct device *dev, *parent;

wait_for_device_probe();
device_block_probing();

spin_lock(&devices_kset->list_lock);
/*
* Walk the devices list backward, shutting down each in turn.
Expand Down

0 comments on commit 3297c8f

Please sign in to comment.