LinuxTV Patchwork [RFC,8/8] dvb-core: fix epoll() by calling poll_wait first

login
register
mail settings
Submitter Hans Verkuil
Date Feb. 7, 2019, 11:49 a.m.
Message ID <20190207114948.37750-9-hverkuil-cisco@xs4all.nl>
Download mbox | patch
Permalink /patch/54365/
State Accepted
Delegated to: Hans Verkuil
Headers show

Comments

Hans Verkuil - Feb. 7, 2019, 11:49 a.m.
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>

The epoll function expects that whenever the poll file op is
called, the poll_wait function is also called. That didn't
always happen in dvb_demux_poll(), dvb_dvr_poll() and
dvb_ca_en50221_io_poll(). Fix this, otherwise epoll()
can timeout when it shouldn't.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
 drivers/media/dvb-core/dmxdev.c         | 8 ++++----
 drivers/media/dvb-core/dvb_ca_en50221.c | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)
Sean Young - Feb. 8, 2019, 9:12 p.m.
On Thu, Feb 07, 2019 at 12:49:48PM +0100, hverkuil-cisco@xs4all.nl wrote:
> From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> 
> The epoll function expects that whenever the poll file op is
> called, the poll_wait function is also called. That didn't
> always happen in dvb_demux_poll(), dvb_dvr_poll() and
> dvb_ca_en50221_io_poll(). Fix this, otherwise epoll()
> can timeout when it shouldn't.
> 
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Reviewed-by: Sean Young <sean@mess.org>

> ---
>  drivers/media/dvb-core/dmxdev.c         | 8 ++++----
>  drivers/media/dvb-core/dvb_ca_en50221.c | 5 ++---
>  2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
> index 1544e8cef564..f14a872d1268 100644
> --- a/drivers/media/dvb-core/dmxdev.c
> +++ b/drivers/media/dvb-core/dmxdev.c
> @@ -1195,13 +1195,13 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
>  	struct dmxdev_filter *dmxdevfilter = file->private_data;
>  	__poll_t mask = 0;
>  
> +	poll_wait(file, &dmxdevfilter->buffer.queue, wait);
> +
>  	if ((!dmxdevfilter) || dmxdevfilter->dev->exit)
>  		return EPOLLERR;
>  	if (dvb_vb2_is_streaming(&dmxdevfilter->vb2_ctx))
>  		return dvb_vb2_poll(&dmxdevfilter->vb2_ctx, file, wait);
>  
> -	poll_wait(file, &dmxdevfilter->buffer.queue, wait);
> -
>  	if (dmxdevfilter->state != DMXDEV_STATE_GO &&
>  	    dmxdevfilter->state != DMXDEV_STATE_DONE &&
>  	    dmxdevfilter->state != DMXDEV_STATE_TIMEDOUT)
> @@ -1346,13 +1346,13 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
>  
>  	dprintk("%s\n", __func__);
>  
> +	poll_wait(file, &dmxdev->dvr_buffer.queue, wait);
> +
>  	if (dmxdev->exit)
>  		return EPOLLERR;
>  	if (dvb_vb2_is_streaming(&dmxdev->dvr_vb2_ctx))
>  		return dvb_vb2_poll(&dmxdev->dvr_vb2_ctx, file, wait);
>  
> -	poll_wait(file, &dmxdev->dvr_buffer.queue, wait);
> -
>  	if (((file->f_flags & O_ACCMODE) == O_RDONLY) ||
>  	    dmxdev->may_do_mmap) {
>  		if (dmxdev->dvr_buffer.error)
> diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
> index 4d371cea0d5d..ebf1e3b03819 100644
> --- a/drivers/media/dvb-core/dvb_ca_en50221.c
> +++ b/drivers/media/dvb-core/dvb_ca_en50221.c
> @@ -1797,6 +1797,8 @@ static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
>  
>  	dprintk("%s\n", __func__);
>  
> +	poll_wait(file, &ca->wait_queue, wait);
> +
>  	if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
>  		mask |= EPOLLIN;
>  
> @@ -1804,9 +1806,6 @@ static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
>  	if (mask)
>  		return mask;
>  
> -	/* wait for something to happen */
> -	poll_wait(file, &ca->wait_queue, wait);
> -
>  	if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
>  		mask |= EPOLLIN;
>  
> -- 
> 2.20.1

Patch

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 1544e8cef564..f14a872d1268 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1195,13 +1195,13 @@  static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
 	struct dmxdev_filter *dmxdevfilter = file->private_data;
 	__poll_t mask = 0;
 
+	poll_wait(file, &dmxdevfilter->buffer.queue, wait);
+
 	if ((!dmxdevfilter) || dmxdevfilter->dev->exit)
 		return EPOLLERR;
 	if (dvb_vb2_is_streaming(&dmxdevfilter->vb2_ctx))
 		return dvb_vb2_poll(&dmxdevfilter->vb2_ctx, file, wait);
 
-	poll_wait(file, &dmxdevfilter->buffer.queue, wait);
-
 	if (dmxdevfilter->state != DMXDEV_STATE_GO &&
 	    dmxdevfilter->state != DMXDEV_STATE_DONE &&
 	    dmxdevfilter->state != DMXDEV_STATE_TIMEDOUT)
@@ -1346,13 +1346,13 @@  static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
 
 	dprintk("%s\n", __func__);
 
+	poll_wait(file, &dmxdev->dvr_buffer.queue, wait);
+
 	if (dmxdev->exit)
 		return EPOLLERR;
 	if (dvb_vb2_is_streaming(&dmxdev->dvr_vb2_ctx))
 		return dvb_vb2_poll(&dmxdev->dvr_vb2_ctx, file, wait);
 
-	poll_wait(file, &dmxdev->dvr_buffer.queue, wait);
-
 	if (((file->f_flags & O_ACCMODE) == O_RDONLY) ||
 	    dmxdev->may_do_mmap) {
 		if (dmxdev->dvr_buffer.error)
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 4d371cea0d5d..ebf1e3b03819 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1797,6 +1797,8 @@  static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
 
 	dprintk("%s\n", __func__);
 
+	poll_wait(file, &ca->wait_queue, wait);
+
 	if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
 		mask |= EPOLLIN;
 
@@ -1804,9 +1806,6 @@  static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
 	if (mask)
 		return mask;
 
-	/* wait for something to happen */
-	poll_wait(file, &ca->wait_queue, wait);
-
 	if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
 		mask |= EPOLLIN;
 

Privacy Policy