1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index cd92e1c77cb7..1244930e3d7a 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -348,7 +348,24 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev)
         if (!cb)
                 return -ENOSYS;
 
-        retval = __rpm_callback(cb, dev);
+        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;