* [PATCH 2/4] [media] solo6x10: free DMA allocation when releasing encoder
2014-10-29 16:03 [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Andrey Utkin
@ 2014-10-29 16:03 ` Andrey Utkin
2014-10-29 16:03 ` [PATCH 3/4] [media] solo6x10: bind start & stop of encoded frames processing thread to device (de)init Andrey Utkin
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Andrey Utkin @ 2014-10-29 16:03 UTC (permalink / raw)
To: linux-kernel, linux-media, devel
Cc: ismael.luceno, m.chehab, hverkuil, Andrey Utkin
Fixes this warning:
[ 956.730136] ------------[ cut here ]------------
[ 956.730143] WARNING: CPU: 1 PID: 10134 at lib/dma-debug.c:963 dma_debug_device_change+0x191/0x1f0()
[ 956.730146] pci 0000:07:05.0: DMA-API: device driver has pending DMA allocations while released from device [count=8]
One of leaked entries details: [device address=0x00000000d3d57000] [size=512 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]
[ 956.730147] Modules linked in: solo6x10(-) videobuf2_dma_contig videobuf2_dma_sg videobuf2_memops videobuf2_core ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat videobuf_vmalloc videobuf_core v4l2_common videodev rt2800usb rt2800lib rt2x00usb rt2x00lib mac80211 cfg80211 crc_ccitt usbkbd hid_a4tech hid_generic usbhid snd_hda_codec_hdmi snd_hda_codec_via snd_hda_codec_generic snd_hda_intel snd_hda_controller snd_hda_codec snd_hwdep snd_pcm x86_pkg_temp_thermal snd_timer snd soundcore
[ 956.730172] CPU: 1 PID: 10134 Comm: rmmod Not tainted 3.18.0-rc1-next-20141023-zver-dirty #24
[ 956.730173] Hardware name: System manufacturer System Product Name/P8H77-V, BIOS 0501 02/28/2012
[ 956.730175] 0000000000000009 ffff8801df9e3c58 ffffffff817ffe6b 0000000000000001
[ 956.730177] ffff8801df9e3ca8 ffff8801df9e3c98 ffffffff81091ec7 0000000000000046
[ 956.730180] ffff880215457e90 0000000000000008 ffffffff81cbb10f ffff880215570098
[ 956.730183] Call Trace:
[ 956.730188] [<ffffffff817ffe6b>] dump_stack+0x4f/0x7c
[ 956.730192] [<ffffffff81091ec7>] warn_slowpath_common+0x87/0xb0
[ 956.730194] [<ffffffff81091f91>] warn_slowpath_fmt+0x41/0x50
[ 956.730197] [<ffffffff81412558>] ? dma_debug_device_change+0xb8/0x1f0
[ 956.730199] [<ffffffff81412631>] dma_debug_device_change+0x191/0x1f0
[ 956.730203] [<ffffffff810b14ad>] notifier_call_chain+0x4d/0x70
[ 956.730205] [<ffffffff810b15f9>] __blocking_notifier_call_chain+0x59/0x80
[ 956.730207] [<ffffffff810b1631>] blocking_notifier_call_chain+0x11/0x20
[ 956.730211] [<ffffffff815873af>] __device_release_driver+0xcf/0xf0
[ 956.730213] [<ffffffff81587ee8>] driver_detach+0xc8/0xd0
[ 956.730215] [<ffffffff81587147>] bus_remove_driver+0x57/0xd0
[ 956.730218] [<ffffffff815887e9>] driver_unregister+0x29/0x60
[ 956.730221] [<ffffffff81420131>] pci_unregister_driver+0x21/0x90
[ 956.730225] [<ffffffffa03219d7>] solo_pci_driver_exit+0x10/0x12 [solo6x10]
[ 956.730228] [<ffffffff81112ee0>] SyS_delete_module+0x170/0x1f0
[ 956.730232] [<ffffffff813eb76e>] ? trace_hardirqs_on_thunk+0x3a/0x3f
[ 956.730234] [<ffffffff8180abd2>] system_call_fastpath+0x12/0x17
[ 956.730235] ---[ end trace e730af02713a6c53 ]---
[ 956.730237] Mapped at:
[ 956.730238] [<ffffffff8141186c>] debug_dma_alloc_coherent+0x3c/0xb0
[ 956.730240] [<ffffffffa03203f6>] solo_enc_v4l2_init+0x706/0xba0 [solo6x10]
[ 956.730243] [<ffffffffa03165b3>] solo_pci_probe+0x503/0x700 [solo6x10]
[ 956.730245] [<ffffffff81420459>] local_pci_probe+0x49/0xa0
[ 956.730248] [<ffffffff814207a1>] pci_device_probe+0xd1/0x120
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
---
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 6cd6a25..9afeb69 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -1385,6 +1385,9 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc)
if (solo_enc == NULL)
return;
+ pci_free_consistent(solo_enc->solo_dev->pdev,
+ sizeof(struct solo_p2m_desc) * solo_enc->desc_nelts,
+ solo_enc->desc_items, solo_enc->desc_dma);
video_unregister_device(solo_enc->vfd);
v4l2_ctrl_handler_free(&solo_enc->hdl);
kfree(solo_enc);
--
1.8.5.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/4] [media] solo6x10: bind start & stop of encoded frames processing thread to device (de)init
2014-10-29 16:03 [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Andrey Utkin
2014-10-29 16:03 ` [PATCH 2/4] [media] solo6x10: free DMA allocation when releasing encoder Andrey Utkin
@ 2014-10-29 16:03 ` Andrey Utkin
2014-10-29 16:03 ` [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop Andrey Utkin
2014-11-06 14:58 ` [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Dan Carpenter
3 siblings, 0 replies; 9+ messages in thread
From: Andrey Utkin @ 2014-10-29 16:03 UTC (permalink / raw)
To: linux-kernel, linux-media, devel
Cc: ismael.luceno, m.chehab, hverkuil, Andrey Utkin
Before, it was called from individual encoder (de)init procedures, which
lead to spare threads running (which were actually lost, leaked).
The current fix uses trivial approach, and the downside is that the
processing thread is working always, even when there's no consumer.
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
---
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 9afeb69..b9b61b9 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -770,12 +770,8 @@ static void solo_ring_stop(struct solo_dev *solo_dev)
static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)
{
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
- int ret;
- ret = solo_enc_on(solo_enc);
- if (ret)
- return ret;
- return solo_ring_start(solo_enc->solo_dev);
+ return solo_enc_on(solo_enc);
}
static void solo_enc_stop_streaming(struct vb2_queue *q)
@@ -794,7 +790,6 @@ static void solo_enc_stop_streaming(struct vb2_queue *q)
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
}
spin_unlock_irqrestore(&solo_enc->av_lock, flags);
- solo_ring_stop(solo_enc->solo_dev);
}
static struct vb2_ops solo_enc_video_qops = {
@@ -1432,13 +1427,15 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
solo_dev->v4l2_enc[0]->vfd->num,
solo_dev->v4l2_enc[solo_dev->nr_chans - 1]->vfd->num);
- return 0;
+ return solo_ring_start(solo_dev);
}
void solo_enc_v4l2_exit(struct solo_dev *solo_dev)
{
int i;
+ solo_ring_stop(solo_dev);
+
for (i = 0; i < solo_dev->nr_chans; i++)
solo_enc_free(solo_dev->v4l2_enc[i]);
--
1.8.5.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop
2014-10-29 16:03 [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Andrey Utkin
2014-10-29 16:03 ` [PATCH 2/4] [media] solo6x10: free DMA allocation when releasing encoder Andrey Utkin
2014-10-29 16:03 ` [PATCH 3/4] [media] solo6x10: bind start & stop of encoded frames processing thread to device (de)init Andrey Utkin
@ 2014-10-29 16:03 ` Andrey Utkin
2014-11-03 15:15 ` Hans Verkuil
2014-11-06 14:58 ` [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Dan Carpenter
3 siblings, 1 reply; 9+ messages in thread
From: Andrey Utkin @ 2014-10-29 16:03 UTC (permalink / raw)
To: linux-kernel, linux-media, devel
Cc: ismael.luceno, m.chehab, hverkuil, Andrey Utkin
The used approach actually cannot prevent new encoder interrupt to
appear, because interrupt handler can execute in different thread, and
in current implementation there is still race condition regarding this.
Also from practice the code with this change seems to work as stable as
before.
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
---
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index b9b61b9..30e09d9 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -703,9 +703,7 @@ static int solo_ring_thread(void *data)
if (timeout == -ERESTARTSYS || kthread_should_stop())
break;
- solo_irq_off(solo_dev, SOLO_IRQ_ENCODER);
solo_handle_ring(solo_dev);
- solo_irq_on(solo_dev, SOLO_IRQ_ENCODER);
try_to_freeze();
}
--
1.8.5.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop
2014-10-29 16:03 ` [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop Andrey Utkin
@ 2014-11-03 15:15 ` Hans Verkuil
2014-11-04 17:55 ` Andrey Utkin
0 siblings, 1 reply; 9+ messages in thread
From: Hans Verkuil @ 2014-11-03 15:15 UTC (permalink / raw)
To: Andrey Utkin, linux-kernel, linux-media, devel; +Cc: ismael.luceno, m.chehab
Hi Andrey,
On 10/29/2014 05:03 PM, Andrey Utkin wrote:
> The used approach actually cannot prevent new encoder interrupt to
> appear, because interrupt handler can execute in different thread, and
> in current implementation there is still race condition regarding this.
I don't understand what you mean with 'interrupt handler can execute in
different thread'. Can you elaborate?
Note that I do think that this change makes sense, but I do like to have a
better explanation.
Regards,
Hans
> Also from practice the code with this change seems to work as stable as
> before.
>
> Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
> ---
> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> index b9b61b9..30e09d9 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> @@ -703,9 +703,7 @@ static int solo_ring_thread(void *data)
>
> if (timeout == -ERESTARTSYS || kthread_should_stop())
> break;
> - solo_irq_off(solo_dev, SOLO_IRQ_ENCODER);
> solo_handle_ring(solo_dev);
> - solo_irq_on(solo_dev, SOLO_IRQ_ENCODER);
> try_to_freeze();
> }
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop
2014-11-03 15:15 ` Hans Verkuil
@ 2014-11-04 17:55 ` Andrey Utkin
0 siblings, 0 replies; 9+ messages in thread
From: Andrey Utkin @ 2014-11-04 17:55 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-kernel@vger.kernel.org, Linux Media, OSUOSL Drivers,
ismael.luceno, Mauro Carvalho Chehab
2014-11-03 19:15 GMT+04:00 Hans Verkuil <hverkuil@xs4all.nl>:
> Hi Andrey,
>
> On 10/29/2014 05:03 PM, Andrey Utkin wrote:
>> The used approach actually cannot prevent new encoder interrupt to
>> appear, because interrupt handler can execute in different thread, and
>> in current implementation there is still race condition regarding this.
>
> I don't understand what you mean with 'interrupt handler can execute in
> different thread'. Can you elaborate?
>
> Note that I do think that this change makes sense, but I do like to have a
> better explanation.
>
Hi Hans, thanks for response.
I'm not proficient in linux kernel, so it's hard to make sure and
strict statements regarding this.
In the commit justification I mean that solo_ring_thread(), which is
edited, runs in a thread started with kthread_run().
Interrupt hander is executed on random kernel thread (whichever is
currently running, is it correct?). So temporarily disabling
interrupts from video encoders by writing to special register cannot
be used for "processing serialization", for "fixation of state" or
anything useful at all, thus it should be removed from code.
Is it clear now?
Please feel free to push the patch with edited description, even
without resubmission from me.
--
Andrey Utkin
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming
2014-10-29 16:03 [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Andrey Utkin
` (2 preceding siblings ...)
2014-10-29 16:03 ` [PATCH 4/4] [media] solo6x10: don't turn off/on encoder interrupt in processing loop Andrey Utkin
@ 2014-11-06 14:58 ` Dan Carpenter
2014-11-06 21:06 ` [PATCH v2 1/4] [media] solo6x10: clean up properly in stop_streaming Andrey Utkin
3 siblings, 1 reply; 9+ messages in thread
From: Dan Carpenter @ 2014-11-06 14:58 UTC (permalink / raw)
To: Andrey Utkin
Cc: linux-kernel, linux-media, devel, hverkuil, ismael.luceno,
m.chehab
On Wed, Oct 29, 2014 at 08:03:51PM +0400, Andrey Utkin wrote:
> This fixes warning from drivers/media/v4l2-core/videobuf2-core.c:2144
>
On my kernel that line is:
q->start_streaming_called = 0;
This changelog is useless.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 1/4] [media] solo6x10: clean up properly in stop_streaming
2014-11-06 14:58 ` [PATCH 1/4] [media] solo6x10: free vb2 buffers on stop_streaming Dan Carpenter
@ 2014-11-06 21:06 ` Andrey Utkin
2014-11-07 6:30 ` Dan Carpenter
0 siblings, 1 reply; 9+ messages in thread
From: Andrey Utkin @ 2014-11-06 21:06 UTC (permalink / raw)
To: linux-kernel, linux-media, devel
Cc: m.chehab, hverkuil, dan.carpenter, Andrey Utkin
This fixes warning from drivers/media/v4l2-core/videobuf2-core.c,
WARN_ON(atomic_read(&q->owned_by_drv_count)).
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
---
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 28023f9..6cd6a25 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -781,9 +781,19 @@ static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)
static void solo_enc_stop_streaming(struct vb2_queue *q)
{
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
+ unsigned long flags;
+ spin_lock_irqsave(&solo_enc->av_lock, flags);
solo_enc_off(solo_enc);
- INIT_LIST_HEAD(&solo_enc->vidq_active);
+ while (!list_empty(&solo_enc->vidq_active)) {
+ struct solo_vb2_buf *buf = list_entry(
+ solo_enc->vidq_active.next,
+ struct solo_vb2_buf, list);
+
+ list_del(&buf->list);
+ vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+ }
+ spin_unlock_irqrestore(&solo_enc->av_lock, flags);
solo_ring_stop(solo_enc->solo_dev);
}
--
1.8.5.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/4] [media] solo6x10: clean up properly in stop_streaming
2014-11-06 21:06 ` [PATCH v2 1/4] [media] solo6x10: clean up properly in stop_streaming Andrey Utkin
@ 2014-11-07 6:30 ` Dan Carpenter
0 siblings, 0 replies; 9+ messages in thread
From: Dan Carpenter @ 2014-11-07 6:30 UTC (permalink / raw)
To: Andrey Utkin; +Cc: linux-kernel, linux-media, devel, hverkuil, m.chehab
On Fri, Nov 07, 2014 at 01:06:18AM +0400, Andrey Utkin wrote:
> This fixes warning from drivers/media/v4l2-core/videobuf2-core.c,
> WARN_ON(atomic_read(&q->owned_by_drv_count)).
>
Thanks!
regards,
dan carpenter
^ permalink raw reply [flat|nested] 9+ messages in thread