Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc5778ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pktgen-races' 



Oleg Nesterov says:

====================
net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()

I am not familiar with this code and I have no idea how to test
these changes, so 2/2 comes as a separate change. 1/2 looks like
the obvious bugfix, and probably candidate for -stable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4a0e3e98 1fbe4b46

net/core/pktgen.c

+2 −7
Original line number Diff line number Diff line
@@ -3571,13 +3571,6 @@ static int pktgen_thread_worker(void *arg) 
	pr_debug("%s removing thread\n", t->tsk->comm);

	pktgen_rem_thread(t);



	/* Wait for kthread_stop */

	while (!kthread_should_stop()) {

		set_current_state(TASK_INTERRUPTIBLE);

		schedule();

	}

	__set_current_state(TASK_RUNNING);



	return 0;

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



	t->net = pn;

	get_task_struct(p);

	wake_up_process(p);

	wait_for_completion(&t->start_done);
@@ -3891,6 +3885,7 @@ static void __net_exit pg_net_exit(struct net *net) 
		t = list_entry(q, struct pktgen_thread, th_list);

		list_del(&t->th_list);

		kthread_stop(t->tsk);

		put_task_struct(t->tsk);

		kfree(t);

	}