Skip to content

Commit

Permalink
w1: fix WARNING after calling w1_process()
Browse files Browse the repository at this point in the history 
[ Upstream commit 36225a7 ]

I got the following WARNING message while removing driver(ds2482):

------------[ cut here ]------------
do not call blocking ops when !TASK_RUNNING; state=1 set at [<000000002d50bfb6>] w1_process+0x9e/0x1d0 [wire]
WARNING: CPU: 0 PID: 262 at kernel/sched/core.c:9817 __might_sleep+0x98/0xa0
CPU: 0 PID: 262 Comm: w1_bus_master1 Tainted: G                 N 6.1.0-rc3+ torvalds#307
RIP: 0010:__might_sleep+0x98/0xa0
Call Trace:
 exit_signals+0x6c/0x550
 do_exit+0x2b4/0x17e0
 kthread_exit+0x52/0x60
 kthread+0x16d/0x1e0
 ret_from_fork+0x1f/0x30

The state of task is set to TASK_INTERRUPTIBLE in loop in w1_process(),
set it to TASK_RUNNING when it breaks out of the loop to avoid the
warning.

Fixes: 3c52e4e ("W1: w1_process, block or sleep")
Signed-off-by: Yang Yingliang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
Yang Yingliang authored and Sasha Levin committed Feb 4, 2023
1 parent 6e8899e commit 75d13ad
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/w1/w1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1165,8 +1165,10 @@ int w1_process(void *data)
*/
mutex_unlock(&dev->list_mutex);

if (kthread_should_stop())
if (kthread_should_stop()) {
__set_current_state(TASK_RUNNING);
break;
}

/* Only sleep when the search is active. */
if (dev->search_count) {
Expand Down

0 comments on commit 75d13ad

Please sign in to comment.