nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: pktgen: kill the "Wait for kthread_stop" code in pktgen_thread_worker()

Browse source 
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>
This commit is contained in:
Oleg Nesterov 2015-07-08 21:42:13 +02:00 committed by David S. Miller
parent fecdf8be2d
commit 1fbe4b46ca
1 changed files with 2 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
net/core/pktgen.c
View file

@ -3571,15 +3571,6 @@ static int pktgen_thread_worker(void *arg)
pr_debug("%s removing thread\n", t->tsk->comm); pr_debug("%s removing thread\n", t->tsk->comm);
pktgen_rem_thread(t); pktgen_rem_thread(t);
/* Wait for kthread_stop */
for (;;) {
set_current_state(TASK_INTERRUPTIBLE);
if (kthread_should_stop())
break;
schedule();
}
__set_current_state(TASK_RUNNING);
return 0; return 0;
} }
@ -3771,6 +3762,7 @@ static int __net_init pktgen_create_thread(int cpu, struct pktgen_net *pn)
} }
t->net = pn; t->net = pn;
get_task_struct(p);
wake_up_process(p); wake_up_process(p);
wait_for_completion(&t->start_done); wait_for_completion(&t->start_done);
@ -3893,6 +3885,7 @@ static void __net_exit pg_net_exit(struct net *net)
t = list_entry(q, struct pktgen_thread, th_list); t = list_entry(q, struct pktgen_thread, th_list);
list_del(&t->th_list); list_del(&t->th_list);
kthread_stop(t->tsk); kthread_stop(t->tsk);
put_task_struct(t->tsk);
kfree(t); kfree(t);
} }