mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: improve packet state sanity checks

Browse Source 
Add a new function to check whenever the packet state is as expected,
log more informations in case it isn't.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-03-08 12:27:47 +01:00
parent 86e18cae20
commit 5ac2731cf8
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/usb.h
View File

@ -336,6 +336,7 @@ struct USBPacket {
void usb_packet_init(USBPacket *p); void usb_packet_init(USBPacket *p);
void usb_packet_set_state(USBPacket *p, USBPacketState state); void usb_packet_set_state(USBPacket *p, USBPacketState state);
void usb_packet_check_state(USBPacket *p, USBPacketState expected);
void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep); void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep);
void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len); void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len);
int usb_packet_map(USBPacket *p, QEMUSGList *sgl); int usb_packet_map(USBPacket *p, QEMUSGList *sgl);

37
hw/usb/core.c
View File

@ -378,7 +378,7 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
} }
assert(dev == p->ep->dev); assert(dev == p->ep->dev);
assert(dev->state == USB_STATE_DEFAULT); assert(dev->state == USB_STATE_DEFAULT);
assert(p->state == USB_PACKET_SETUP); usb_packet_check_state(p, USB_PACKET_SETUP);
assert(p->ep != NULL); assert(p->ep != NULL);
if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) { if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) {
@ -406,7 +406,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
USBEndpoint *ep = p->ep; USBEndpoint *ep = p->ep;
int ret; int ret;
assert(p->state == USB_PACKET_ASYNC); usb_packet_check_state(p, USB_PACKET_ASYNC);
assert(QTAILQ_FIRST(&ep->queue) == p); assert(QTAILQ_FIRST(&ep->queue) == p);
usb_packet_set_state(p, USB_PACKET_COMPLETE); usb_packet_set_state(p, USB_PACKET_COMPLETE);
QTAILQ_REMOVE(&ep->queue, p, queue); QTAILQ_REMOVE(&ep->queue, p, queue);
@ -417,7 +417,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
if (p->state == USB_PACKET_ASYNC) { if (p->state == USB_PACKET_ASYNC) {
break; break;
} }
assert(p->state == USB_PACKET_QUEUED); usb_packet_check_state(p, USB_PACKET_QUEUED);
ret = usb_process_one(p); ret = usb_process_one(p);
if (ret == USB_RET_ASYNC) { if (ret == USB_RET_ASYNC) {
usb_packet_set_state(p, USB_PACKET_ASYNC); usb_packet_set_state(p, USB_PACKET_ASYNC);
@ -450,7 +450,7 @@ void usb_packet_init(USBPacket *p)
qemu_iovec_init(&p->iov, 1); qemu_iovec_init(&p->iov, 1);
} }
void usb_packet_set_state(USBPacket *p, USBPacketState state) static const char *usb_packet_state_name(USBPacketState state)
{ {
static const char *name[] = { static const char *name[] = {
[USB_PACKET_UNDEFINED] = "undef", [USB_PACKET_UNDEFINED] = "undef",
@ -460,11 +460,36 @@ void usb_packet_set_state(USBPacket *p, USBPacketState state)
[USB_PACKET_COMPLETE] = "complete", [USB_PACKET_COMPLETE] = "complete",
[USB_PACKET_CANCELED] = "canceled", [USB_PACKET_CANCELED] = "canceled",
}; };
if (state < ARRAY_SIZE(name)) {
return name[state];
}
return "INVALID";
}
void usb_packet_check_state(USBPacket *p, USBPacketState expected)
{
USBDevice *dev;
USBBus *bus;
if (p->state == expected) {
return;
}
dev = p->ep->dev;
bus = usb_bus_from_device(dev);
trace_usb_packet_state_fault(bus->busnr, dev->port->path, p->ep->nr, p,
usb_packet_state_name(p->state),
usb_packet_state_name(expected));
assert(!"usb packet state check failed");
}
void usb_packet_set_state(USBPacket *p, USBPacketState state)
{
USBDevice *dev = p->ep->dev; USBDevice *dev = p->ep->dev;
USBBus *bus = usb_bus_from_device(dev); USBBus *bus = usb_bus_from_device(dev);
trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p,
p, name[p->state], name[state]); usb_packet_state_name(p->state),
usb_packet_state_name(state));
p->state = state; p->state = state;
} }

1
trace-events
View File

@ -229,6 +229,7 @@ sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64
# hw/usb/core.c # hw/usb/core.c
usb_packet_state_change(int bus, const char *port, int ep, void *p, const char *o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s -> %s" usb_packet_state_change(int bus, const char *port, int ep, void *p, const char *o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s -> %s"
usb_packet_state_fault(int bus, const char *port, int ep, void *p, const char *o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s, expected %s"
# hw/usb/bus.c # hw/usb/bus.c
usb_port_claim(int bus, const char *port) "bus %d, port %s" usb_port_claim(int bus, const char *port) "bus %d, port %s"