ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qemu-usb: Handle failing packet allocations gracefully

Browse Source 
* catch failed allocations
* if a packet allocation fails, return NAK USB packet state
* increase packet stream size to 6 MiB

fixes #2527
This commit is contained in:
Sebastian Sumpf 2017-09-25 15:49:32 +02:00 committed by Christian Helmuth
parent b3f620436c
commit 7c269cb933
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/libports/src/lib/qemu-usb/host.cc
View File

@ -159,7 +159,7 @@ struct Usb_host_device : List<Usb_host_device>::Element
unsigned bus, unsigned dev) unsigned bus, unsigned dev)
: :
label(label), _alloc(&alloc), label(label), _alloc(&alloc),
usb_raw(env, &_alloc, label, 1024*1024, state_dispatcher), usb_raw(env, &_alloc, label, 6*1024*1024, state_dispatcher),
bus(bus), dev(dev), sig_rec(sig_rec) bus(bus), dev(dev), sig_rec(sig_rec)
{ {
usb_raw.tx_channel()->sigh_ack_avail(ack_avail_dispatcher); usb_raw.tx_channel()->sigh_ack_avail(ack_avail_dispatcher);
@ -420,6 +420,7 @@ static void usb_host_handle_data(USBDevice *udev, USBPacket *p)
bool const in = p->pid == USB_TOKEN_IN; bool const in = p->pid == USB_TOKEN_IN;
try {
Usb::Packet_descriptor packet = dev->alloc_packet(size); Usb::Packet_descriptor packet = dev->alloc_packet(size);
packet.type = type; packet.type = type;
packet.transfer.ep = p->ep->nr | (in ? USB_DIR_IN : 0); packet.transfer.ep = p->ep->nr | (in ? USB_DIR_IN : 0);
@ -437,6 +438,11 @@ static void usb_host_handle_data(USBDevice *udev, USBPacket *p)
dev->submit(packet); dev->submit(packet);
p->status = USB_RET_ASYNC; p->status = USB_RET_ASYNC;
} catch (...) {
/* submit queue full or packet larger than packet stream */
Genode::warning("xHCI: packet allocation failed (size ", Genode::Hex(size), ")");
p->status = USB_RET_NAK;
}
} }