@@ -131,6 +131,7 @@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/capability.h>
+#include <linux/hrtimer.h>
#include <linux/freezer.h>
#include <linux/delay.h>
#include <linux/timer.h>
@@ -2084,33 +2085,32 @@ static void pktgen_setup_inject(struct p
pkt_dev->nflows = 0;
}
-static inline s64 delta_ns(ktime_t a, ktime_t b)
-{
- return ktime_to_ns(ktime_sub(a, b));
-}
-
static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
{
- ktime_t start, now;
- s64 dt;
+ struct hrtimer_sleeper t;
+ enum hrtimer_mode mode = HRTIMER_MODE_REL;
+ unsigned long slack = rt_task(current) ? 0 : current->timer_slack_ns;
+
+ hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, mode);
+ hrtimer_set_expires_range_ns(&t.timer, spin_until, slack);
+ hrtimer_init_sleeper(&t, current);
- start = now = ktime_now();
+ /* based on do_nanosleep() */
+ do {
+ set_current_state(TASK_INTERRUPTIBLE);
+ hrtimer_start_expires(&t.timer, mode);
+ if (!hrtimer_active(&t.timer))
+ t.task = NULL;
- while ((dt = delta_ns(spin_until, now)) > 0) {
- /* TODO: optimize sleeping behavior */
- if (dt > TICK_NSEC)
- schedule_timeout_interruptible(1);
- else if (dt > 100*NSEC_PER_USEC) {
- if (!pkt_dev->running)
- return;
- if (need_resched())
- schedule();
- }
+ if (likely(t.task))
+ schedule();
- now = ktime_now();
- }
+ hrtimer_cancel(&t.timer);
+ mode = HRTIMER_MODE_ABS;
+ } while (t.task && pkt_dev->running && !signal_pending(current));
- pkt_dev->idle_acc += ktime_to_ns(ktime_sub(now, start));
+ __set_current_state(TASK_RUNNING);
+ destroy_hrtimer_on_stack(&t.timer);
}
static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev)
@@ -3352,8 +3352,12 @@ static __inline__ void pktgen_xmit(struc
int ret;
if (pkt_dev->delay) {
- if (ktime_lt(ktime_now(), pkt_dev->next_tx))
+ ktime_t start = ktime_now();
+ if (ktime_lt(start, pkt_dev->next_tx)) {
spin(pkt_dev, pkt_dev->next_tx);
+ pkt_dev->idle_acc += ktime_to_ns(ktime_sub(ktime_now(),
+ start));
+ }
/* This is max DELAY, this has special meaning of
* "never transmit"
@@ -1477,6 +1477,7 @@ void hrtimer_init_sleeper(struct hrtimer
sl->timer.function = hrtimer_wakeup;
sl->task = task;
}
+EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
{
This changes how the pktgen thread spins/waits between packets if delay is configured. The new code is basically an revised version of what the nanosleep system call does. It requires exporting hrtimer_init_sleeper from standard hrtimer code, since pktgen can be a module. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> --- kernel/hrtimer.c | 1 + net/core/pktgen.c | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-)