path: root/net
diff options
authorJesse Brandeburg <jesse.brandeburg@intel.com>2008-11-10 16:48:03 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-10 16:48:03 -0800
commiteb37b41cc2274cdecfc19d371717c321fe2ab426 (patch)
treec155954313416230e6b762d2385dc19858613b2b /net
parent9b1582d4513a2102c68fe12ac1106595f3c09120 (diff)
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: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Robert Olsson <robert.olsson@its.uu.se> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
1 files changed, 22 insertions, 0 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index fa4973bf73e..a4f5ad1ab35 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -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"))
+ else if (!strcmp(data, "reset"))
+ pktgen_reset_all_threads();
printk(KERN_WARNING "pktgen: Unknown command: %s\n", data);
@@ -3173,6 +3177,24 @@ static void pktgen_run_all_threads(void)
+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;