From: Hans Verkuil <hverkuil@xs4all.nl>
To: Ming Lei <ming.lei@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, Oliver Neukum <oliver@neukum.org>,
Alan Stern <stern@rowland.harvard.edu>,
linux-input@vger.kernel.org, linux-bluetooth@vger.kernel.org,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-media@vger.kernel.org, alsa-devel@alsa-project.org,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Hans Verkuil <hans.verkuil@cisco.com>
Subject: Re: [PATCH 35/50] media: usb: cx231xx: spin_lock in complete() cleanup
Date: Fri, 26 Jul 2013 16:28:30 +0200 [thread overview]
Message-ID: <51F2878E.90705@xs4all.nl> (raw)
In-Reply-To: <1373533573-12272-36-git-send-email-ming.lei@canonical.com>
On 07/11/2013 11:05 AM, Ming Lei wrote:
> Complete() will be run with interrupt enabled, so change to
> spin_lock_irqsave().
>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Cc: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: linux-media@vger.kernel.org
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> ---
> drivers/media/usb/cx231xx/cx231xx-audio.c | 6 ++++++
> drivers/media/usb/cx231xx/cx231xx-core.c | 10 ++++++----
> drivers/media/usb/cx231xx/cx231xx-vbi.c | 5 +++--
> 3 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
> index 81a1d97..58c1b5c 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-audio.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
> @@ -136,6 +136,7 @@ static void cx231xx_audio_isocirq(struct urb *urb)
> stride = runtime->frame_bits >> 3;
>
> for (i = 0; i < urb->number_of_packets; i++) {
> + unsigned long flags;
> int length = urb->iso_frame_desc[i].actual_length /
> stride;
> cp = (unsigned char *)urb->transfer_buffer +
> @@ -158,6 +159,7 @@ static void cx231xx_audio_isocirq(struct urb *urb)
> length * stride);
> }
>
> + local_irq_save(flags);
> snd_pcm_stream_lock(substream);
Can't you use snd_pcm_stream_lock_irqsave here?
Ditto for the other media drivers where this happens: em28xx and tlg2300.
I've reviewed the media driver changes and they look OK to me, so if
my comment above is fixed, then I can merge them for 3.12. Or are these
changes required for 3.11?
Regards,
Hans
>
> dev->adev.hwptr_done_capture += length;
> @@ -174,6 +176,7 @@ static void cx231xx_audio_isocirq(struct urb *urb)
> period_elapsed = 1;
> }
> snd_pcm_stream_unlock(substream);
> + local_irq_restore(flags);
> }
> if (period_elapsed)
> snd_pcm_period_elapsed(substream);
> @@ -224,6 +227,7 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
> stride = runtime->frame_bits >> 3;
>
> if (1) {
> + unsigned long flags;
> int length = urb->actual_length /
> stride;
> cp = (unsigned char *)urb->transfer_buffer;
> @@ -242,6 +246,7 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
> length * stride);
> }
>
> + local_irq_save(flags);
> snd_pcm_stream_lock(substream);
>
> dev->adev.hwptr_done_capture += length;
> @@ -258,6 +263,7 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
> period_elapsed = 1;
> }
> snd_pcm_stream_unlock(substream);
> + local_irq_restore(flags);
> }
> if (period_elapsed)
> snd_pcm_period_elapsed(substream);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
> index 4ba3ce0..593b397 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-core.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
> @@ -798,6 +798,7 @@ static void cx231xx_isoc_irq_callback(struct urb *urb)
> container_of(dma_q, struct cx231xx_video_mode, vidq);
> struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
> int i;
> + unsigned long flags;
>
> switch (urb->status) {
> case 0: /* success */
> @@ -813,9 +814,9 @@ static void cx231xx_isoc_irq_callback(struct urb *urb)
> }
>
> /* Copy data from URB */
> - spin_lock(&dev->video_mode.slock);
> + spin_lock_irqsave(&dev->video_mode.slock, flags);
> dev->video_mode.isoc_ctl.isoc_copy(dev, urb);
> - spin_unlock(&dev->video_mode.slock);
> + spin_unlock_irqrestore(&dev->video_mode.slock, flags);
>
> /* Reset urb buffers */
> for (i = 0; i < urb->number_of_packets; i++) {
> @@ -842,6 +843,7 @@ static void cx231xx_bulk_irq_callback(struct urb *urb)
> struct cx231xx_video_mode *vmode =
> container_of(dma_q, struct cx231xx_video_mode, vidq);
> struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
> + unsigned long flags;
>
> switch (urb->status) {
> case 0: /* success */
> @@ -857,9 +859,9 @@ static void cx231xx_bulk_irq_callback(struct urb *urb)
> }
>
> /* Copy data from URB */
> - spin_lock(&dev->video_mode.slock);
> + spin_lock_irqsave(&dev->video_mode.slock, flags);
> dev->video_mode.bulk_ctl.bulk_copy(dev, urb);
> - spin_unlock(&dev->video_mode.slock);
> + spin_unlock_irqrestore(&dev->video_mode.slock, flags);
>
> /* Reset urb buffers */
> urb->status = usb_submit_urb(urb, GFP_ATOMIC);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
> index c027942..38e78f8 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
> @@ -306,6 +306,7 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
> struct cx231xx_video_mode *vmode =
> container_of(dma_q, struct cx231xx_video_mode, vidq);
> struct cx231xx *dev = container_of(vmode, struct cx231xx, vbi_mode);
> + unsigned long flags;
>
> switch (urb->status) {
> case 0: /* success */
> @@ -322,9 +323,9 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
> }
>
> /* Copy data from URB */
> - spin_lock(&dev->vbi_mode.slock);
> + spin_lock_irqsave(&dev->vbi_mode.slock, flags);
> dev->vbi_mode.bulk_ctl.bulk_copy(dev, urb);
> - spin_unlock(&dev->vbi_mode.slock);
> + spin_unlock_irqrestore(&dev->vbi_mode.slock, flags);
>
> /* Reset status */
> urb->status = 0;
>
next prev parent reply other threads:[~2013-07-26 14:29 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 9:05 [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Ming Lei
2013-07-11 9:05 ` [PATCH 01/50] USB: devio: spin_lock in complete() cleanup Ming Lei
2013-07-11 9:05 ` [PATCH 02/50] USB: cdc-wdm: " Ming Lei
2013-07-11 9:05 ` [PATCH 03/50] USB: usblp: " Ming Lei
2013-07-11 9:05 ` [PATCH 04/50] USB: adutux: " Ming Lei
2013-07-11 9:05 ` [PATCH 05/50] USB: misc: uss720: " Ming Lei
2013-07-11 12:15 ` Sergei Shtylyov
2013-07-11 9:05 ` [PATCH 06/50] USB: iowarrior: " Ming Lei
2013-07-11 9:05 ` [PATCH 07/50] USB: ldusb: " Ming Lei
2013-07-11 9:05 ` [PATCH 08/50] USB: legousbtower: " Ming Lei
2013-07-11 12:18 ` Sergei Shtylyov
2013-07-11 12:36 ` Oliver Neukum
2013-07-11 13:47 ` Sergei Shtylyov
2013-07-11 12:42 ` Ming Lei
2013-07-11 9:05 ` [PATCH 09/50] USB: usbtest: " Ming Lei
2013-07-11 9:05 ` [PATCH 10/50] USB: serial: cyberjack: " Ming Lei
2013-07-11 9:05 ` [PATCH 11/50] USB: serial: digi_acceleportldusb: " Ming Lei
2013-07-11 9:05 ` [PATCH 12/50] USB: serial: io_edgeport: " Ming Lei
2013-07-11 9:05 ` [PATCH 13/50] USB: serial: io_ti: " Ming Lei
2013-07-11 9:05 ` [PATCH 14/50] USB: serial: mos7720: " Ming Lei
2013-07-11 9:05 ` [PATCH 15/50] USB: serial: mos77840: " Ming Lei
2013-07-11 9:05 ` [PATCH 16/50] USB: serial: quatech2: " Ming Lei
2013-07-11 9:05 ` [PATCH 17/50] USB: serial: sierra: " Ming Lei
2013-07-11 13:02 ` Sergei Shtylyov
2013-07-11 9:05 ` [PATCH 18/50] USB: serial: symbolserial: " Ming Lei
2013-07-11 9:05 ` [PATCH 19/50] USB: serial: ti_usb_3410_5052: " Ming Lei
2013-07-11 9:05 ` [PATCH 20/50] USB: serial: usb_wwan: " Ming Lei
2013-07-11 9:05 ` [PATCH 21/50] hid: usbhid: " Ming Lei
2013-07-11 9:05 ` [PATCH 22/50] BT: btusb: " Ming Lei
2013-07-11 9:05 ` [PATCH 23/50] BT: bfusb: read_lock " Ming Lei
2013-07-11 9:05 ` [PATCH 24/50] input: cm109: spin_lock " Ming Lei
2013-07-11 9:05 ` [PATCH 25/50] ISDN: hfcsusb: " Ming Lei
2013-07-11 9:05 ` [PATCH 26/50] USBNET: cdc-phonet: " Ming Lei
2013-07-11 9:05 ` [PATCH 27/50] USBNET: hso: " Ming Lei
2013-07-11 9:05 ` [PATCH 28/50] USBNET: kaweth: " Ming Lei
2013-07-11 9:05 ` [PATCH 29/50] USBNET: rtl8150: " Ming Lei
2013-07-11 9:05 ` [PATCH 30/50] wireless: ath9k: " Ming Lei
2013-07-11 9:05 ` [PATCH 31/50] wireless: zd1211rw: " Ming Lei
2013-07-11 9:05 ` [PATCH 32/50] wireless: ath: carl9170: " Ming Lei
2013-07-11 9:05 ` [PATCH 33/50] wireless: libertas: " Ming Lei
2013-07-11 9:05 ` [PATCH 34/50] wireless: libertas_tf: " Ming Lei
2013-07-11 9:05 ` [PATCH 35/50] media: usb: cx231xx: " Ming Lei
2013-07-26 14:28 ` Hans Verkuil [this message]
2013-07-27 9:34 ` Ming Lei
2013-07-11 9:05 ` [PATCH 36/50] media: usb: em28xx: " Ming Lei
2013-07-11 12:42 ` Devin Heitmueller
2013-07-11 9:06 ` [PATCH 37/50] media: usb: sn9x102: " Ming Lei
2013-07-11 9:06 ` [PATCH 38/50] media: usb: tlg2300: " Ming Lei
2013-07-11 9:06 ` [PATCH 39/50] media: usb: tm6000: " Ming Lei
2013-07-11 9:06 ` [PATCH 40/50] media: dvb-core: " Ming Lei
2013-07-11 9:06 ` [PATCH 41/50] media: usb: em28xx: make sure irq disabled before acquiring lock Ming Lei
2013-07-11 9:06 ` [PATCH 42/50] media: usb: tlg2300: spin_lock in complete() cleanup Ming Lei
2013-07-11 13:13 ` Sergei Shtylyov
2013-07-11 9:06 ` [PATCH 43/50] sound: usb: midi: " Ming Lei
2013-07-11 9:06 ` [PATCH 44/50] sound: usb: caiaq: " Ming Lei
2013-07-11 13:12 ` Sergei Shtylyov
2013-07-11 14:06 ` Daniel Mack
2013-07-11 9:06 ` [PATCH 45/50] sound: usb: usx2y: " Ming Lei
2013-07-11 13:08 ` Sergei Shtylyov
2013-07-11 13:50 ` Takashi Iwai
2013-07-11 14:13 ` Ming Lei
2013-07-11 14:34 ` Takashi Iwai
2013-07-11 14:52 ` Ming Lei
2013-07-11 9:06 ` [PATCH 46/50] Sound: usb: ua101: " Ming Lei
2013-07-11 13:10 ` Sergei Shtylyov
2013-07-11 9:06 ` [PATCH 47/50] staging: btmtk_usb: " Ming Lei
2013-07-11 9:06 ` [PATCH 48/50] staging: bcm: " Ming Lei
2013-07-11 9:06 ` [PATCH 49/50] staging: ced1401: " Ming Lei
2013-07-11 9:06 ` [PATCH 50/50] staging: vt6656: " Ming Lei
2013-07-14 13:17 ` [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Andy Walls
2013-07-14 14:33 ` Ming Lei
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=51F2878E.90705@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@linuxfoundation.org \
--cc=hans.verkuil@cisco.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=ming.lei@canonical.com \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=stern@rowland.harvard.edu \
/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).