Commit 5ac2731c authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb: improve packet state sanity checks 



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

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 86e18cae

hw/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ struct USBPacket { 


void usb_packet_init(USBPacket *p);

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_addbuf(USBPacket *p, void *ptr, size_t len);

int usb_packet_map(USBPacket *p, QEMUSGList *sgl);

hw/usb/core.c

+31 −6
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p) 
    }

    assert(dev == p->ep->dev);

    assert(dev->state == USB_STATE_DEFAULT);

    assert(p->state == USB_PACKET_SETUP);

    usb_packet_check_state(p, USB_PACKET_SETUP);

    assert(p->ep != NULL);



    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;

    int ret;



    assert(p->state == USB_PACKET_ASYNC);

    usb_packet_check_state(p, USB_PACKET_ASYNC);

    assert(QTAILQ_FIRST(&ep->queue) == p);

    usb_packet_set_state(p, USB_PACKET_COMPLETE);

    QTAILQ_REMOVE(&ep->queue, p, queue);
@@ -417,7 +417,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p) 
        if (p->state == USB_PACKET_ASYNC) {

            break;

        }

        assert(p->state == USB_PACKET_QUEUED);

        usb_packet_check_state(p, USB_PACKET_QUEUED);

        ret = usb_process_one(p);

        if (ret == USB_RET_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);

}



void usb_packet_set_state(USBPacket *p, USBPacketState state)

static const char *usb_packet_state_name(USBPacketState state)

{

    static const char *name[] = {

        [USB_PACKET_UNDEFINED] = "undef",
@@ -460,11 +460,36 @@ void usb_packet_set_state(USBPacket *p, USBPacketState state) 
        [USB_PACKET_COMPLETE]  = "complete",

        [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;

    USBBus *bus = usb_bus_from_device(dev);



    trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr,

                                  p, name[p->state], name[state]);

    trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p,

                                  usb_packet_state_name(p->state),

                                  usb_packet_state_name(state));

    p->state = state;

}

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64 


# 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_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

usb_port_claim(int bus, const char *port) "bus %d, port %s"