media: always call poll_wait() on queues
Subsystems (2)
v2 cover media: always call poll_wait() on queues
do_poll()/do_select() seem to set the _qproc member of poll_table to NULL the first time they are called on a given table, making subsequent calls of poll_wait() on that table no-ops. This behavior causes a bug with the current poll implementations of vb2 and mem2mem, which only call poll_wait() if a queue-related (EPOLLIN or EPOLLOUT) event if
present: if there is none during the first call (e.g. because userspace only wanted to listen to EPOLLPRI), then EPOLLIN and EPOLLOUT will never be signaled, event if they are requested later.
This can be fixed by making the call to poll_wait() unconditional, thus making sure it will also be invoked during the first call.
The issue has been discussed in more detail on
https://www.spinics.net/lists/linux-media/msg179618.html.
Alexandre Courbot (2):
media: videobuf2: always call poll_wait() on queues
media: v4l2-mem2mem: always call poll_wait() on queues
drivers/media/common/videobuf2/videobuf2-core.c | 11 +++++++++-- drivers/media/v4l2-core/v4l2-mem2mem.c | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-)
--
2.29.2
PATCH v2 1/2 media: videobuf2: always call poll_wait() on queues
do_poll()/do_select() seem to set the _qproc member of poll_table to NULL the first time they are called on a given table, making subsequent calls of poll_wait() on that table no-ops. This is a problem for vb2 which calls poll_wait() on the V4L2 queues' waitqueues only when a queue-related event is requested, which may not necessarily be the case during the first poll.
Fix this by making the call to poll_wait() happen first thing and unconditionally in vb2_core_poll().
--- drivers/media/common/videobuf2/videobuf2-core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/media/common/videobuf2/videobuf2-core.c +9 -2
@@ -2363,13 +2363,20 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,struct vb2_buffer *vb =NULL ;unsigned long flags; +/* +* poll_wait() MUST be called on the first invocation on all the +* potential queues of interest, even if we are not interested in their +* events during this first call. Failure to do so will result in +* queue's events to be ignored because the poll_table won't be capable +* of adding new wait queues thereafter. +*/ +poll_wait (file, &q->done_wq, wait); +if (!q->is_output && !(req_events & (EPOLLIN |EPOLLRDNORM )))return 0 ;if (q->is_output && !(req_events & (EPOLLOUT |EPOLLWRNORM )))return 0 ; -poll_wait (file, &q->done_wq, wait); -/* * Start file I/O emulator only if streaming API has not been used yet. */
Signature · 1 line
2.29.2
PATCH v2 2/2 media: v4l2-mem2mem: always call poll_wait() on queues
In reply to Alexandre Courbotdo_poll()/do_select() seem to set the _qproc member of poll_table to NULL the first time they are called on a given table, making subsequent calls of poll_wait() on that table no-ops. This is a problem for mem2mem which calls poll_wait() on the V4L2 queues' waitqueues only when a queue-related event is requested, which may not necessarily be the case during the first poll.
For instance, a stateful decoder is typically only interested in EPOLLPRI events when it starts, and will switch to listening to both EPOLLPRI and EPOLLIN after receiving the initial resolution change event and configuring the CAPTURE queue. However by the time that switch happens and v4l2_m2m_poll_for_data() is called for the first time, poll_wait() has become a no-op and the V4L2 queues waitqueues thus cannot be registered.
Fix this by moving the registration to v4l2_m2m_poll() and do it whether or not one of the queue-related events are requested.
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +12 -3
@@ -887,9 +887,6 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file, src_q =v4l2_m2m_get_src_vq (m2m_ctx); dst_q =v4l2_m2m_get_dst_vq (m2m_ctx); -poll_wait (file, &src_q->done_wq, wait); -poll_wait (file, &dst_q->done_wq, wait); -/* * There has to be at least one buffer queued on each queued_list, which * means either in driver already or waiting for driver to claim it
@@ -922,9 +919,21 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct poll_table_struct *wait) {struct video_device *vfd =video_devdata (file); +struct vb2_queue *src_q =v4l2_m2m_get_src_vq (m2m_ctx); +struct vb2_queue *dst_q =v4l2_m2m_get_dst_vq (m2m_ctx);__poll_t req_events =poll_requested_events (wait);__poll_t rc =0 ; +/* +* poll_wait() MUST be called on the first invocation on all the +* potential queues of interest, even if we are not interested in their +* events during this first call. Failure to do so will result in +* queue's events to be ignored because the poll_table won't be capable +* of adding new wait queues thereafter. +*/ +poll_wait (file, &src_q->done_wq, wait); +poll_wait (file, &dst_q->done_wq, wait); +if (req_events & (EPOLLOUT |EPOLLWRNORM |EPOLLIN |EPOLLRDNORM )) rc =v4l2_m2m_poll_for_data (file, m2m_ctx, wait);
Signature · 1 line
2.29.2