diff options
| author | Patrick McHardy <kaber@trash.net> | 2004-11-10 22:52:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-11-10 22:52:44 -0800 |
| commit | 909ef4877adef308bf8aceea40bc4621ffafb533 (patch) | |
| tree | 55252daf5602b6d2f877331b19bbefda0241bd78 /include | |
| parent | 9a92429171a6d3988523db977a5adc502eeacc1a (diff) | |
[PKT_SCHED]: Fix overflow on 64bit in times reported to userspace.
This patch fixes on overflow in tc actions times reported to
userspace on 64 bit architectures. struct tcf_t only contains
32-bit timestamps, but they are initialized to jiffies. When
jiffies is larger than 2^32-1 only the low 32 bit are saved,
and the diff between jiffies and the current timestamp becomes
very large. This happens immediately after boottime since jiffies
is initialized to 2^32-300. It was invisible until now because
only the lower 32bit were reported to userspace, but with the
USER_HZ conversion the reported times start somewhere around
4294967s.
This patch extends the timestamps to 64bit. It breaks userspace
compatibility for actions, but considering that most of this is
not even in iproute yet this should be acceptable.
Signed-off-by: Patrick McHardy <kaber@trash.net>
ACK'd by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pkt_cls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index de9e1311ecbf..45ac289f1bbf 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -138,9 +138,9 @@ struct tc_police struct tcf_t { - __u32 install; - __u32 lastuse; - __u32 expires; + __u64 install; + __u64 lastuse; + __u64 expires; }; struct tc_cnt |