Em Mon, 15 Sep 2014 13:14:51 +0200 Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: > On 06/06/2014 03:42 PM, Laurent Pinchart wrote: > > On Friday 06 June 2014 11:58:18 Hans Verkuil wrote: > >> On 06/06/2014 11:50 AM, Hans de Goede wrote: > >>> Hi, > >>> > >>> On 06/05/2014 02:23 PM, Laurent Pinchart wrote: > >>>> The V4L2 specification states that > >>>> > >>>> "When the application did not call VIDIOC_QBUF or VIDIOC_STREAMON yet > >>>> the poll() function succeeds, but sets the POLLERR flag in the revents > >>>> field." > >>>> > >>>> The vb2_poll() function sets POLLERR when the queued buffers list is > >>>> empty, regardless of whether this is caused by the stream not being > >>>> active yet, or by a transient buffer underrun. > >>>> > >>>> Bring the implementation in line with the specification by returning > >>>> POLLERR only when the queue is not streaming. Buffer underruns during > >>>> streaming are not treated specially anymore and just result in poll() > >>>> blocking until the next event. > >>> > >>> After your patch the implementation is still not inline with the spec, > >>> queuing buffers, then starting a thread doing the poll, then doing the > >>> streamon in the main thread will still cause the poll to return POLLERR, > >>> even though buffers are queued, which according to the spec should be > >>> enough for the poll to block. > >>> > >>> The correct check would be: > >>> > >>> if (list_empty(&q->queued_list) && !vb2_is_streaming(q)) > >>> > >>> eturn res | POLLERR; > >> > >> Good catch! I should have seen that :-( > > Urgh. This breaks vbi capture tools like alevt and mtt. These rely on poll > returning POLLERR if buffers are queued but STREAMON has not been called yet. > > See bug report https://bugzilla.kernel.org/show_bug.cgi?id=84401 > > The spec also clearly says that poll should return POLLERR if STREAMON > was not called. > > But that would clash with this multi-thread example. > > Hans, was this based on actual code that needed this? > > I am inclined to update alevt and mtt: all that is needed to make it work > is a single line that explicitly calls the vbi handler before entering the > main loop. This is effectively the same as what happens when the first > select gets a POLLERR. > > We maintain alevt (dvb-apps) and mtt (xawtv3), so that's easy enough to > fix. No, the best is to revert the patch ASAP, as this is a regression. We can then work to change alevt and mtt to do it, but we need to check other tools, like zvbi. Only after having this change at the VBI tools for a while we can change the Kernel again, (if it makes sense: as you said, this patch is violating the spec on VB2). > > Note that the spec is now definitely out-of-sync since poll no longer returns > POLLERR if buffers are queued but STREAMON wasn't called. > > Regards, > > Hans > > > > > I'll update the patch accordingly. > > > >> v4l2-compliance should certainly be extended to test this as well. > >> > >> Regards, > >> > >> Hans > >> > >>> Regards, > >>> > >>> Hans > >>> > >>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > >>>> Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> > >>>> --- > >>>> > >>>> drivers/media/v4l2-core/videobuf2-core.c | 4 ++-- > >>>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>>> > >>>> diff --git a/drivers/media/v4l2-core/videobuf2-core.c > >>>> b/drivers/media/v4l2-core/videobuf2-core.c index 349e659..fd428e0 100644 > >>>> --- a/drivers/media/v4l2-core/videobuf2-core.c > >>>> +++ b/drivers/media/v4l2-core/videobuf2-core.c > >>>> @@ -2533,9 +2533,9 @@ unsigned int vb2_poll(struct vb2_queue *q, struct > >>>> file *file, poll_table *wait)>> > >>>> } > >>>> > >>>> /* > >>>> > >>>> - * There is nothing to wait for if no buffers have already been > > queued. > >>>> + * There is nothing to wait for if the queue isn't streaming. > >>>> > >>>> */ > >>>> > >>>> - if (list_empty(&q->queued_list)) > >>>> + if (!vb2_is_streaming(q)) > >>>> > >>>> return res | POLLERR; > >>>> > >>>> if (list_empty(&q->done_list)) > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
