media: v4l2-mem2mem: fix poll() bug
v2 cover media: v4l2-mem2mem: fix poll() bug
Thanks to the feedback on the first version, this one removes even more code.
I have simplified patch 1/1 to just address the issue without moving code, since this is easier to understand and needs to be done for 2/2 anyway. As a consequence the code has changed a bit and I did not carry the Reviewed-by tags.
Changes from v1:
* Simplify patch 1/1,
* Remove unneeded checks for DONE or ERROR status,
* Rephrased comment about exiting early.
Alexandre Courbot (2):
media: v4l2-mem2mem: always consider OUTPUT queue during poll
media: v4l2-mem2mem: simplify poll logic
drivers/media/v4l2-core/v4l2-mem2mem.c | 28 +++++--------------------- 1 file changed, 5 insertions(+), 23 deletions(-)
--
2.28.0
PATCH v2 1/2 media: v4l2-mem2mem: always consider OUTPUT queue during poll
If poll() is called on a m2m device with the EPOLLOUT event after the last buffer of the CAPTURE queue is dequeued, any buffer available on OUTPUT queue will never be signaled because v4l2_m2m_poll_for_data() starts by checking whether dst_q->last_buffer_dequeued is set and returns EPOLLIN in this case, without looking at the state of the OUTPUT queue.
Fix this by not early returning so we keep checking the state of the OUTPUT queue afterwards.
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +2 -4
@@ -868,10 +868,8 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file,* If the last buffer was dequeued from the capture queue, * return immediately. DQBUF will return -EPIPE. */ -if (dst_q->last_buffer_dequeued) { -spin_unlock_irqrestore (&dst_q->done_lock, flags); -return EPOLLIN |EPOLLRDNORM ; - } +if (dst_q->last_buffer_dequeued) + rc |=EPOLLIN |EPOLLRDNORM ; }spin_unlock_irqrestore (&dst_q->done_lock, flags);
Signature · 1 line
2.28.0
Re: [PATCH v2 1/2] media: v4l2-mem2mem: always consider OUTPUT queue during poll
Quoted 8 lines · Alexandre Courbot
If
poll()is called on a m2m device with the EPOLLOUT event after the last buffer of the CAPTURE queue is dequeued, any buffer available on OUTPUT queue will never be signaled becausev4l2_m2m_poll_for_data()starts by checking whetherdst_q->last_buffer_dequeuedis set and returns EPOLLIN in this case, without looking at the state of the OUTPUT queue.
Quoted 4 lines
Fix this by not early returning so we keep checking the state of the OUTPUT queue afterwards.
Signed-off-by Alexandre Courbot <[email protected]>
Quoted 24 lines
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/media/v4l2-core/v4l2-mem2mem.c +2
-5@@ -868,10 +868,8 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file,* If the last buffer was dequeued from the capture queue, * return immediately. DQBUF will return -EPIPE. */ -if (dst_q->last_buffer_dequeued) { -spin_unlock_irqrestore (&dst_q->done_lock, flags); -return EPOLLIN |EPOLLRDNORM ; - } +if (dst_q->last_buffer_dequeued) + rc |=EPOLLIN |EPOLLRDNORM ; }spin_unlock_irqrestore (&dst_q->done_lock, flags); --2.28.0
PATCH v2 2/2 media: v4l2-mem2mem: simplify poll logic
In reply to Alexandre CourbotFactorize redundant checks into a single code block, remove unneeded checks (a buffer in done_list is necessarily in the DONE or ERROR state), and we end up with a much simpler version of this function.
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +5 -21
@@ -841,7 +841,6 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file, struct poll_table_struct *wait) {struct vb2_queue *src_q, *dst_q; -struct vb2_buffer *src_vb =NULL , *dst_vb =NULL ;__poll_t rc =0 ;unsigned long flags;
@@ -862,32 +861,17 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file, list_empty(&dst_q->queued_list)))return EPOLLERR ; -spin_lock_irqsave (&dst_q->done_lock, flags); -if (list_empty (&dst_q->done_list)) { -/* -* If the last buffer was dequeued from the capture queue, -* return immediately. DQBUF will return -EPIPE. -*/ -if (dst_q->last_buffer_dequeued) - rc |=EPOLLIN |EPOLLRDNORM ; - } -spin_unlock_irqrestore (&dst_q->done_lock, flags); -spin_lock_irqsave (&src_q->done_lock, flags);if (!list_empty (&src_q->done_list)) - src_vb = list_first_entry(&src_q->done_list, struct vb2_buffer, - done_entry); -if (src_vb && (src_vb->state ==VB2_BUF_STATE_DONE - || src_vb->state ==VB2_BUF_STATE_ERROR )) rc |=EPOLLOUT |EPOLLWRNORM ;spin_unlock_irqrestore (&src_q->done_lock, flags);spin_lock_irqsave (&dst_q->done_lock, flags); -if (!list_empty (&dst_q->done_list)) - dst_vb = list_first_entry(&dst_q->done_list, struct vb2_buffer, - done_entry); -if (dst_vb && (dst_vb->state ==VB2_BUF_STATE_DONE - || dst_vb->state ==VB2_BUF_STATE_ERROR )) +/* +* If the last buffer was dequeued from the capture queue, signal +* userspace. DQBUF(CAPTURE) will return -EPIPE. +*/ +if (!list_empty (&dst_q->done_list) || dst_q->last_buffer_dequeued) rc |=EPOLLIN |EPOLLRDNORM ;spin_unlock_irqrestore (&dst_q->done_lock, flags);
Signature · 1 line
2.28.0
Re: [PATCH v2 2/2] media: v4l2-mem2mem: simplify poll logic
Quoted 6 lines · Alexandre Courbot
Factorize redundant checks into a single code block, remove unneeded checks (a buffer in
done_listis necessarily in the DONE or ERROR state), and we end up with a much simpler version of this function.Signed-off-by Alexandre Courbot <[email protected]>
This is really good, thanks!
Quoted 57 lines
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-)drivers/media/v4l2-core/v4l2-mem2mem.c +5
-22@@ -841,7 +841,6 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file, struct poll_table_struct *wait) {struct vb2_queue *src_q, *dst_q; -struct vb2_buffer *src_vb =NULL , *dst_vb =NULL ;__poll_t rc =0 ;unsigned long flags;@@ -862,32 +861,17 @@ static __poll_t v4l2_m2m_poll_for_data(struct file *file, list_empty(&dst_q->queued_list)))return EPOLLERR ; -spin_lock_irqsave (&dst_q->done_lock, flags); -if (list_empty (&dst_q->done_list)) { -/* -* If the last buffer was dequeued from the capture queue, -* return immediately. DQBUF will return -EPIPE. -*/ -if (dst_q->last_buffer_dequeued) - rc |=EPOLLIN |EPOLLRDNORM ; - } -spin_unlock_irqrestore (&dst_q->done_lock, flags); -spin_lock_irqsave (&src_q->done_lock, flags);if (!list_empty (&src_q->done_list)) - src_vb = list_first_entry(&src_q->done_list, struct vb2_buffer, - done_entry); -if (src_vb && (src_vb->state ==VB2_BUF_STATE_DONE - || src_vb->state ==VB2_BUF_STATE_ERROR )) rc |=EPOLLOUT |EPOLLWRNORM ;spin_unlock_irqrestore (&src_q->done_lock, flags);spin_lock_irqsave (&dst_q->done_lock, flags); -if (!list_empty (&dst_q->done_list)) - dst_vb = list_first_entry(&dst_q->done_list, struct vb2_buffer, - done_entry); -if (dst_vb && (dst_vb->state ==VB2_BUF_STATE_DONE - || dst_vb->state ==VB2_BUF_STATE_ERROR )) +/* +* If the last buffer was dequeued from the capture queue, signal +* userspace. DQBUF(CAPTURE) will return -EPIPE. +*/ +if (!list_empty (&dst_q->done_list) || dst_q->last_buffer_dequeued) rc |=EPOLLIN |EPOLLRDNORM ;spin_unlock_irqrestore (&dst_q->done_lock, flags); --2.28.0