mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: "Frank Schäfer" <fschaefer.oss@googlemail.com>,
	"Mauro Carvalho Chehab" <m.chehab@samsung.com>,
	"Kamal Mostafa" <kamal@canonical.com>
Subject: [PATCH 3.13 004/105] [media] em28xx-v4l: give back all active video buffers to the vb2 core properly on streaming stop
Date: Mon, 27 Oct 2014 11:55:39 -0700	[thread overview]
Message-ID: <1414436240-13879-5-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1414436240-13879-1-git-send-email-kamal@canonical.com>

3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Frank Schaefer <fschaefer.oss@googlemail.com>

commit 627530c32a43283474e9dd3e954519410ffa033a upstream.

When a new video frame is started, the driver takes the next video buffer from
the list of active buffers and moves it to dev->usb_ctl.vid_buf / dev->usb_ctl.vbi_buf
for further processing.

On streaming stop we currently only give back the pending buffers from the list
but not the ones which are currently processed.

This causes the following warning from the vb2 core since kernel 3.15:

...
 ------------[ cut here ]------------
 WARNING: CPU: 1 PID: 2284 at drivers/media/v4l2-core/videobuf2-core.c:2115 __vb2_queue_cancel+0xed/0x150 [videobuf2_core]()
 [...]
 Call Trace:
  [<c0769c46>] dump_stack+0x48/0x69
  [<c0245b69>] warn_slowpath_common+0x79/0x90
  [<f925e4ad>] ? __vb2_queue_cancel+0xed/0x150 [videobuf2_core]
  [<f925e4ad>] ? __vb2_queue_cancel+0xed/0x150 [videobuf2_core]
  [<c0245bfd>] warn_slowpath_null+0x1d/0x20
  [<f925e4ad>] __vb2_queue_cancel+0xed/0x150 [videobuf2_core]
  [<f925fa35>] vb2_internal_streamoff+0x35/0x90 [videobuf2_core]
  [<f925fac5>] vb2_streamoff+0x35/0x60 [videobuf2_core]
  [<f925fb27>] vb2_ioctl_streamoff+0x37/0x40 [videobuf2_core]
  [<f8e45895>] v4l_streamoff+0x15/0x20 [videodev]
  [<f8e4925d>] __video_do_ioctl+0x23d/0x2d0 [videodev]
  [<f8e49020>] ? video_ioctl2+0x20/0x20 [videodev]
  [<f8e48c63>] video_usercopy+0x203/0x5a0 [videodev]
  [<f8e49020>] ? video_ioctl2+0x20/0x20 [videodev]
  [<c039d0e7>] ? fsnotify+0x1e7/0x2b0
  [<f8e49012>] video_ioctl2+0x12/0x20 [videodev]
  [<f8e49020>] ? video_ioctl2+0x20/0x20 [videodev]
  [<f8e4461e>] v4l2_ioctl+0xee/0x130 [videodev]
  [<f8e44530>] ? v4l2_open+0xf0/0xf0 [videodev]
  [<c0378de2>] do_vfs_ioctl+0x2e2/0x4d0
  [<c0368eec>] ? vfs_write+0x13c/0x1c0
  [<c0369a8f>] ? vfs_writev+0x2f/0x50
  [<c0379028>] SyS_ioctl+0x58/0x80
  [<c076fff3>] sysenter_do_call+0x12/0x12
 ---[ end trace 5545f934409f13f4 ]---
...

Many thanks to Hans Verkuil, whose recently added check in the vb2 core unveiled
this long standing issue and who has investigated it further.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/media/usb/em28xx/em28xx-video.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index dd19c9f..f435c75 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -696,13 +696,16 @@ static int em28xx_stop_streaming(struct vb2_queue *vq)
 	}
 
 	spin_lock_irqsave(&dev->slock, flags);
+	if (dev->usb_ctl.vid_buf != NULL) {
+		vb2_buffer_done(&dev->usb_ctl.vid_buf->vb, VB2_BUF_STATE_ERROR);
+		dev->usb_ctl.vid_buf = NULL;
+	}
 	while (!list_empty(&vidq->active)) {
 		struct em28xx_buffer *buf;
 		buf = list_entry(vidq->active.next, struct em28xx_buffer, list);
 		list_del(&buf->list);
 		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
 	}
-	dev->usb_ctl.vid_buf = NULL;
 	spin_unlock_irqrestore(&dev->slock, flags);
 
 	return 0;
@@ -724,13 +727,16 @@ int em28xx_stop_vbi_streaming(struct vb2_queue *vq)
 	}
 
 	spin_lock_irqsave(&dev->slock, flags);
+	if (dev->usb_ctl.vbi_buf != NULL) {
+		vb2_buffer_done(&dev->usb_ctl.vbi_buf->vb, VB2_BUF_STATE_ERROR);
+		dev->usb_ctl.vbi_buf = NULL;
+	}
 	while (!list_empty(&vbiq->active)) {
 		struct em28xx_buffer *buf;
 		buf = list_entry(vbiq->active.next, struct em28xx_buffer, list);
 		list_del(&buf->list);
 		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
 	}
-	dev->usb_ctl.vbi_buf = NULL;
 	spin_unlock_irqrestore(&dev->slock, flags);
 
 	return 0;
-- 
1.9.1


  parent reply	other threads:[~2014-10-27 19:27 UTC|newest]

Thread overview: 110+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27 18:55 [3.13.y.z extended stable] Linux 3.13.11.10 stable review Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 001/105] Bluetooth: Fix HCI H5 corrupted ack value Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 002/105] dmaengine: fix xor sources continuation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 003/105] [media] siano: add support for PCTV 77e Kamal Mostafa
2014-10-27 18:55 ` Kamal Mostafa [this message]
2014-10-27 18:55 ` [PATCH 3.13 005/105] [media] em28xx-v4l: fix video buffer field order reporting in progressive mode Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 006/105] crypto: caam - fix addressing of struct member Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 007/105] x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 008/105] x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 009/105] KVM: do not bias the generation number in kvm_current_mmio_generation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 010/105] kvm: fix potentially corrupt mmio cache Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 011/105] kvm: x86: fix stale mmio cache bug Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 012/105] UBIFS: fix free log space calculation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 013/105] Bluetooth: Fix issue with USB suspend in btusb driver Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 014/105] mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 015/105] KVM: s390: unintended fallthrough for external call Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 016/105] UBI: add missing kmem_cache_free() in process_pool_aeb error path Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 017/105] PCI: Increase IBM ipr SAS Crocodile BARs to at least system page size Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 018/105] drbd: compute the end before rb_insert_augmented() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 019/105] Bluetooth: Fix setting correct security level when initiating SMP Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 020/105] mmc: tmio: prevent endless loop in tmio_mmc_set_clock() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 021/105] iwlwifi: Add missing PCI IDs for the 7260 series Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 022/105] [media] media: usb: uvc: add a quirk for Dell XPS M1330 webcam Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 023/105] Revert "percpu: free percpu allocation info for uniprocessor system" Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 024/105] USB: serial: cp210x: added Ketra N1 wireless interface support Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 025/105] USB: cp210x: add support for Seluxit USB dongle Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 026/105] PCI: Generate uppercase hex for modalias interface class Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 027/105] PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 028/105] xfs: ensure WB_SYNC_ALL writeback handles partial pages correctly Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 029/105] [media] v4l2-common: fix overflow in v4l_bound_align_image() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 030/105] USB: Add device quirk for ASUS T100 Base Station keyboard Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 031/105] mei: bus: fix possible boundaries violation Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 032/105] firmware_class: make sure fw requests contain a name Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 033/105] Drivers: hv: vmbus: Cleanup vmbus_post_msg() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 034/105] Drivers: hv: vmbus: Cleanup vmbus_teardown_gpadl() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 035/105] Drivers: hv: vmbus: Cleanup vmbus_establish_gpadl() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 036/105] Drivers: hv: vmbus: Fix a bug in vmbus_open() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 037/105] Drivers: hv: vmbus: Cleanup vmbus_close_internal() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 038/105] Drivers: hv: vmbus: Cleanup hv_post_message() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 039/105] spi: dw-mid: respect 8 bit mode Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 040/105] spi: dw-mid: terminate ongoing transfers at exit Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 041/105] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 042/105] x86/intel/quark: Switch off CR4.PGE so TLB flush uses CR3 instead Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 043/105] ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 044/105] ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 045/105] nfs: fix duplicate proc entries Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 046/105] Fixing lease renewal Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 047/105] lockd: Try to reconnect if statd has moved Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 048/105] mptfusion: enable no_write_same for vmware scsi disks Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 049/105] qla2xxx: Use correct offset to req-q-out for reserve calculation Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 050/105] mfd: rtsx_pcr: Fix MSI enable error handling Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 051/105] power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 052/105] rt2800: correct BBP1_TX_POWER_CTRL mask Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 053/105] regmap: fix NULL pointer dereference in _regmap_write/read Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 054/105] Documentation: lzo: document part of the encoding Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 055/105] Revert "lzo: properly check for overruns" Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 056/105] lzo: check for length overrun in variable length encoding Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 057/105] regmap: debugfs: fix possbile NULL pointer dereference Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 058/105] regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 059/105] net_dma: simple removal Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 060/105] libata-sff: Fix controllers with no ctl port Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 061/105] NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 062/105] NFSv4: fix open/lock state recovery error handling Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 063/105] tty: omap-serial: fix division by zero Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 064/105] serial: 8250: Add Quark X1000 to 8250_pci.c Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 065/105] missing data dependency barrier in prepend_name() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 066/105] be2iscsi: check ip buffer before copying Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 067/105] framebuffer: fix border color Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 068/105] framebuffer: fix screen corruption when copying Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 069/105] mpc85xx_edac: Make L2 interrupt shared too Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 070/105] NFSv4.1: Fix an NFSv4.1 state renewal regression Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 071/105] xen-blkback: fix leak on grant map error path Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 072/105] m68k: Disable/restore interrupts in hwreg_present()/hwreg_write() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 073/105] ASoC: tlv320aic3x: fix PLL D configuration Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 074/105] dm bufio: update last_accessed when relinking a buffer Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 075/105] dm bufio: when done scanning return from __scan immediately Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 076/105] dm log userspace: fix memory leak in dm_ulog_tfr_init failure path Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 077/105] ecryptfs: avoid to access NULL pointer when write metadata in xattr Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 078/105] x86_64, entry: Filter RFLAGS.NT on entry from userspace Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 079/105] ASoC: soc-dapm: fix use after free Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 080/105] pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 081/105] drm/ast: Fix HW cursor image Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 082/105] x86: Reject x32 executables if x32 ABI not supported Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 083/105] [jffs2] kill wbuf_queued/wbuf_dwork_lock Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 084/105] fs: Fix theoretical division by 0 in super_cache_scan() Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 085/105] fs: make cont_expand_zero interruptible Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 086/105] fix misuses of f_count() in ppp and netlink Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 087/105] block: fix alignment_offset math that assumes io_min is a power-of-2 Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 088/105] fanotify: enable close-on-exec on events' fd when requested in fanotify_init() Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 089/105] mm: clear __GFP_FS when PF_MEMALLOC_NOIO is set Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 090/105] Input: synaptics - gate forcepad support by DMI check Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 091/105] Input: i8042 - add noloop quirk for Asus X750LN Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 092/105] um: ubd: Fix for processes stuck in D state forever Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 093/105] kernel: add support for gcc 5 Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 094/105] ALSA: emu10k1: Fix deadlock in synth voice lookup Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 095/105] libceph: ceph-msgr workqueue needs a resque worker Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 096/105] mnt: Prevent pivot_root from creating a loop in the mount tree Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 097/105] modules, lock around setting of MODULE_STATE_UNFORMED Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 098/105] virtio_pci: fix virtio spec compliance on restore Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 099/105] dmaengine: pl330: Fix NULL pointer dereference on probe failure Kamal Mostafa
2014-10-28  7:58   ` Krzysztof Kozlowski
2014-10-28 17:10     ` Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 100/105] dmaengine: pl330: Fix NULL pointer dereference on driver unbind Kamal Mostafa
2014-10-28  7:58   ` Krzysztof Kozlowski
2014-10-28 17:10     ` Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 101/105] selinux: fix inode security list corruption Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 102/105] pstore: Fix duplicate {console,ftrace}-efi entries Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 103/105] futex: Ensure get_futex_key_refs() always implies a barrier Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 104/105] x86,kvm,vmx: Preserve CR4 across VM entry Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 105/105] crypto: caam - remove duplicated sg copy functions Kamal Mostafa

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=1414436240-13879-5-git-send-email-kamal@canonical.com \
    --to=kamal@canonical.com \
    --cc=fschaefer.oss@googlemail.com \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=stable@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

all inboxes | Powered by JetHome®