media: Use wait_event_freezable() variants for freezable kthread
Subsystems (2)
cover media: Use wait_event_freezable() variants for freezable kthread
Hi,
This patch series replace the wait_event_interruptible() variants with wait_event_freezable() variants for the freezable kthread, so we can eliminate a call to try_to_freeze().
Kevin Hao (3):
media: dvb_frontend: Use wait_event_freezable_timeout() for freezable
kthread
media: msp3400: Use wait_event_freezable_timeout() in msp_sleep()
media: pvrusb2: Use wait_event_freezable() for freezable kthread
drivers/media/dvb-core/dvb_frontend.c | 13 ++++--------- drivers/media/i2c/msp3400-driver.c | 20 ++++++-------------- drivers/media/i2c/msp3400-driver.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 6 +----- 4 files changed, 12 insertions(+), 29 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/3 media: dvb_frontend: Use wait_event_freezable_timeout() for freezable kthread
A freezable kernel thread can enter frozen state during freezing by either calling try_to_freeze() or using wait_event_freezable() and its variants. So for the following snippet of code in a kernel thread loop:
wait_event_interruptible_timeout();
try_to_freeze();
We can change it to a simple wait_event_freezable_timeout() and then eliminate a function call.
--- drivers/media/dvb-core/dvb_frontend.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/media/dvb-core/dvb_frontend.c +4 -9
@@ -679,12 +679,10 @@ static int dvb_frontend_thread(void *data)set_freezable ();while (1 ) {up (&fepriv->sem);/* is locked when we enter the thread... */ -restart: -wait_event_interruptible_timeout (fepriv->wait_queue, -dvb_frontend_should_wakeup (fe) || -kthread_should_stop () || -freezing (current), - fepriv->delay); +wait_event_freezable_timeout (fepriv->wait_queue, +dvb_frontend_should_wakeup (fe) || +kthread_should_stop (), + fepriv->delay);if (kthread_should_stop () ||dvb_frontend_is_exiting (fe)) {/* got signal or quitting */
@@ -694,9 +692,6 @@ static int dvb_frontend_thread(void *data)break ; } -if (try_to_freeze ()) - goto restart; -if (down_interruptible (&fepriv->sem))break ;
Signature · 1 line
2.39.2
PATCH 2/3 media: msp3400: Use wait_event_freezable_timeout() in msp_sleep()
In reply to Kevin HaoThe msp_sleep() is nearly open-coded wait_event_interruptible_timeout(), and a freezable kernel thread can enter frozen state during freezing by either calling try_to_freeze() or using wait_event_freezable() and its variants. So we can reimplement msp_sleep() to simply invoke a wait_event_freezable_timeout() and then eliminate a call to try_to_freeze().
--- drivers/media/i2c/msp3400-driver.c | 20 ++++++-------------- drivers/media/i2c/msp3400-driver.h | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-)
drivers/media/i2c/msp3400-driver.c +6 -14
@@ -309,23 +309,15 @@ static void msp_wake_thread(struct i2c_client *client)wake_up_interruptible (&state->wq); } -int msp_sleep (struct msp_state *state,int timeout) +int msp_sleep (struct msp_state *state,int msec) { -DECLARE_WAITQUEUE (wait, current); +long timeout; -add_wait_queue (&state->wq, &wait); -if (!kthread_should_stop ()) { -if (timeout <0 ) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule (); - }else { -schedule_timeout_interruptible - (msecs_to_jiffies (timeout)); - } - } + timeout = msec <0 ?MAX_SCHEDULE_TIMEOUT :msecs_to_jiffies (msec); + +wait_event_freezable_timeout (state->wq,kthread_should_stop () || + state->restart, timeout); -remove_wait_queue (&state->wq, &wait); -try_to_freeze ();return state->restart; }
drivers/media/i2c/msp3400-driver.h +1 -1
@@ -134,7 +134,7 @@ int msp_read_dsp(struct i2c_client *client, int addr);int msp_reset (struct i2c_client *client);void msp_set_scart (struct i2c_client *client,int in,int out);void msp_update_volume (struct msp_state *state); -int msp_sleep (struct msp_state *state,int timeout); +int msp_sleep (struct msp_state *state,int msec);/* msp3400-kthreads.c */ const char *msp_standard_std_name (int std);
Signature · 1 line
2.39.2
PATCH 3/3 media: pvrusb2: Use wait_event_freezable() for freezable kthread
In reply to Kevin HaoA freezable kernel thread can enter frozen state during freezing by either calling try_to_freeze() or using wait_event_freezable() and its variants. So for the following snippet of code in a kernel thread loop:
try_to_freeze();
wait_event_interruptible();
We can change it to a simple wait_event_freezable() and then eliminate a function call.
--- drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/media/usb/pvrusb2/pvrusb2-dvb.c +1 -5
@@ -33,9 +33,6 @@ static int pvr2_dvb_feed_func(struct pvr2_dvb_adapter *adap)for (;;) {if (kthread_should_stop ())break ; -/* Not sure about this... */ -try_to_freeze (); - bp =pvr2_stream_get_ready_buffer (stream);if (bp !=NULL ) { count =pvr2_buffer_get_count (bp);
@@ -62,8 +59,7 @@ static int pvr2_dvb_feed_func(struct pvr2_dvb_adapter *adap)/* Wait until more buffers become available or we're told not to wait any longer. */ - ret =wait_event_interruptible ( - adap->buffer_wait_data, + ret =wait_event_freezable (adap->buffer_wait_data, (pvr2_stream_get_ready_count (stream) >0 ) ||kthread_should_stop ());if (ret <0 )break ;
Signature · 1 line
2.39.2