Stephen Hemminger wrote:
> Here is an experimental patch that changes the packet scheduler to use
> ktime instead of gettimeofday. This should be faster on 64 bit and avoid some
> of
> the math overhead issues with previous code.
>
> Also since it uses monotonic clock, it won't cause timing glitches when NTP
> adjusts the clock.
This looks like a good idea, even if we can't take full advantage
of the higher precision for now.
BTW, any news on the iproute patches I sent you for this?
> --- netem.orig/include/net/pkt_sched.h 2007-02-22 12:08:53.000000000
> -0800
> +++ netem/include/net/pkt_sched.h 2007-02-22 14:21:57.000000000 -0800
> @@ -56,19 +56,48 @@
>
> #ifdef CONFIG_NET_SCH_CLK_GETTIMEOFDAY
>
> -typedef struct timeval psched_time_t;
> -typedef long psched_tdiff_t;
> +typedef ktime_t psched_time_t;
> +typedef long psched_tdiff_t;
> +
> +/* Avoid doing 64 bit divide by 1000 */
> +#define PSCHED_US2NS(x) ((s64)(x) << 10)
> +#define PSCHED_NS2US(x) ((x) >> 10)
Since you use this for PSCHED_TDIFF etc, the resulting values
are not exactly microseconds anymore. You need to adjust
psched_us_per_tick/psched_tick_per_us so userspace can
correctly calculate time values.
> -#define PSCHED_GET_TIME(stamp) do_gettimeofday(&(stamp))
> +#define PSCHED_GET_TIME(stamp) ((stamp) = ktime_get())
> #define PSCHED_US2JIFFIE(usecs) usecs_to_jiffies(usecs)
> #define PSCHED_JIFFIE2US(delay) jiffies_to_usecs(delay)
Both of these need to take into account that its not real
microseconds anymore.
Please also fix up the HFSC PSCHED_GET_TIME redefinition,
it expects the results to be usable with these macros.
> +static inline psched_tdiff_t psched_diff(const psched_time_t tv1,
> + const psched_time_t tv2)
> +{
> + return PSCHED_NS2US(ktime_to_ns(ktime_sub(tv1, tv2)));
> +}
> +
> +#define PSCHED_TDIFF(tv1, tv2) psched_diff(tv1, tv2)
> +#define PSCHED_TDIFF_SAFE(tv1, tv2, bound) \
> + min_t(long, psched_diff((tv1),(tv2)), bound)
> +
> +static inline psched_time_t psched_add(const psched_time_t tv1, u32 usec)
> +{
> + u64 ns = PSCHED_US2NS(usec);
> + return ktime_add_ns(tv1, ns);
> +}
> +
> +#define PSCHED_TLESS(tv1, tv2) ((tv1).tv64 < (tv2).tv64)
> +#define PSCHED_TADD(tv, delta) psched_add((tv), (delta))
> +#define PSCHED_TADD2(tv, delta, tv_res) ((tv_res) = psched_add((tv),
> (delta)))
> +
> +/* Set/check that time is in the "past perfect" */
> +
> +#define PSCHED_SET_PASTPERFECT(t) ((t).tv64 = 0)
> +#define PSCHED_IS_PASTPERFECT(t) ((t).tv64 == 0)
Maybe use one of the 32 bit members, I guess that will generate
better code on 32 bit.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
