Fix device_move() vs. dpm list ordering, v2
Subsystems (7)
RFC PATCH 1/1 Fix device_move() vs. dpm list ordering, v2
dpm_list currently relies on the fact that child devices will be registered after their parents to get a correct suspend order. Using device_move() however destroys this assumption, as an already registered device may be moved under a newly registered one.
This patch adds a new argument to device_move(), allowing callers to specify how dpm_list should be adapted.
--- drivers/base/core.c | 19 ++++++++++++++++++- drivers/base/power/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ drivers/base/power/power.h | 8 ++++++++ drivers/s390/cio/device.c | 9 +++++---- include/linux/device.h | 3 ++- include/linux/pm.h | 11 +++++++++++ net/bluetooth/hci_sysfs.c | 2 +- net/bluetooth/rfcomm/tty.c | 5 +++-- 8 files changed, 92 insertions(+), 9 deletions(-)
drivers/base/core.c +18 -1
@@ -1545,8 +1545,10 @@ out:* device_move - moves a device to a new parent * @dev: the pointer to the struct device to be moved * @new_parent: the new parent of the device (can by NULL) +* @dpm_order: how to reorder the dpm_list */ -int device_move (struct device *dev,struct device *new_parent) +int device_move (struct device *dev,struct device *new_parent, +enum dpm_order dpm_order) {int error;struct device *old_parent;
@@ -1556,6 +1558,7 @@ int device_move(struct device *dev, struif (!dev)return -EINVAL ; +device_pm_lock (); new_parent =get_device (new_parent); new_parent_kobj =get_device_parent (dev, new_parent);
@@ -1596,9 +1599,23 @@ int device_move(struct device *dev, struput_device (new_parent); goto out; } +switch (dpm_order) { +case DPM_ORDER_NONE : +break ; +case DPM_ORDER_DEV_AFTER_PARENT : +device_pm_move_after (dev, new_parent); +break ; +case DPM_ORDER_PARENT_BEFORE_DEV : +device_pm_move_before (new_parent, dev); +break ; +case DPM_ORDER_DEV_LAST : +device_pm_move_last (dev); +break ; + } out_put:put_device (old_parent); out: +device_pm_unlock ();put_device (dev);return error; }
drivers/base/power/main.c +44 -0
50 lines not on this page · raw message
drivers/base/power/power.h +8 -0
@@ -18,11 +18,19 @@ static inline struct device *to_device(sextern void device_pm_add (struct device *);extern void device_pm_remove (struct device *); +extern void device_pm_move_before (struct device *,struct device *); +extern void device_pm_move_after (struct device *,struct device *); +extern void device_pm_move_last (struct device *);#else /* CONFIG_PM_SLEEP */ static inline void device_pm_add (struct device *dev) {}static inline void device_pm_remove (struct device *dev) {} +static inline void device_pm_move_before (struct device *deva, +struct device *devb) {} +static inline void device_pm_move_after (struct device *deva, +struct device *devb) {} +static inline void device_pm_move_last (struct device *dev) {}#endif
drivers/s390/cio/device.c +5 -4
@@ -799,7 +799,7 @@ static void sch_attach_disconnected_devireturn ; other_sch =to_subchannel (cdev->dev.parent);/* Note: device_move() changes cdev->dev.parent */ - ret =device_move (&cdev->dev, &sch->dev); + ret =device_move (&cdev->dev, &sch->dev,DPM_ORDER_PARENT_BEFORE_DEV );if (ret) { CIO_MSG_EVENT(0, "Moving disconnected device 0.%x.%04x failed " "(ret=%d)!\n", cdev->private->dev_id.ssid,
@@ -830,7 +830,7 @@ static void sch_attach_orphaned_device(s* Try to move the ccw device to its new subchannel. * Note: device_move() changes cdev->dev.parent */ - ret =device_move (&cdev->dev, &sch->dev); + ret =device_move (&cdev->dev, &sch->dev,DPM_ORDER_PARENT_BEFORE_DEV );if (ret) { CIO_MSG_EVENT(0, "Moving device 0.%x.%04x from orphanage " "failed (ret=%d)!\n",
@@ -897,7 +897,8 @@ void ccw_device_move_to_orphanage(struct* ccw device can take its place on the subchannel. * Note: device_move() changes cdev->dev.parent */ - ret =device_move (&cdev->dev, &css->pseudo_subchannel->dev); + ret =device_move (&cdev->dev, &css->pseudo_subchannel->dev, +DPM_ORDER_NONE );if (ret) { CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to orphanage failed " "(ret=%d)!\n", cdev->private->dev_id.ssid,
@@ -1129,7 +1130,7 @@ static void ccw_device_move_to_sch(struc* Try to move the ccw device to its new subchannel. * Note: device_move() changes cdev->dev.parent */ - rc =device_move (&cdev->dev, &sch->dev); + rc =device_move (&cdev->dev, &sch->dev,DPM_ORDER_PARENT_BEFORE_DEV );mutex_unlock (&sch->reg_mutex);if (rc) { CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel "
include/linux/pm.h +11 -0
@@ -400,6 +400,9 @@ extern void __suspend_report_result(cons#else /* !CONFIG_PM_SLEEP */ +#define device_pm_lock () do {} while (0) +#define device_pm_unlock () do {} while (0) +static inline int device_suspend (pm_message_t state) {return 0 ;
@@ -409,6 +412,14 @@ static inline int device_suspend(pm_mess#endif /* !CONFIG_PM_SLEEP */ +/* How to reorder dpm_list after device_move() */ +enum dpm_order { +DPM_ORDER_NONE , +DPM_ORDER_DEV_AFTER_PARENT , +DPM_ORDER_PARENT_BEFORE_DEV , +DPM_ORDER_DEV_LAST , +}; +/* * Global Power Management flags * Used to keep APM and ACPI from both being active
net/bluetooth/rfcomm/tty.c +3 -2
@@ -731,7 +731,8 @@ static int rfcomm_tty_open(struct tty_stremove_wait_queue (&dev->wait, &wait);if (err ==0 ) -device_move (dev->tty_dev,rfcomm_get_device (dev)); +device_move (dev->tty_dev,rfcomm_get_device (dev), +DPM_ORDER_DEV_AFTER_PARENT );rfcomm_tty_copy_pending (dev);
@@ -751,7 +752,7 @@ static void rfcomm_tty_close(struct tty_if (atomic_dec_and_test (&dev->opened)) {if (dev->tty_dev->parent) -device_move (dev->tty_dev,NULL ); +device_move (dev->tty_dev,NULL ,DPM_ORDER_DEV_LAST );/* Close DLC and dettach TTY */ rfcomm_dlc_close (dev->dlc,0 );
net/bluetooth/hci_sysfs.c +1 -1
@@ -140,7 +140,7 @@ static void del_conn(struct work_struct dev =device_find_child (&conn->dev,NULL , __match_tty);if (!dev)break ; -device_move (dev,NULL ); +device_move (dev,NULL ,DPM_ORDER_DEV_LAST );put_device (dev); }
include/linux/device.h +2 -1
@@ -483,7 +483,8 @@ extern int device_for_each_child(structextern struct device *device_find_child (struct device *dev,void *data,int (*match)(struct device *dev,void *data));extern int device_rename (struct device *dev,char *new_name); -extern int device_move (struct device *dev,struct device *new_parent); +extern int device_move (struct device *dev,struct device *new_parent, +enum dpm_order dpm_order);/* * Root device objects for grouping under /sys/devices
Quoted 8 lines · Cornelia Huck
dpm_listcurrently relies on the fact that child devices will be registered after their parents to get a correct suspend order. Usingdevice_move()however destroys this assumption, as an already registered device may be moved under a newly registered one.This patch adds a new argument to
device_move(), allowing callers to specify howdpm_listshould be adapted.
I like this version much better. device_move() is now a little more complicated, but the callers are considerably simpler.
Alan Stern