diff options
Diffstat (limited to 'include/net/pkt_sched.h')
-rw-r--r-- | include/net/pkt_sched.h | 182 |
1 files changed, 22 insertions, 160 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index f6afee73235d..5754d53d9efc 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define __NET_PKT_SCHED_H | 2 | #define __NET_PKT_SCHED_H |
3 | 3 | ||
4 | #include <linux/jiffies.h> | 4 | #include <linux/jiffies.h> |
5 | #include <linux/ktime.h> | ||
5 | #include <net/sch_generic.h> | 6 | #include <net/sch_generic.h> |
6 | 7 | ||
7 | struct qdisc_walker | 8 | struct qdisc_walker |
@@ -12,8 +13,6 @@ struct qdisc_walker | |||
12 | int (*fn)(struct Qdisc *, unsigned long cl, struct qdisc_walker *); | 13 | int (*fn)(struct Qdisc *, unsigned long cl, struct qdisc_walker *); |
13 | }; | 14 | }; |
14 | 15 | ||
15 | extern rwlock_t qdisc_tree_lock; | ||
16 | |||
17 | #define QDISC_ALIGNTO 32 | 16 | #define QDISC_ALIGNTO 32 |
18 | #define QDISC_ALIGN(len) (((len) + QDISC_ALIGNTO-1) & ~(QDISC_ALIGNTO-1)) | 17 | #define QDISC_ALIGN(len) (((len) + QDISC_ALIGNTO-1) & ~(QDISC_ALIGNTO-1)) |
19 | 18 | ||
@@ -37,175 +36,38 @@ static inline void *qdisc_priv(struct Qdisc *q) | |||
37 | The things are not so bad, because we may use artifical | 36 | The things are not so bad, because we may use artifical |
38 | clock evaluated by integration of network data flow | 37 | clock evaluated by integration of network data flow |
39 | in the most critical places. | 38 | in the most critical places. |
40 | |||
41 | Note: we do not use fastgettimeofday. | ||
42 | The reason is that, when it is not the same thing as | ||
43 | gettimeofday, it returns invalid timestamp, which is | ||
44 | not updated, when net_bh is active. | ||
45 | */ | ||
46 | |||
47 | /* General note about internal clock. | ||
48 | |||
49 | Any clock source returns time intervals, measured in units | ||
50 | close to 1usec. With source CONFIG_NET_SCH_CLK_GETTIMEOFDAY it is precisely | ||
51 | microseconds, otherwise something close but different chosen to minimize | ||
52 | arithmetic cost. Ratio usec/internal untis in form nominator/denominator | ||
53 | may be read from /proc/net/psched. | ||
54 | */ | 39 | */ |
55 | 40 | ||
56 | |||
57 | #ifdef CONFIG_NET_SCH_CLK_GETTIMEOFDAY | ||
58 | |||
59 | typedef struct timeval psched_time_t; | ||
60 | typedef long psched_tdiff_t; | ||
61 | |||
62 | #define PSCHED_GET_TIME(stamp) do_gettimeofday(&(stamp)) | ||
63 | #define PSCHED_US2JIFFIE(usecs) usecs_to_jiffies(usecs) | ||
64 | #define PSCHED_JIFFIE2US(delay) jiffies_to_usecs(delay) | ||
65 | |||
66 | #else /* !CONFIG_NET_SCH_CLK_GETTIMEOFDAY */ | ||
67 | |||
68 | typedef u64 psched_time_t; | 41 | typedef u64 psched_time_t; |
69 | typedef long psched_tdiff_t; | 42 | typedef long psched_tdiff_t; |
70 | 43 | ||
71 | #ifdef CONFIG_NET_SCH_CLK_JIFFIES | 44 | /* Avoid doing 64 bit divide by 1000 */ |
72 | 45 | #define PSCHED_US2NS(x) ((s64)(x) << 10) | |
73 | #if HZ < 96 | 46 | #define PSCHED_NS2US(x) ((x) >> 10) |
74 | #define PSCHED_JSCALE 14 | ||
75 | #elif HZ >= 96 && HZ < 192 | ||
76 | #define PSCHED_JSCALE 13 | ||
77 | #elif HZ >= 192 && HZ < 384 | ||
78 | #define PSCHED_JSCALE 12 | ||
79 | #elif HZ >= 384 && HZ < 768 | ||
80 | #define PSCHED_JSCALE 11 | ||
81 | #elif HZ >= 768 | ||
82 | #define PSCHED_JSCALE 10 | ||
83 | #endif | ||
84 | 47 | ||
85 | #define PSCHED_GET_TIME(stamp) ((stamp) = (get_jiffies_64()<<PSCHED_JSCALE)) | 48 | #define PSCHED_TICKS_PER_SEC PSCHED_NS2US(NSEC_PER_SEC) |
86 | #define PSCHED_US2JIFFIE(delay) (((delay)+(1<<PSCHED_JSCALE)-1)>>PSCHED_JSCALE) | 49 | #define PSCHED_PASTPERFECT 0 |
87 | #define PSCHED_JIFFIE2US(delay) ((delay)<<PSCHED_JSCALE) | 50 | |
88 | 51 | static inline psched_time_t psched_get_time(void) | |
89 | #endif /* CONFIG_NET_SCH_CLK_JIFFIES */ | ||
90 | #ifdef CONFIG_NET_SCH_CLK_CPU | ||
91 | #include <asm/timex.h> | ||
92 | |||
93 | extern psched_tdiff_t psched_clock_per_hz; | ||
94 | extern int psched_clock_scale; | ||
95 | extern psched_time_t psched_time_base; | ||
96 | extern cycles_t psched_time_mark; | ||
97 | |||
98 | #define PSCHED_GET_TIME(stamp) \ | ||
99 | do { \ | ||
100 | cycles_t cur = get_cycles(); \ | ||
101 | if (sizeof(cycles_t) == sizeof(u32)) { \ | ||
102 | if (cur <= psched_time_mark) \ | ||
103 | psched_time_base += 0x100000000ULL; \ | ||
104 | psched_time_mark = cur; \ | ||
105 | (stamp) = (psched_time_base + cur)>>psched_clock_scale; \ | ||
106 | } else { \ | ||
107 | (stamp) = cur>>psched_clock_scale; \ | ||
108 | } \ | ||
109 | } while (0) | ||
110 | #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz) | ||
111 | #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz) | ||
112 | |||
113 | #endif /* CONFIG_NET_SCH_CLK_CPU */ | ||
114 | |||
115 | #endif /* !CONFIG_NET_SCH_CLK_GETTIMEOFDAY */ | ||
116 | |||
117 | #ifdef CONFIG_NET_SCH_CLK_GETTIMEOFDAY | ||
118 | #define PSCHED_TDIFF(tv1, tv2) \ | ||
119 | ({ \ | ||
120 | int __delta_sec = (tv1).tv_sec - (tv2).tv_sec; \ | ||
121 | int __delta = (tv1).tv_usec - (tv2).tv_usec; \ | ||
122 | if (__delta_sec) { \ | ||
123 | switch (__delta_sec) { \ | ||
124 | default: \ | ||
125 | __delta = 0; \ | ||
126 | case 2: \ | ||
127 | __delta += USEC_PER_SEC; \ | ||
128 | case 1: \ | ||
129 | __delta += USEC_PER_SEC; \ | ||
130 | } \ | ||
131 | } \ | ||
132 | __delta; \ | ||
133 | }) | ||
134 | |||
135 | static inline int | ||
136 | psched_tod_diff(int delta_sec, int bound) | ||
137 | { | 52 | { |
138 | int delta; | 53 | return PSCHED_NS2US(ktime_to_ns(ktime_get())); |
139 | |||
140 | if (bound <= USEC_PER_SEC || delta_sec > (0x7FFFFFFF/USEC_PER_SEC)-1) | ||
141 | return bound; | ||
142 | delta = delta_sec * USEC_PER_SEC; | ||
143 | if (delta > bound || delta < 0) | ||
144 | delta = bound; | ||
145 | return delta; | ||
146 | } | 54 | } |
147 | 55 | ||
148 | #define PSCHED_TDIFF_SAFE(tv1, tv2, bound) \ | 56 | static inline psched_tdiff_t |
149 | ({ \ | 57 | psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound) |
150 | int __delta_sec = (tv1).tv_sec - (tv2).tv_sec; \ | 58 | { |
151 | int __delta = (tv1).tv_usec - (tv2).tv_usec; \ | 59 | return min(tv1 - tv2, bound); |
152 | switch (__delta_sec) { \ | 60 | } |
153 | default: \ | ||
154 | __delta = psched_tod_diff(__delta_sec, bound); break; \ | ||
155 | case 2: \ | ||
156 | __delta += USEC_PER_SEC; \ | ||
157 | case 1: \ | ||
158 | __delta += USEC_PER_SEC; \ | ||
159 | case 0: \ | ||
160 | if (__delta > bound || __delta < 0) \ | ||
161 | __delta = bound; \ | ||
162 | } \ | ||
163 | __delta; \ | ||
164 | }) | ||
165 | |||
166 | #define PSCHED_TLESS(tv1, tv2) (((tv1).tv_usec < (tv2).tv_usec && \ | ||
167 | (tv1).tv_sec <= (tv2).tv_sec) || \ | ||
168 | (tv1).tv_sec < (tv2).tv_sec) | ||
169 | |||
170 | #define PSCHED_TADD2(tv, delta, tv_res) \ | ||
171 | ({ \ | ||
172 | int __delta = (tv).tv_usec + (delta); \ | ||
173 | (tv_res).tv_sec = (tv).tv_sec; \ | ||
174 | while (__delta >= USEC_PER_SEC) { (tv_res).tv_sec++; __delta -= USEC_PER_SEC; } \ | ||
175 | (tv_res).tv_usec = __delta; \ | ||
176 | }) | ||
177 | |||
178 | #define PSCHED_TADD(tv, delta) \ | ||
179 | ({ \ | ||
180 | (tv).tv_usec += (delta); \ | ||
181 | while ((tv).tv_usec >= USEC_PER_SEC) { (tv).tv_sec++; \ | ||
182 | (tv).tv_usec -= USEC_PER_SEC; } \ | ||
183 | }) | ||
184 | |||
185 | /* Set/check that time is in the "past perfect"; | ||
186 | it depends on concrete representation of system time | ||
187 | */ | ||
188 | |||
189 | #define PSCHED_SET_PASTPERFECT(t) ((t).tv_sec = 0) | ||
190 | #define PSCHED_IS_PASTPERFECT(t) ((t).tv_sec == 0) | ||
191 | |||
192 | #define PSCHED_AUDIT_TDIFF(t) ({ if ((t) > 2000000) (t) = 2000000; }) | ||
193 | |||
194 | #else /* !CONFIG_NET_SCH_CLK_GETTIMEOFDAY */ | ||
195 | |||
196 | #define PSCHED_TDIFF(tv1, tv2) (long)((tv1) - (tv2)) | ||
197 | #define PSCHED_TDIFF_SAFE(tv1, tv2, bound) \ | ||
198 | min_t(long long, (tv1) - (tv2), bound) | ||
199 | |||
200 | 61 | ||
201 | #define PSCHED_TLESS(tv1, tv2) ((tv1) < (tv2)) | 62 | struct qdisc_watchdog { |
202 | #define PSCHED_TADD2(tv, delta, tv_res) ((tv_res) = (tv) + (delta)) | 63 | struct hrtimer timer; |
203 | #define PSCHED_TADD(tv, delta) ((tv) += (delta)) | 64 | struct Qdisc *qdisc; |
204 | #define PSCHED_SET_PASTPERFECT(t) ((t) = 0) | 65 | }; |
205 | #define PSCHED_IS_PASTPERFECT(t) ((t) == 0) | ||
206 | #define PSCHED_AUDIT_TDIFF(t) | ||
207 | 66 | ||
208 | #endif /* !CONFIG_NET_SCH_CLK_GETTIMEOFDAY */ | 67 | extern void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc); |
68 | extern void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, | ||
69 | psched_time_t expires); | ||
70 | extern void qdisc_watchdog_cancel(struct qdisc_watchdog *wd); | ||
209 | 71 | ||
210 | extern struct Qdisc_ops pfifo_qdisc_ops; | 72 | extern struct Qdisc_ops pfifo_qdisc_ops; |
211 | extern struct Qdisc_ops bfifo_qdisc_ops; | 73 | extern struct Qdisc_ops bfifo_qdisc_ops; |