| Message ID | 2264402.ElGaqSPkdT@kreacher |
|---|---|
| State | New |
| Headers | show |
| Series | PM: runtime: Fix rpm_idle() and relocate rpm_callback() | expand |
On 2/12/22 16:32, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Because rpm_callback() is a wrapper around __rpm_callback(), and the > only caller of it after the change eliminating an invocation of it > from rpm_idle(), move the former next to the latter to make the code > a bit easier to follow. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/base/power/runtime.c | 64 +++++++++++++++++++++---------------------- > 1 file changed, 32 insertions(+), 32 deletions(-) > > Index: linux-pm/drivers/base/power/runtime.c > =================================================================== > --- linux-pm.orig/drivers/base/power/runtime.c > +++ linux-pm/drivers/base/power/runtime.c > @@ -422,6 +422,38 @@ fail: > } > > /** > + * rpm_callback - Run a given runtime PM callback for a given device. > + * @cb: Runtime PM callback to run. > + * @dev: Device to run the callback for. > + */ > +static int rpm_callback(int (*cb)(struct device *), struct device *dev) > +{ > + int retval; > + > + if (dev->power.memalloc_noio) { > + unsigned int noio_flag; > + > + /* > + * Deadlock might be caused if memory allocation with > + * GFP_KERNEL happens inside runtime_suspend and > + * runtime_resume callbacks of one block device's > + * ancestor or the block device itself. Network > + * device might be thought as part of iSCSI block > + * device, so network device and its ancestor should > + * be marked as memalloc_noio too. > + */ > + noio_flag = memalloc_noio_save(); > + retval = __rpm_callback(cb, dev); > + memalloc_noio_restore(noio_flag); > + } else { > + retval = __rpm_callback(cb, dev); > + } > + > + dev->power.runtime_error = retval; > + return retval != -EACCES ? retval : -EIO; > +} > + > +/** > * rpm_idle - Notify device bus type if the device can be suspended. > * @dev: Device to notify the bus type about. > * @rpmflags: Flag bits. > @@ -505,38 +537,6 @@ static int rpm_idle(struct device *dev, > } > > /** > - * rpm_callback - Run a given runtime PM callback for a given device. > - * @cb: Runtime PM callback to run. > - * @dev: Device to run the callback for. > - */ > -static int rpm_callback(int (*cb)(struct device *), struct device *dev) > -{ > - int retval; > - > - if (dev->power.memalloc_noio) { > - unsigned int noio_flag; > - > - /* > - * Deadlock might be caused if memory allocation with > - * GFP_KERNEL happens inside runtime_suspend and > - * runtime_resume callbacks of one block device's > - * ancestor or the block device itself. Network > - * device might be thought as part of iSCSI block > - * device, so network device and its ancestor should > - * be marked as memalloc_noio too. > - */ > - noio_flag = memalloc_noio_save(); > - retval = __rpm_callback(cb, dev); > - memalloc_noio_restore(noio_flag); > - } else { > - retval = __rpm_callback(cb, dev); > - } > - > - dev->power.runtime_error = retval; > - return retval != -EACCES ? retval : -EIO; > -} > - > -/** > * rpm_suspend - Carry out runtime suspend of given device. > * @dev: Device to suspend. > * @rpmflags: Flag bits. > > >
Index: linux-pm/drivers/base/power/runtime.c =================================================================== --- linux-pm.orig/drivers/base/power/runtime.c +++ linux-pm/drivers/base/power/runtime.c @@ -422,6 +422,38 @@ fail: } /** + * rpm_callback - Run a given runtime PM callback for a given device. + * @cb: Runtime PM callback to run. + * @dev: Device to run the callback for. + */ +static int rpm_callback(int (*cb)(struct device *), struct device *dev) +{ + int retval; + + if (dev->power.memalloc_noio) { + unsigned int noio_flag; + + /* + * Deadlock might be caused if memory allocation with + * GFP_KERNEL happens inside runtime_suspend and + * runtime_resume callbacks of one block device's + * ancestor or the block device itself. Network + * device might be thought as part of iSCSI block + * device, so network device and its ancestor should + * be marked as memalloc_noio too. + */ + noio_flag = memalloc_noio_save(); + retval = __rpm_callback(cb, dev); + memalloc_noio_restore(noio_flag); + } else { + retval = __rpm_callback(cb, dev); + } + + dev->power.runtime_error = retval; + return retval != -EACCES ? retval : -EIO; +} + +/** * rpm_idle - Notify device bus type if the device can be suspended. * @dev: Device to notify the bus type about. * @rpmflags: Flag bits. @@ -505,38 +537,6 @@ static int rpm_idle(struct device *dev, } /** - * rpm_callback - Run a given runtime PM callback for a given device. - * @cb: Runtime PM callback to run. - * @dev: Device to run the callback for. - */ -static int rpm_callback(int (*cb)(struct device *), struct device *dev) -{ - int retval; - - if (dev->power.memalloc_noio) { - unsigned int noio_flag; - - /* - * Deadlock might be caused if memory allocation with - * GFP_KERNEL happens inside runtime_suspend and - * runtime_resume callbacks of one block device's - * ancestor or the block device itself. Network - * device might be thought as part of iSCSI block - * device, so network device and its ancestor should - * be marked as memalloc_noio too. - */ - noio_flag = memalloc_noio_save(); - retval = __rpm_callback(cb, dev); - memalloc_noio_restore(noio_flag); - } else { - retval = __rpm_callback(cb, dev); - } - - dev->power.runtime_error = retval; - return retval != -EACCES ? retval : -EIO; -} - -/** * rpm_suspend - Carry out runtime suspend of given device. * @dev: Device to suspend. * @rpmflags: Flag bits.