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

Commit eb37b41c authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

pktgen: add full reset functionality 



While testing pktgen, I found that sometimes my configurations from
previous runs would be left over, particularly when going from a test
with 8 threads down to a test with 4 threads.

This adds new functionality to pktgen where you can call
pgset "reset"

and it will be just like you just insmod'ed pktgen again.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarRobert Olsson <robert.olsson@its.uu.se>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b1582d4

net/core/pktgen.c

+22 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t, 
					  const char *ifname);

static int pktgen_device_event(struct notifier_block *, unsigned long, void *);

static void pktgen_run_all_threads(void);

static void pktgen_reset_all_threads(void);

static void pktgen_stop_all_threads_ifs(void);

static int pktgen_stop_device(struct pktgen_dev *pkt_dev);

static void pktgen_stop(struct pktgen_thread *t);
@@ -480,6 +481,9 @@ static ssize_t pgctrl_write(struct file *file, const char __user * buf, 
	else if (!strcmp(data, "start"))

		pktgen_run_all_threads();



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

		pktgen_reset_all_threads();



	else

		printk(KERN_WARNING "pktgen: Unknown command: %s\n", data);
@@ -3173,6 +3177,24 @@ static void pktgen_run_all_threads(void) 
	pktgen_wait_all_threads_run();

}



static void pktgen_reset_all_threads(void)

{

	struct pktgen_thread *t;



	pr_debug("pktgen: entering pktgen_reset_all_threads.\n");



	mutex_lock(&pktgen_thread_lock);



	list_for_each_entry(t, &pktgen_threads, th_list)

		t->control |= (T_REMDEVALL);



	mutex_unlock(&pktgen_thread_lock);



	schedule_timeout_interruptible(msecs_to_jiffies(125));	/* Propagate thread->control  */



	pktgen_wait_all_threads_run();

}



static void show_results(struct pktgen_dev *pkt_dev, int nr_frags)

{

	__u64 total_us, bps, mbps, pps, idle;