diff options
author | Peter Zijlstra <[email protected]> | 2014-10-29 16:17:12 +0100 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2014-11-04 07:17:47 +0100 |
commit | eedf7e47daa0b8530246a8c9107c007fbf8231bf (patch) | |
tree | e945f8690e964eb998089519a8aff192e090f494 | |
parent | 6b55fc63f46ba299f3d84013e9232be4bd259eab (diff) |
rfcomm, sched/wait: Fix broken wait construct
rfcomm_run() is a tad broken in that is has a nested wait loop. One
cannot rely on p->state for the outer wait because the inner wait will
overwrite it.
Fix this using the new wait_woken() facility.
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Peter Hurley <[email protected]>
Cc: Alexander Holler <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Gustavo Padovan <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Johan Hedberg <[email protected]>
Cc: Libor Pechacek <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Marcel Holtmann <[email protected]>
Cc: Seung-Woo Kim <[email protected]>
Cc: Vignesh Raman <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index af73bc3acb40..410dd5e76c41 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -101,11 +101,11 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s); #define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1) #define __get_rpn_parity(line) (((line) >> 3) & 0x7) +static DECLARE_WAIT_QUEUE_HEAD(rfcomm_wq); + static void rfcomm_schedule(void) { - if (!rfcomm_thread) - return; - wake_up_process(rfcomm_thread); + wake_up_all(&rfcomm_wq); } /* ---- RFCOMM FCS computation ---- */ @@ -2086,24 +2086,22 @@ static void rfcomm_kill_listener(void) static int rfcomm_run(void *unused) { + DEFINE_WAIT_FUNC(wait, woken_wake_function); BT_DBG(""); set_user_nice(current, -10); rfcomm_add_listener(BDADDR_ANY); - while (1) { - set_current_state(TASK_INTERRUPTIBLE); - - if (kthread_should_stop()) - break; + add_wait_queue(&rfcomm_wq, &wait); + while (!kthread_should_stop()) { /* Process stuff */ rfcomm_process_sessions(); - schedule(); + wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT); } - __set_current_state(TASK_RUNNING); + remove_wait_queue(&rfcomm_wq, &wait); rfcomm_kill_listener(); |