lkml.org 
[lkml]   [2012]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 6/6] USB: forbid memory allocation with I/O during bus reset
Date
If one storage interface or usb network interface(iSCSI case)
exists in current configuration, memory allocation with
GFP_KERNEL during usb_device_reset() might trigger I/O transfer
on the storage interface itself and cause deadlock because
the 'us->dev_mutex' is held in .pre_reset() and the storage
interface can't do I/O transfer when the reset is triggered
by other interface, or the error handling can't be completed
if the reset is triggered by the storage itself(error handling path).

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
v3:
- check usbnet device or usb mass storage device by
'dev->power.memalloc_noio_resume' as suggested by Alan Stern
---
drivers/usb/core/hub.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5b131b6..5aea807 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5044,6 +5044,8 @@ int usb_reset_device(struct usb_device *udev)
{
int ret;
int i;
+ unsigned int uninitialized_var(noio_flag);
+ bool noio_set = false;
struct usb_host_config *config = udev->actconfig;

if (udev->state == USB_STATE_NOTATTACHED ||
@@ -5053,6 +5055,17 @@ int usb_reset_device(struct usb_device *udev)
return -EINVAL;
}

+ /*
+ * Don't allocate memory with GFP_KERNEL in current
+ * context to avoid possible deadlock if usb mass
+ * storage interface or usbnet interface(iSCSI case)
+ * is included in current configuration.
+ */
+ if (pm_runtime_get_memalloc_noio(&udev->dev)) {
+ memalloc_noio_save(noio_flag);
+ noio_set = true;
+ }
+
/* Prevent autosuspend during the reset */
usb_autoresume_device(udev);

@@ -5097,6 +5110,8 @@ int usb_reset_device(struct usb_device *udev)
}

usb_autosuspend_device(udev);
+ if (noio_set)
+ memalloc_noio_restore(noio_flag);
return ret;
}
EXPORT_SYMBOL_GPL(usb_reset_device);
--
1.7.9.5


\
 
 \ /
  Last update: 2012-10-29 14:01    [W:0.266 / U:0.688 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site