2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 96b14d0db19b2b80ab3dc35d522671da82101e72 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 27 Aug 2013 15:25:24 +0200
|
|
Subject: [PATCH] usb: parallelize usb3 streams
|
|
|
|
usb3 bulk endpoints with streams are implicitly pipelined now,
|
|
so the requests will actually be processed in parallel. Also
|
|
allow them to complete out-of-order.
|
|
|
|
Fixes stalls in the uas driver.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit c96c41ed0d38d68a6c8b6f84751afebafeae31be)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/usb/core.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/usb/core.c b/hw/usb/core.c
|
|
index 05948ca..31960c2 100644
|
|
--- a/hw/usb/core.c
|
|
+++ b/hw/usb/core.c
|
|
@@ -403,7 +403,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
|
|
p->ep->halted = false;
|
|
}
|
|
|
|
- if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) {
|
|
+ if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline || p->stream) {
|
|
usb_process_one(p);
|
|
if (p->status == USB_RET_ASYNC) {
|
|
/* hcd drivers cannot handle async for isoc */
|
|
@@ -420,7 +420,8 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p)
|
|
* When pipelining is enabled usb-devices must always return async,
|
|
* otherwise packets can complete out of order!
|
|
*/
|
|
- assert(!p->ep->pipeline || QTAILQ_EMPTY(&p->ep->queue));
|
|
+ assert(p->stream || !p->ep->pipeline ||
|
|
+ QTAILQ_EMPTY(&p->ep->queue));
|
|
if (p->status != USB_RET_NAK) {
|
|
usb_packet_set_state(p, USB_PACKET_COMPLETE);
|
|
}
|
|
@@ -434,7 +435,7 @@ void usb_packet_complete_one(USBDevice *dev, USBPacket *p)
|
|
{
|
|
USBEndpoint *ep = p->ep;
|
|
|
|
- assert(QTAILQ_FIRST(&ep->queue) == p);
|
|
+ assert(p->stream || QTAILQ_FIRST(&ep->queue) == p);
|
|
assert(p->status != USB_RET_ASYNC && p->status != USB_RET_NAK);
|
|
|
|
if (p->status != USB_RET_SUCCESS ||
|