Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vhci: fix crash on USB device configuration change #11

Open
wants to merge 1 commit into
base: aur
Choose a base branch
from
Open

vhci: fix crash on USB device configuration change #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 18 additions & 56 deletions vhci/transfer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,79 +395,41 @@ static void bce_vhci_urb_complete(struct bce_vhci_urb *urb, int status)
list_add_tail(&real_urb->urb_list, &q->giveback_urb_list);
}

static int bce_vhci_urb_dequeue_unlink(struct bce_vhci_transfer_queue *q, struct urb *urb, int status)
{
struct bce_vhci_urb *vurb;
int ret = 0;
if ((ret = usb_hcd_check_unlink_urb(q->vhci->hcd, urb, status)))
return ret;
usb_hcd_unlink_urb_from_ep(q->vhci->hcd, urb);

vurb = urb->hcpriv;
if (vurb->state != BCE_VHCI_URB_INIT_PENDING)
++q->remaining_active_requests;
return ret;
}

static int bce_vhci_urb_remove(struct bce_vhci_transfer_queue *q, struct urb *urb, int status)
{
unsigned long flags;
int ret;
struct bce_vhci_urb *vurb;
spin_lock_irqsave(&q->urb_lock, flags);
ret = bce_vhci_urb_dequeue_unlink(q, urb, status);
spin_unlock_irqrestore(&q->urb_lock, flags);
if (ret)
return ret;
vurb = urb->hcpriv;
kfree(vurb);
usb_hcd_giveback_urb(q->vhci->hcd, urb, status);
return 0;
}

static void bce_vhci_urb_cancel_w(struct work_struct *ws)
{
struct bce_vhci_transfer_queue_urb_cancel_work *w =
container_of(ws, struct bce_vhci_transfer_queue_urb_cancel_work, ws);

pr_debug("bce-vhci: [%02x] Cancelling URB\n", w->q->endp_addr);
bce_vhci_transfer_queue_pause(w->q, BCE_VHCI_PAUSE_INTERNAL_WQ);
bce_vhci_urb_remove(w->q, w->urb, w->status);
bce_vhci_transfer_queue_resume(w->q, BCE_VHCI_PAUSE_INTERNAL_WQ);
kfree(w);
}

int bce_vhci_urb_request_cancel(struct bce_vhci_transfer_queue *q, struct urb *urb, int status)
{
struct bce_vhci_transfer_queue_urb_cancel_work *w;
struct bce_vhci_urb *vurb;
unsigned long flags;
int ret;

/* Quick check to try to avoid pausing; must past 0 as status we won't be able to call it again. */
spin_lock_irqsave(&q->urb_lock, flags);
if ((ret = usb_hcd_check_unlink_urb(q->vhci->hcd, urb, 0))) {
if ((ret = usb_hcd_check_unlink_urb(q->vhci->hcd, urb, status))) {
spin_unlock_irqrestore(&q->urb_lock, flags);
return ret;
}

vurb = urb->hcpriv;
/* If the URB wasn't posted to the device yet, we can still remove it on the host without pausing the queue. */
if (vurb->state == BCE_VHCI_URB_INIT_PENDING) {
bce_vhci_urb_dequeue_unlink(q, urb, status);
if (vurb->state != BCE_VHCI_URB_INIT_PENDING) {
pr_debug("bce-vhci: [%02x] Cancelling URB\n", q->endp_addr);

spin_unlock_irqrestore(&q->urb_lock, flags);
kfree(vurb);
usb_hcd_giveback_urb(q->vhci->hcd, urb, status);
return 0;
bce_vhci_transfer_queue_pause(q, BCE_VHCI_PAUSE_INTERNAL_WQ);
spin_lock_irqsave(&q->urb_lock, flags);

++q->remaining_active_requests;
}

usb_hcd_unlink_urb_from_ep(q->vhci->hcd, urb);

spin_unlock_irqrestore(&q->urb_lock, flags);

w = kzalloc(sizeof(struct bce_vhci_transfer_queue_urb_cancel_work), GFP_KERNEL);
INIT_WORK(&w->ws, bce_vhci_urb_cancel_w);
w->q = q;
w->urb = urb;
w->status = status;
queue_work(q->vhci->tq_state_wq, &w->ws);
usb_hcd_giveback_urb(q->vhci->hcd, urb, status);

if (vurb->state != BCE_VHCI_URB_INIT_PENDING)
bce_vhci_transfer_queue_resume(q, BCE_VHCI_PAUSE_INTERNAL_WQ);

kfree(vurb);

return 0;
}

Expand Down
7 changes: 0 additions & 7 deletions vhci/transfer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ struct bce_vhci_urb {
u32 receive_offset;
};

struct bce_vhci_transfer_queue_urb_cancel_work {
struct work_struct ws;
struct bce_vhci_transfer_queue *q;
struct urb *urb;
int status;
};

void bce_vhci_create_transfer_queue(struct bce_vhci *vhci, struct bce_vhci_transfer_queue *q,
struct usb_host_endpoint *endp, bce_vhci_device_t dev_addr, enum dma_data_direction dir);
void bce_vhci_destroy_transfer_queue(struct bce_vhci *vhci, struct bce_vhci_transfer_queue *q);
Expand Down