pkt_sched: Change PSCHED_SHIFT from 10 to 6
Subsystems (3)
PATCH 2/2 pkt_sched: Change PSCHED_SHIFT from 10 to 6
Change PSCHED_SHIFT from 10 to 6 to increase schedulers time resolution. This will increase 16x a number of (internal) ticks per nanosecond, and is needed to improve accuracy of schedulers based on rate tables, like HTB, TBF or CBQ, with rates above 100Mbit. It is assumed this change is safe for 32bit accounting of time diffs up to 2 minutes, which should be enough for common use (extremely low rate values may overflow, so get inaccurate instead). To make full use of this change an updated iproute2 will be needed. (But using older iproute2 should be safe too.)
This change breaks ticks - microseconds similarity, so some minor code fixes might be needed. It is also planned to change naming adequately eg. to PSCHED_TICKS2NS() etc. in the near future.
---
include/net/pkt_sched.h +2 -2
@@ -41,8 +41,8 @@ static inline void *qdisc_priv(struct Qdtypedef u64 psched_time_t ;typedef long psched_tdiff_t ; -/* Avoid doing 64 bit divide by 1000 */ -#define PSCHED_SHIFT 10 +/* Avoid doing 64 bit divide */ +#define PSCHED_SHIFT 6#define PSCHED_US2NS (x) ((s64)(x) << PSCHED_SHIFT)#define PSCHED_NS2US (x) ((x) >> PSCHED_SHIFT)
From: Jarek Poplawski <[email protected]>
Date: Tue, 9 Jun 2009 08:05:13 +0000
Quoted 10 lines
Change
PSCHED_SHIFTfrom 10 to 6 to increase schedulers time resolution. This will increase 16x a number of (internal) ticks per nanosecond, and is needed to improve accuracy of schedulers based on rate tables, like HTB, TBF or CBQ, with rates above 100Mbit. It is assumed this change is safe for 32bit accounting of time diffs up to 2 minutes, which should be enough for common use (extremely low rate values may overflow, so get inaccurate instead). To make full use of this change an updated iproute2 will be needed. (But using older iproute2 should be safe too.)
Quoted 7 lines
This change breaks ticks - microseconds similarity, so some minor code fixes might be needed. It is also planned to change naming adequately eg. to
PSCHED_TICKS2NS()etc. in the near future.Reported-by Antonio Almeida <[email protected]>Tested-by Antonio Almeida <[email protected]>Signed-off-by Jarek Poplawski <[email protected]>
Applied.
[PATCH 3/2] pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
In reply to Jarek PoplawskiOn Tue, Jun 09, 2009 at 08:05:13AM +0000, Jarek Poplawski wrote:
...
Quoted 3 lines
This change breaks ticks - microseconds similarity, so some minor code fixes might be needed. It is also planned to change naming adequately eg. to
PSCHED_TICKS2NS()etc. in the near future.
-------------------->pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
Let's use TICKS instead of US, so PSCHED_TICKS2NS and PSCHED_NS2TICKS (like in PSCHED_TICKS_PER_SEC already) to avoid misleading.
---
include/net/pkt_sched.h | 8 ++++---- net/sched/sch_api.c | 4 ++-- net/sched/sch_cbq.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
include/net/pkt_sched.h +4 -4
@@ -43,15 +43,15 @@ typedef long psched_tdiff_t;/* Avoid doing 64 bit divide */ #define PSCHED_SHIFT 6 -#define PSCHED_US2NS (x) ((s64)(x) << PSCHED_SHIFT) -#define PSCHED_NS2US (x) ((x) >> PSCHED_SHIFT) +#define PSCHED_TICKS2NS (x) ((s64)(x) << PSCHED_SHIFT) +#define PSCHED_NS2TICKS (x) ((x) >> PSCHED_SHIFT) -#define PSCHED_TICKS_PER_SEC PSCHED_NS2US(NSEC_PER_SEC) +#define PSCHED_TICKS_PER_SEC PSCHED_NS2TICKS(NSEC_PER_SEC)#define PSCHED_PASTPERFECT 0static inline psched_time_t psched_get_time (void ) { -return PSCHED_NS2US (ktime_to_ns (ktime_get ())); +return PSCHED_NS2TICKS (ktime_to_ns (ktime_get ())); } static inline psched_tdiff_t
net/sched/sch_api.c +2 -2
@@ -484,7 +484,7 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) wd->qdisc->flags |=TCQ_F_THROTTLED ; time =ktime_set (0 ,0 ); - time =ktime_add_ns (time,PSCHED_US2NS (expires)); + time =ktime_add_ns (time,PSCHED_TICKS2NS (expires));hrtimer_start (&wd->timer, time,HRTIMER_MODE_ABS ); }EXPORT_SYMBOL (qdisc_watchdog_schedule);
@@ -1680,7 +1680,7 @@ static int psched_show(struct seq_file *seq, void *v)hrtimer_get_res (CLOCK_MONOTONIC , &ts);seq_printf (seq,"%08x %08x %08x %08x\n" , - (u32 )NSEC_PER_USEC , (u32 )PSCHED_US2NS (1 ), + (u32 )NSEC_PER_USEC , (u32 )PSCHED_TICKS2NS (1 ),1000000 , (u32 )NSEC_PER_SEC /(u32 )ktime_to_ns (timespec_to_ktime (ts)));
net/sched/sch_cbq.c +2 -2
@@ -509,7 +509,7 @@ static void cbq_ovl_delay(struct cbq_class *cl) q->pmask |= (1 <<TC_CBQ_MAXPRIO ); expires =ktime_set (0 ,0 ); - expires =ktime_add_ns (expires,PSCHED_US2NS (sched)); + expires =ktime_add_ns (expires,PSCHED_TICKS2NS (sched));if (hrtimer_try_to_cancel (&q->delay_timer) && ktime_to_ns(ktime_sub( hrtimer_get_expires(&q->delay_timer),
@@ -620,7 +620,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)ktime_t time; time =ktime_set (0 ,0 ); - time =ktime_add_ns (time,PSCHED_US2NS (now + delay)); + time =ktime_add_ns (time,PSCHED_TICKS2NS (now + delay));hrtimer_start (&q->delay_timer, time,HRTIMER_MODE_ABS ); }
David Miller
maintainerRe: [PATCH 3/2] pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
From: Jarek Poplawski <[email protected]>
Date: Mon, 15 Jun 2009 09:15:23 +0000
Quoted 6 lines · Jarek Poplawski
...
Quoted 3 lines
This change breaks ticks - microseconds similarity, so some minor code fixes might be needed. It is also planned to change naming adequately eg. to
PSCHED_TICKS2NS()etc. in the near future.
Quoted 7 lines
-------------------->
pkt_sched: RenamePSCHED_US2NSandPSCHED_NS2USLet's use TICKS instead of US, so
PSCHED_TICKS2NSandPSCHED_NS2TICKS(like inPSCHED_TICKS_PER_SECalready) to avoid misleading.Signed-off-by Jarek Poplawski <[email protected]>
Also applied to net-next-2.6, thanks.