Commit cda9de0b authored by Yejune Deng's avatar Yejune Deng Committed by David S. Miller
Browse files

pktgen: add pktgen_handle_all_threads() for the same code 



The pktgen_{run, reset, stop}_all_threads() has the same code,
so add pktgen_handle_all_threads() for it.

Signed-off-by: default avatarYejune Deng <yejune.deng@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85eb1389

net/core/pktgen.c

+13 −25
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t, 
static int pktgen_device_event(struct notifier_block *, unsigned long, void *);

static void pktgen_run_all_threads(struct pktgen_net *pn);

static void pktgen_reset_all_threads(struct pktgen_net *pn);

static void pktgen_stop_all_threads_ifs(struct pktgen_net *pn);

static void pktgen_stop_all_threads(struct pktgen_net *pn);



static void pktgen_stop(struct pktgen_thread *t);

static void pktgen_clear_counters(struct pktgen_dev *pkt_dev);
@@ -516,14 +516,11 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf, 
	data[count - 1] = 0;	/* Strip trailing '\n' and terminate string */



	if (!strcmp(data, "stop"))

		pktgen_stop_all_threads_ifs(pn);



		pktgen_stop_all_threads(pn);

	else if (!strcmp(data, "start"))

		pktgen_run_all_threads(pn);



	else if (!strcmp(data, "reset"))

		pktgen_reset_all_threads(pn);



	else

		return -EINVAL;
@@ -3027,20 +3024,25 @@ static void pktgen_run(struct pktgen_thread *t) 
		t->control &= ~(T_STOP);

}



static void pktgen_stop_all_threads_ifs(struct pktgen_net *pn)

static void pktgen_handle_all_threads(struct pktgen_net *pn, u32 flags)

{

	struct pktgen_thread *t;



	func_enter();



	mutex_lock(&pktgen_thread_lock);



	list_for_each_entry(t, &pn->pktgen_threads, th_list)

		t->control |= T_STOP;

		t->control |= (flags);



	mutex_unlock(&pktgen_thread_lock);

}



static void pktgen_stop_all_threads(struct pktgen_net *pn)

{

	func_enter();



	pktgen_handle_all_threads(pn, T_STOP);

}



static int thread_is_running(const struct pktgen_thread *t)

{

	const struct pktgen_dev *pkt_dev;
@@ -3103,16 +3105,9 @@ static int pktgen_wait_all_threads_run(struct pktgen_net *pn) 


static void pktgen_run_all_threads(struct pktgen_net *pn)

{

	struct pktgen_thread *t;



	func_enter();



	mutex_lock(&pktgen_thread_lock);



	list_for_each_entry(t, &pn->pktgen_threads, th_list)

		t->control |= (T_RUN);



	mutex_unlock(&pktgen_thread_lock);

	pktgen_handle_all_threads(pn, T_RUN);



	/* Propagate thread->control  */

	schedule_timeout_interruptible(msecs_to_jiffies(125));
@@ -3122,16 +3117,9 @@ static void pktgen_run_all_threads(struct pktgen_net *pn) 


static void pktgen_reset_all_threads(struct pktgen_net *pn)

{

	struct pktgen_thread *t;



	func_enter();



	mutex_lock(&pktgen_thread_lock);



	list_for_each_entry(t, &pn->pktgen_threads, th_list)

		t->control |= (T_REMDEVALL);



	mutex_unlock(&pktgen_thread_lock);

	pktgen_handle_all_threads(pn, T_REMDEVALL);



	/* Propagate thread->control  */

	schedule_timeout_interruptible(msecs_to_jiffies(125));