Skip to content

Commit 1fbe4b4

Browse files
oleg-nesterovdavem330
authored andcommitted
net: pktgen: kill the "Wait for kthread_stop" code in pktgen_thread_worker()
pktgen_thread_worker() doesn't need to wait for kthread_stop(), it can simply exit. Just pktgen_create_thread() and pg_net_exit() should do get_task_struct()/put_task_struct(). kthread_stop(dead_thread) is fine. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent fecdf8b commit 1fbe4b4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

net/core/pktgen.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,15 +3571,6 @@ static int pktgen_thread_worker(void *arg)
35713571
pr_debug("%s removing thread\n", t->tsk->comm);
35723572
pktgen_rem_thread(t);
35733573

3574-
/* Wait for kthread_stop */
3575-
for (;;) {
3576-
set_current_state(TASK_INTERRUPTIBLE);
3577-
if (kthread_should_stop())
3578-
break;
3579-
schedule();
3580-
}
3581-
__set_current_state(TASK_RUNNING);
3582-
35833574
return 0;
35843575
}
35853576

@@ -3771,6 +3762,7 @@ static int __net_init pktgen_create_thread(int cpu, struct pktgen_net *pn)
37713762
}
37723763

37733764
t->net = pn;
3765+
get_task_struct(p);
37743766
wake_up_process(p);
37753767
wait_for_completion(&t->start_done);
37763768

@@ -3893,6 +3885,7 @@ static void __net_exit pg_net_exit(struct net *net)
38933885
t = list_entry(q, struct pktgen_thread, th_list);
38943886
list_del(&t->th_list);
38953887
kthread_stop(t->tsk);
3888+
put_task_struct(t->tsk);
38963889
kfree(t);
38973890
}
38983891

0 commit comments

Comments
 (0)