From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org
Cc: Hans Verkuil <hans.verkuil@cisco.com>,
kernel@collabora.com, ccr@tnsp.org
Subject: Re: [PATCH v2] gspca: Kill URBs on USB device disconnect
Date: Sun, 24 Mar 2019 13:56:32 -0300 [thread overview]
Message-ID: <81627ad40d3e7ee9e8f6bb037e572111d784fc31.camel@collabora.com> (raw)
In-Reply-To: <20190228152834.14308-1-ezequiel@collabora.com>
On Thu, 2019-02-28 at 12:28 -0300, Ezequiel Garcia wrote:
> In order to prevent ISOC URBs from being infinitely resubmitted,
> the driver's USB disconnect handler must kill all the in-flight URBs.
>
> While here, change the URB packet status message to a debug level,
> to avoid spamming the console too much.
>
> This commit fixes a lockup caused by an interrupt storm coming
> from the URB completion handler.
>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
> v2:
> * Also kill the int URB.
>
Hans,
We still have to solve another race in this driver,
but I think this fix is good to go.
Thanks,
Eze
> drivers/media/usb/gspca/gspca.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
> index 9448ac0b8bc9..4d7517411cc2 100644
> --- a/drivers/media/usb/gspca/gspca.c
> +++ b/drivers/media/usb/gspca/gspca.c
> @@ -294,7 +294,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
> /* check the packet status and length */
> st = urb->iso_frame_desc[i].status;
> if (st) {
> - pr_err("ISOC data error: [%d] len=%d, status=%d\n",
> + gspca_dbg(gspca_dev, D_PACK, "ISOC data error: [%d] len=%d, status=%d\n",
> i, len, st);
> gspca_dev->last_packet_type = DISCARD_PACKET;
> continue;
> @@ -1642,6 +1642,8 @@ void gspca_disconnect(struct usb_interface *intf)
>
> mutex_lock(&gspca_dev->usb_lock);
> gspca_dev->present = false;
> + destroy_urbs(gspca_dev);
> + gspca_input_destroy_urb(gspca_dev);
>
> vb2_queue_error(&gspca_dev->queue);
>
prev parent reply other threads:[~2019-03-24 16:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 16:56 [PATCH] gspca: Kill URBs on USB device disconnect Ezequiel Garcia
2019-02-28 15:28 ` [PATCH v2] " Ezequiel Garcia
2019-03-24 16:56 ` Ezequiel Garcia [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81627ad40d3e7ee9e8f6bb037e572111d784fc31.camel@collabora.com \
--to=ezequiel@collabora.com \
--cc=ccr@tnsp.org \
--cc=hans.verkuil@cisco.com \
--cc=kernel@collabora.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).