1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * net/sched/sch_htb.c Hierarchical token buc 2 * net/sched/sch_htb.c Hierarchical token bucket, feed tree version
4 * 3 *
>> 4 * This program is free software; you can redistribute it and/or
>> 5 * modify it under the terms of the GNU General Public License
>> 6 * as published by the Free Software Foundation; either version
>> 7 * 2 of the License, or (at your option) any later version.
>> 8 *
5 * Authors: Martin Devera, <devik@cdi.cz> 9 * Authors: Martin Devera, <devik@cdi.cz>
6 * 10 *
7 * Credits (in time order) for older HTB versi 11 * Credits (in time order) for older HTB versions:
8 * Stef Coene <stef.coene@docum.o 12 * Stef Coene <stef.coene@docum.org>
9 * HTB support at LARTC m 13 * HTB support at LARTC mailing list
10 * Ondrej Kraus, <krauso@barr.cz> 14 * Ondrej Kraus, <krauso@barr.cz>
11 * found missing INIT_QDI 15 * found missing INIT_QDISC(htb)
12 * Vladimir Smelhaus, Aamer Akhte 16 * Vladimir Smelhaus, Aamer Akhter, Bert Hubert
13 * helped a lot to locate 17 * helped a lot to locate nasty class stall bug
14 * Andi Kleen, Jamal Hadi, Bert H 18 * Andi Kleen, Jamal Hadi, Bert Hubert
15 * code review and helpfu 19 * code review and helpful comments on shaping
16 * Tomasz Wrona, <tw@eter.tym.pl> 20 * Tomasz Wrona, <tw@eter.tym.pl>
17 * created test case so t 21 * created test case so that I was able to fix nasty bug
18 * Wilfried Weissmann 22 * Wilfried Weissmann
19 * spotted bug in dequeue 23 * spotted bug in dequeue code and helped with fix
20 * Jiri Fojtasek 24 * Jiri Fojtasek
21 * fixed requeue routine 25 * fixed requeue routine
22 * and many others. thanks. 26 * and many others. thanks.
23 */ 27 */
24 #include <linux/module.h> 28 #include <linux/module.h>
25 #include <linux/moduleparam.h> 29 #include <linux/moduleparam.h>
26 #include <linux/types.h> 30 #include <linux/types.h>
27 #include <linux/kernel.h> 31 #include <linux/kernel.h>
28 #include <linux/string.h> 32 #include <linux/string.h>
29 #include <linux/errno.h> 33 #include <linux/errno.h>
30 #include <linux/skbuff.h> 34 #include <linux/skbuff.h>
31 #include <linux/list.h> 35 #include <linux/list.h>
32 #include <linux/compiler.h> 36 #include <linux/compiler.h>
33 #include <linux/rbtree.h> 37 #include <linux/rbtree.h>
34 #include <linux/workqueue.h> 38 #include <linux/workqueue.h>
35 #include <linux/slab.h> 39 #include <linux/slab.h>
36 #include <net/netlink.h> 40 #include <net/netlink.h>
37 #include <net/sch_generic.h> 41 #include <net/sch_generic.h>
38 #include <net/pkt_sched.h> 42 #include <net/pkt_sched.h>
39 #include <net/pkt_cls.h> 43 #include <net/pkt_cls.h>
40 44
41 /* HTB algorithm. 45 /* HTB algorithm.
42 Author: devik@cdi.cz 46 Author: devik@cdi.cz
43 ========================================== 47 ========================================================================
44 HTB is like TBF with multiple classes. It 48 HTB is like TBF with multiple classes. It is also similar to CBQ because
45 it allows to assign priority to each class 49 it allows to assign priority to each class in hierarchy.
46 In fact it is another implementation of Fl 50 In fact it is another implementation of Floyd's formal sharing.
47 51
48 Levels: 52 Levels:
49 Each class is assigned level. Leaf has ALW 53 Each class is assigned level. Leaf has ALWAYS level 0 and root
50 classes have level TC_HTB_MAXDEPTH-1. Inte 54 classes have level TC_HTB_MAXDEPTH-1. Interior nodes has level
51 one less than their parent. 55 one less than their parent.
52 */ 56 */
53 57
54 static int htb_hysteresis __read_mostly = 0; / 58 static int htb_hysteresis __read_mostly = 0; /* whether to use mode hysteresis for speedup */
55 #define HTB_VER 0x30011 /* major must !! 59 #define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */
56 60
57 #if HTB_VER >> 16 != TC_HTB_PROTOVER 61 #if HTB_VER >> 16 != TC_HTB_PROTOVER
58 #error "Mismatched sch_htb.c and pkt_sch.h" 62 #error "Mismatched sch_htb.c and pkt_sch.h"
59 #endif 63 #endif
60 64
61 /* Module parameter and sysfs export */ 65 /* Module parameter and sysfs export */
62 module_param (htb_hysteresis, int, 0640); 66 module_param (htb_hysteresis, int, 0640);
63 MODULE_PARM_DESC(htb_hysteresis, "Hysteresis m 67 MODULE_PARM_DESC(htb_hysteresis, "Hysteresis mode, less CPU load, less accurate");
64 68
65 static int htb_rate_est = 0; /* htb classes ha 69 static int htb_rate_est = 0; /* htb classes have a default rate estimator */
66 module_param(htb_rate_est, int, 0640); 70 module_param(htb_rate_est, int, 0640);
67 MODULE_PARM_DESC(htb_rate_est, "setup a defaul 71 MODULE_PARM_DESC(htb_rate_est, "setup a default rate estimator (4sec 16sec) for htb classes");
68 72
69 /* used internaly to keep status of single cla 73 /* used internaly to keep status of single class */
70 enum htb_cmode { 74 enum htb_cmode {
71 HTB_CANT_SEND, /* class can't 75 HTB_CANT_SEND, /* class can't send and can't borrow */
72 HTB_MAY_BORROW, /* class can't 76 HTB_MAY_BORROW, /* class can't send but may borrow */
73 HTB_CAN_SEND /* class can s 77 HTB_CAN_SEND /* class can send */
74 }; 78 };
75 79
76 struct htb_prio { 80 struct htb_prio {
77 union { 81 union {
78 struct rb_root row; 82 struct rb_root row;
79 struct rb_root feed; 83 struct rb_root feed;
80 }; 84 };
81 struct rb_node *ptr; 85 struct rb_node *ptr;
82 /* When class changes from state 1->2 86 /* When class changes from state 1->2 and disconnects from
83 * parent's feed then we lost ptr valu 87 * parent's feed then we lost ptr value and start from the
84 * first child again. Here we store cl 88 * first child again. Here we store classid of the
85 * last valid ptr (used when ptr is NU 89 * last valid ptr (used when ptr is NULL).
86 */ 90 */
87 u32 last_ptr_id; 91 u32 last_ptr_id;
88 }; 92 };
89 93
90 /* interior & leaf nodes; props specific to le 94 /* interior & leaf nodes; props specific to leaves are marked L:
91 * To reduce false sharing, place mostly read 95 * To reduce false sharing, place mostly read fields at beginning,
92 * and mostly written ones at the end. 96 * and mostly written ones at the end.
93 */ 97 */
94 struct htb_class { 98 struct htb_class {
95 struct Qdisc_class_common common; 99 struct Qdisc_class_common common;
96 struct psched_ratecfg rate; 100 struct psched_ratecfg rate;
97 struct psched_ratecfg ceil; 101 struct psched_ratecfg ceil;
98 s64 buffer, cbuffe 102 s64 buffer, cbuffer;/* token bucket depth/rate */
99 s64 mbuffer; 103 s64 mbuffer; /* max wait time */
100 u32 prio; 104 u32 prio; /* these two are used only by leaves... */
101 int quantum; 105 int quantum; /* but stored for parent-to-leaf return */
102 106
103 struct tcf_proto __rcu *filter_list; 107 struct tcf_proto __rcu *filter_list; /* class attached filters */
104 struct tcf_block *block; !! 108 int filter_cnt;
>> 109 int refcnt; /* usage count of this class */
105 110
106 int level; 111 int level; /* our level (see above) */
107 unsigned int children; 112 unsigned int children;
108 struct htb_class *parent; 113 struct htb_class *parent; /* parent class */
109 114
110 struct net_rate_estimator __rcu *rate_ 115 struct net_rate_estimator __rcu *rate_est;
111 116
112 /* 117 /*
113 * Written often fields 118 * Written often fields
114 */ 119 */
115 struct gnet_stats_basic_sync bstats; !! 120 struct gnet_stats_basic_packed bstats;
116 struct gnet_stats_basic_sync bstats_bi <<
117 struct tc_htb_xstats xstats; /* our 121 struct tc_htb_xstats xstats; /* our special stats */
118 122
119 /* token bucket parameters */ 123 /* token bucket parameters */
120 s64 tokens, ctoken 124 s64 tokens, ctokens;/* current number of tokens */
121 s64 t_c; 125 s64 t_c; /* checkpoint time */
122 126
123 union { 127 union {
124 struct htb_class_leaf { 128 struct htb_class_leaf {
>> 129 struct list_head drop_list;
125 int defici 130 int deficit[TC_HTB_MAXDEPTH];
126 struct Qdisc *q; 131 struct Qdisc *q;
127 struct netdev_queue *o <<
128 } leaf; 132 } leaf;
129 struct htb_class_inner { 133 struct htb_class_inner {
130 struct htb_prio clprio 134 struct htb_prio clprio[TC_HTB_NUMPRIO];
131 } inner; 135 } inner;
132 }; !! 136 } un;
133 s64 pq_key; 137 s64 pq_key;
134 138
135 int prio_activity; 139 int prio_activity; /* for which prios are we active */
136 enum htb_cmode cmode; 140 enum htb_cmode cmode; /* current mode of the class */
137 struct rb_node pq_node; 141 struct rb_node pq_node; /* node for event queue */
138 struct rb_node node[TC_HTB_NU 142 struct rb_node node[TC_HTB_NUMPRIO]; /* node for self or feed tree */
139 143
140 unsigned int drops ____cacheline_align 144 unsigned int drops ____cacheline_aligned_in_smp;
141 unsigned int overlimits; <<
142 }; 145 };
143 146
144 struct htb_level { 147 struct htb_level {
145 struct rb_root wait_pq; 148 struct rb_root wait_pq;
146 struct htb_prio hprio[TC_HTB_NUMPRIO]; 149 struct htb_prio hprio[TC_HTB_NUMPRIO];
147 }; 150 };
148 151
149 struct htb_sched { 152 struct htb_sched {
150 struct Qdisc_class_hash clhash; 153 struct Qdisc_class_hash clhash;
151 int defcls; 154 int defcls; /* class where unclassified flows go to */
152 int rate2quantum; 155 int rate2quantum; /* quant = rate / rate2quantum */
153 156
154 /* filters for qdisc itself */ 157 /* filters for qdisc itself */
155 struct tcf_proto __rcu *filter_list; 158 struct tcf_proto __rcu *filter_list;
156 struct tcf_block *block; <<
157 159
158 #define HTB_WARN_TOOMANYEVENTS 0x1 160 #define HTB_WARN_TOOMANYEVENTS 0x1
159 unsigned int warned; /* onl 161 unsigned int warned; /* only one warning */
160 int direct_qlen; 162 int direct_qlen;
161 struct work_struct work; 163 struct work_struct work;
162 164
163 /* non shaped skbs; let them go direct 165 /* non shaped skbs; let them go directly thru */
164 struct qdisc_skb_head direct_queue; 166 struct qdisc_skb_head direct_queue;
165 u32 direct_pkts; !! 167 long direct_pkts;
166 u32 overlimits; <<
167 168
168 struct qdisc_watchdog watchdog; 169 struct qdisc_watchdog watchdog;
169 170
170 s64 now; /* cac 171 s64 now; /* cached dequeue time */
>> 172 struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */
171 173
172 /* time of nearest event per level (ro 174 /* time of nearest event per level (row) */
173 s64 near_ev_cache[ 175 s64 near_ev_cache[TC_HTB_MAXDEPTH];
174 176
175 int row_mask[TC_HT 177 int row_mask[TC_HTB_MAXDEPTH];
176 178
177 struct htb_level hlevel[TC_HTB_ 179 struct htb_level hlevel[TC_HTB_MAXDEPTH];
178 <<
179 struct Qdisc **direct_qdisc <<
180 unsigned int num_direct_qdi <<
181 <<
182 bool offload; <<
183 }; 180 };
184 181
185 /* find class in global hash table using given 182 /* find class in global hash table using given handle */
186 static inline struct htb_class *htb_find(u32 h 183 static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
187 { 184 {
188 struct htb_sched *q = qdisc_priv(sch); 185 struct htb_sched *q = qdisc_priv(sch);
189 struct Qdisc_class_common *clc; 186 struct Qdisc_class_common *clc;
190 187
191 clc = qdisc_class_find(&q->clhash, han 188 clc = qdisc_class_find(&q->clhash, handle);
192 if (clc == NULL) 189 if (clc == NULL)
193 return NULL; 190 return NULL;
194 return container_of(clc, struct htb_cl 191 return container_of(clc, struct htb_class, common);
195 } 192 }
196 193
197 static unsigned long htb_search(struct Qdisc * <<
198 { <<
199 return (unsigned long)htb_find(handle, <<
200 } <<
201 <<
202 #define HTB_DIRECT ((struct htb_class *)-1L) <<
203 <<
204 /** 194 /**
205 * htb_classify - classify a packet into class 195 * htb_classify - classify a packet into class
206 * @skb: the socket buffer <<
207 * @sch: the active queue discipline <<
208 * @qerr: pointer for returned status code <<
209 * 196 *
210 * It returns NULL if the packet should be dro 197 * It returns NULL if the packet should be dropped or -1 if the packet
211 * should be passed directly thru. In all othe 198 * should be passed directly thru. In all other cases leaf class is returned.
212 * We allow direct class selection by classid 199 * We allow direct class selection by classid in priority. The we examine
213 * filters in qdisc and in inner nodes (if hig 200 * filters in qdisc and in inner nodes (if higher filter points to the inner
214 * node). If we end up with classid MAJOR:0 we 201 * node). If we end up with classid MAJOR:0 we enqueue the skb into special
215 * internal fifo (direct). These packets then 202 * internal fifo (direct). These packets then go directly thru. If we still
216 * have no valid leaf we try to use MAJOR:defa 203 * have no valid leaf we try to use MAJOR:default leaf. It still unsuccessful
217 * then finish and return direct queue. 204 * then finish and return direct queue.
218 */ 205 */
>> 206 #define HTB_DIRECT ((struct htb_class *)-1L)
>> 207
219 static struct htb_class *htb_classify(struct s 208 static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
220 int *qer 209 int *qerr)
221 { 210 {
222 struct htb_sched *q = qdisc_priv(sch); 211 struct htb_sched *q = qdisc_priv(sch);
223 struct htb_class *cl; 212 struct htb_class *cl;
224 struct tcf_result res; 213 struct tcf_result res;
225 struct tcf_proto *tcf; 214 struct tcf_proto *tcf;
226 int result; 215 int result;
227 216
228 /* allow to select class by setting sk 217 /* allow to select class by setting skb->priority to valid classid;
229 * note that nfmark can be used too by 218 * note that nfmark can be used too by attaching filter fw with no
230 * rules in it 219 * rules in it
231 */ 220 */
232 if (skb->priority == sch->handle) 221 if (skb->priority == sch->handle)
233 return HTB_DIRECT; /* X:0 222 return HTB_DIRECT; /* X:0 (direct flow) selected */
234 cl = htb_find(skb->priority, sch); 223 cl = htb_find(skb->priority, sch);
235 if (cl) { 224 if (cl) {
236 if (cl->level == 0) 225 if (cl->level == 0)
237 return cl; 226 return cl;
238 /* Start with inner filter cha 227 /* Start with inner filter chain if a non-leaf class is selected */
239 tcf = rcu_dereference_bh(cl->f 228 tcf = rcu_dereference_bh(cl->filter_list);
240 } else { 229 } else {
241 tcf = rcu_dereference_bh(q->fi 230 tcf = rcu_dereference_bh(q->filter_list);
242 } 231 }
243 232
244 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_ 233 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
245 while (tcf && (result = tcf_classify(s !! 234 while (tcf && (result = tc_classify(skb, tcf, &res, false)) >= 0) {
246 #ifdef CONFIG_NET_CLS_ACT 235 #ifdef CONFIG_NET_CLS_ACT
247 switch (result) { 236 switch (result) {
248 case TC_ACT_QUEUED: 237 case TC_ACT_QUEUED:
249 case TC_ACT_STOLEN: 238 case TC_ACT_STOLEN:
250 case TC_ACT_TRAP: <<
251 *qerr = NET_XMIT_SUCCE 239 *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
252 fallthrough; <<
253 case TC_ACT_SHOT: 240 case TC_ACT_SHOT:
254 return NULL; 241 return NULL;
255 } 242 }
256 #endif 243 #endif
257 cl = (void *)res.class; 244 cl = (void *)res.class;
258 if (!cl) { 245 if (!cl) {
259 if (res.classid == sch 246 if (res.classid == sch->handle)
260 return HTB_DIR 247 return HTB_DIRECT; /* X:0 (direct flow) */
261 cl = htb_find(res.clas 248 cl = htb_find(res.classid, sch);
262 if (!cl) 249 if (!cl)
263 break; /* fil 250 break; /* filter selected invalid classid */
264 } 251 }
265 if (!cl->level) 252 if (!cl->level)
266 return cl; /* we 253 return cl; /* we hit leaf; return it */
267 254
268 /* we have got inner class; ap 255 /* we have got inner class; apply inner filter chain */
269 tcf = rcu_dereference_bh(cl->f 256 tcf = rcu_dereference_bh(cl->filter_list);
270 } 257 }
271 /* classification failed; try to use d 258 /* classification failed; try to use default class */
272 cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch-> 259 cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch->handle), q->defcls), sch);
273 if (!cl || cl->level) 260 if (!cl || cl->level)
274 return HTB_DIRECT; /* bad 261 return HTB_DIRECT; /* bad default .. this is safe bet */
275 return cl; 262 return cl;
276 } 263 }
277 264
278 /** 265 /**
279 * htb_add_to_id_tree - adds class to the roun 266 * htb_add_to_id_tree - adds class to the round robin list
280 * @root: the root of the tree <<
281 * @cl: the class to add <<
282 * @prio: the give prio in class <<
283 * 267 *
284 * Routine adds class to the list (actually tr 268 * Routine adds class to the list (actually tree) sorted by classid.
285 * Make sure that class is not already on such 269 * Make sure that class is not already on such list for given prio.
286 */ 270 */
287 static void htb_add_to_id_tree(struct rb_root 271 static void htb_add_to_id_tree(struct rb_root *root,
288 struct htb_clas 272 struct htb_class *cl, int prio)
289 { 273 {
290 struct rb_node **p = &root->rb_node, * 274 struct rb_node **p = &root->rb_node, *parent = NULL;
291 275
292 while (*p) { 276 while (*p) {
293 struct htb_class *c; 277 struct htb_class *c;
294 parent = *p; 278 parent = *p;
295 c = rb_entry(parent, struct ht 279 c = rb_entry(parent, struct htb_class, node[prio]);
296 280
297 if (cl->common.classid > c->co 281 if (cl->common.classid > c->common.classid)
298 p = &parent->rb_right; 282 p = &parent->rb_right;
299 else 283 else
300 p = &parent->rb_left; 284 p = &parent->rb_left;
301 } 285 }
302 rb_link_node(&cl->node[prio], parent, 286 rb_link_node(&cl->node[prio], parent, p);
303 rb_insert_color(&cl->node[prio], root) 287 rb_insert_color(&cl->node[prio], root);
304 } 288 }
305 289
306 /** 290 /**
307 * htb_add_to_wait_tree - adds class to the ev 291 * htb_add_to_wait_tree - adds class to the event queue with delay
308 * @q: the priority event queue <<
309 * @cl: the class to add <<
310 * @delay: delay in microseconds <<
311 * 292 *
312 * The class is added to priority event queue 293 * The class is added to priority event queue to indicate that class will
313 * change its mode in cl->pq_key microseconds. 294 * change its mode in cl->pq_key microseconds. Make sure that class is not
314 * already in the queue. 295 * already in the queue.
315 */ 296 */
316 static void htb_add_to_wait_tree(struct htb_sc 297 static void htb_add_to_wait_tree(struct htb_sched *q,
317 struct htb_cl 298 struct htb_class *cl, s64 delay)
318 { 299 {
319 struct rb_node **p = &q->hlevel[cl->le 300 struct rb_node **p = &q->hlevel[cl->level].wait_pq.rb_node, *parent = NULL;
320 301
321 cl->pq_key = q->now + delay; 302 cl->pq_key = q->now + delay;
322 if (cl->pq_key == q->now) 303 if (cl->pq_key == q->now)
323 cl->pq_key++; 304 cl->pq_key++;
324 305
325 /* update the nearest event cache */ 306 /* update the nearest event cache */
326 if (q->near_ev_cache[cl->level] > cl-> 307 if (q->near_ev_cache[cl->level] > cl->pq_key)
327 q->near_ev_cache[cl->level] = 308 q->near_ev_cache[cl->level] = cl->pq_key;
328 309
329 while (*p) { 310 while (*p) {
330 struct htb_class *c; 311 struct htb_class *c;
331 parent = *p; 312 parent = *p;
332 c = rb_entry(parent, struct ht 313 c = rb_entry(parent, struct htb_class, pq_node);
333 if (cl->pq_key >= c->pq_key) 314 if (cl->pq_key >= c->pq_key)
334 p = &parent->rb_right; 315 p = &parent->rb_right;
335 else 316 else
336 p = &parent->rb_left; 317 p = &parent->rb_left;
337 } 318 }
338 rb_link_node(&cl->pq_node, parent, p); 319 rb_link_node(&cl->pq_node, parent, p);
339 rb_insert_color(&cl->pq_node, &q->hlev 320 rb_insert_color(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
340 } 321 }
341 322
342 /** 323 /**
343 * htb_next_rb_node - finds next node in binar 324 * htb_next_rb_node - finds next node in binary tree
344 * @n: the current node in binary tree <<
345 * 325 *
346 * When we are past last key we return NULL. 326 * When we are past last key we return NULL.
347 * Average complexity is 2 steps per call. 327 * Average complexity is 2 steps per call.
348 */ 328 */
349 static inline void htb_next_rb_node(struct rb_ 329 static inline void htb_next_rb_node(struct rb_node **n)
350 { 330 {
351 *n = rb_next(*n); 331 *n = rb_next(*n);
352 } 332 }
353 333
354 /** 334 /**
355 * htb_add_class_to_row - add class to its row 335 * htb_add_class_to_row - add class to its row
356 * @q: the priority event queue <<
357 * @cl: the class to add <<
358 * @mask: the given priorities in class in bit <<
359 * 336 *
360 * The class is added to row at priorities mar 337 * The class is added to row at priorities marked in mask.
361 * It does nothing if mask == 0. 338 * It does nothing if mask == 0.
362 */ 339 */
363 static inline void htb_add_class_to_row(struct 340 static inline void htb_add_class_to_row(struct htb_sched *q,
364 struct 341 struct htb_class *cl, int mask)
365 { 342 {
366 q->row_mask[cl->level] |= mask; 343 q->row_mask[cl->level] |= mask;
367 while (mask) { 344 while (mask) {
368 int prio = ffz(~mask); 345 int prio = ffz(~mask);
369 mask &= ~(1 << prio); 346 mask &= ~(1 << prio);
370 htb_add_to_id_tree(&q->hlevel[ 347 htb_add_to_id_tree(&q->hlevel[cl->level].hprio[prio].row, cl, prio);
371 } 348 }
372 } 349 }
373 350
374 /* If this triggers, it is a bug in this code, 351 /* If this triggers, it is a bug in this code, but it need not be fatal */
375 static void htb_safe_rb_erase(struct rb_node * 352 static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root)
376 { 353 {
377 if (RB_EMPTY_NODE(rb)) { 354 if (RB_EMPTY_NODE(rb)) {
378 WARN_ON(1); 355 WARN_ON(1);
379 } else { 356 } else {
380 rb_erase(rb, root); 357 rb_erase(rb, root);
381 RB_CLEAR_NODE(rb); 358 RB_CLEAR_NODE(rb);
382 } 359 }
383 } 360 }
384 361
385 362
386 /** 363 /**
387 * htb_remove_class_from_row - removes class f 364 * htb_remove_class_from_row - removes class from its row
388 * @q: the priority event queue <<
389 * @cl: the class to add <<
390 * @mask: the given priorities in class in bit <<
391 * 365 *
392 * The class is removed from row at priorities 366 * The class is removed from row at priorities marked in mask.
393 * It does nothing if mask == 0. 367 * It does nothing if mask == 0.
394 */ 368 */
395 static inline void htb_remove_class_from_row(s 369 static inline void htb_remove_class_from_row(struct htb_sched *q,
396 370 struct htb_class *cl, int mask)
397 { 371 {
398 int m = 0; 372 int m = 0;
399 struct htb_level *hlevel = &q->hlevel[ 373 struct htb_level *hlevel = &q->hlevel[cl->level];
400 374
401 while (mask) { 375 while (mask) {
402 int prio = ffz(~mask); 376 int prio = ffz(~mask);
403 struct htb_prio *hprio = &hlev 377 struct htb_prio *hprio = &hlevel->hprio[prio];
404 378
405 mask &= ~(1 << prio); 379 mask &= ~(1 << prio);
406 if (hprio->ptr == cl->node + p 380 if (hprio->ptr == cl->node + prio)
407 htb_next_rb_node(&hpri 381 htb_next_rb_node(&hprio->ptr);
408 382
409 htb_safe_rb_erase(cl->node + p 383 htb_safe_rb_erase(cl->node + prio, &hprio->row);
410 if (!hprio->row.rb_node) 384 if (!hprio->row.rb_node)
411 m |= 1 << prio; 385 m |= 1 << prio;
412 } 386 }
413 q->row_mask[cl->level] &= ~m; 387 q->row_mask[cl->level] &= ~m;
414 } 388 }
415 389
416 /** 390 /**
417 * htb_activate_prios - creates active classe' 391 * htb_activate_prios - creates active classe's feed chain
418 * @q: the priority event queue <<
419 * @cl: the class to activate <<
420 * 392 *
421 * The class is connected to ancestors and/or 393 * The class is connected to ancestors and/or appropriate rows
422 * for priorities it is participating on. cl-> 394 * for priorities it is participating on. cl->cmode must be new
423 * (activated) mode. It does nothing if cl->pr 395 * (activated) mode. It does nothing if cl->prio_activity == 0.
424 */ 396 */
425 static void htb_activate_prios(struct htb_sche 397 static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl)
426 { 398 {
427 struct htb_class *p = cl->parent; 399 struct htb_class *p = cl->parent;
428 long m, mask = cl->prio_activity; 400 long m, mask = cl->prio_activity;
429 401
430 while (cl->cmode == HTB_MAY_BORROW && 402 while (cl->cmode == HTB_MAY_BORROW && p && mask) {
431 m = mask; 403 m = mask;
432 while (m) { 404 while (m) {
433 unsigned int prio = ff !! 405 int prio = ffz(~m);
434 <<
435 if (WARN_ON_ONCE(prio <<
436 break; <<
437 m &= ~(1 << prio); 406 m &= ~(1 << prio);
438 407
439 if (p->inner.clprio[pr !! 408 if (p->un.inner.clprio[prio].feed.rb_node)
440 /* parent alre 409 /* parent already has its feed in use so that
441 * reset bit i 410 * reset bit in mask as parent is already ok
442 */ 411 */
443 mask &= ~(1 << 412 mask &= ~(1 << prio);
444 413
445 htb_add_to_id_tree(&p- !! 414 htb_add_to_id_tree(&p->un.inner.clprio[prio].feed, cl, prio);
446 } 415 }
447 p->prio_activity |= mask; 416 p->prio_activity |= mask;
448 cl = p; 417 cl = p;
449 p = cl->parent; 418 p = cl->parent;
450 419
451 } 420 }
452 if (cl->cmode == HTB_CAN_SEND && mask) 421 if (cl->cmode == HTB_CAN_SEND && mask)
453 htb_add_class_to_row(q, cl, ma 422 htb_add_class_to_row(q, cl, mask);
454 } 423 }
455 424
456 /** 425 /**
457 * htb_deactivate_prios - remove class from fe 426 * htb_deactivate_prios - remove class from feed chain
458 * @q: the priority event queue <<
459 * @cl: the class to deactivate <<
460 * 427 *
461 * cl->cmode must represent old mode (before d 428 * cl->cmode must represent old mode (before deactivation). It does
462 * nothing if cl->prio_activity == 0. Class is 429 * nothing if cl->prio_activity == 0. Class is removed from all feed
463 * chains and rows. 430 * chains and rows.
464 */ 431 */
465 static void htb_deactivate_prios(struct htb_sc 432 static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl)
466 { 433 {
467 struct htb_class *p = cl->parent; 434 struct htb_class *p = cl->parent;
468 long m, mask = cl->prio_activity; 435 long m, mask = cl->prio_activity;
469 436
470 while (cl->cmode == HTB_MAY_BORROW && 437 while (cl->cmode == HTB_MAY_BORROW && p && mask) {
471 m = mask; 438 m = mask;
472 mask = 0; 439 mask = 0;
473 while (m) { 440 while (m) {
474 int prio = ffz(~m); 441 int prio = ffz(~m);
475 m &= ~(1 << prio); 442 m &= ~(1 << prio);
476 443
477 if (p->inner.clprio[pr !! 444 if (p->un.inner.clprio[prio].ptr == cl->node + prio) {
478 /* we are remo 445 /* we are removing child which is pointed to from
479 * parent feed 446 * parent feed - forget the pointer but remember
480 * classid 447 * classid
481 */ 448 */
482 p->inner.clpri !! 449 p->un.inner.clprio[prio].last_ptr_id = cl->common.classid;
483 p->inner.clpri !! 450 p->un.inner.clprio[prio].ptr = NULL;
484 } 451 }
485 452
486 htb_safe_rb_erase(cl-> 453 htb_safe_rb_erase(cl->node + prio,
487 &p-> !! 454 &p->un.inner.clprio[prio].feed);
488 455
489 if (!p->inner.clprio[p !! 456 if (!p->un.inner.clprio[prio].feed.rb_node)
490 mask |= 1 << p 457 mask |= 1 << prio;
491 } 458 }
492 459
493 p->prio_activity &= ~mask; 460 p->prio_activity &= ~mask;
494 cl = p; 461 cl = p;
495 p = cl->parent; 462 p = cl->parent;
496 463
497 } 464 }
498 if (cl->cmode == HTB_CAN_SEND && mask) 465 if (cl->cmode == HTB_CAN_SEND && mask)
499 htb_remove_class_from_row(q, c 466 htb_remove_class_from_row(q, cl, mask);
500 } 467 }
501 468
502 static inline s64 htb_lowater(const struct htb 469 static inline s64 htb_lowater(const struct htb_class *cl)
503 { 470 {
504 if (htb_hysteresis) 471 if (htb_hysteresis)
505 return cl->cmode != HTB_CANT_S 472 return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0;
506 else 473 else
507 return 0; 474 return 0;
508 } 475 }
509 static inline s64 htb_hiwater(const struct htb 476 static inline s64 htb_hiwater(const struct htb_class *cl)
510 { 477 {
511 if (htb_hysteresis) 478 if (htb_hysteresis)
512 return cl->cmode == HTB_CAN_SE 479 return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0;
513 else 480 else
514 return 0; 481 return 0;
515 } 482 }
516 483
517 484
518 /** 485 /**
519 * htb_class_mode - computes and returns curre 486 * htb_class_mode - computes and returns current class mode
520 * @cl: the target class <<
521 * @diff: diff time in microseconds <<
522 * 487 *
523 * It computes cl's mode at time cl->t_c+diff 488 * It computes cl's mode at time cl->t_c+diff and returns it. If mode
524 * is not HTB_CAN_SEND then cl->pq_key is upda 489 * is not HTB_CAN_SEND then cl->pq_key is updated to time difference
525 * from now to time when cl will change its st 490 * from now to time when cl will change its state.
526 * Also it is worth to note that class mode do 491 * Also it is worth to note that class mode doesn't change simply
527 * at cl->{c,}tokens == 0 but there can rather 492 * at cl->{c,}tokens == 0 but there can rather be hysteresis of
528 * 0 .. -cl->{c,}buffer range. It is meant to 493 * 0 .. -cl->{c,}buffer range. It is meant to limit number of
529 * mode transitions per time unit. The speed g 494 * mode transitions per time unit. The speed gain is about 1/6.
530 */ 495 */
531 static inline enum htb_cmode 496 static inline enum htb_cmode
532 htb_class_mode(struct htb_class *cl, s64 *diff 497 htb_class_mode(struct htb_class *cl, s64 *diff)
533 { 498 {
534 s64 toks; 499 s64 toks;
535 500
536 if ((toks = (cl->ctokens + *diff)) < h 501 if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
537 *diff = -toks; 502 *diff = -toks;
538 return HTB_CANT_SEND; 503 return HTB_CANT_SEND;
539 } 504 }
540 505
541 if ((toks = (cl->tokens + *diff)) >= h 506 if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
542 return HTB_CAN_SEND; 507 return HTB_CAN_SEND;
543 508
544 *diff = -toks; 509 *diff = -toks;
545 return HTB_MAY_BORROW; 510 return HTB_MAY_BORROW;
546 } 511 }
547 512
548 /** 513 /**
549 * htb_change_class_mode - changes classe's mo 514 * htb_change_class_mode - changes classe's mode
550 * @q: the priority event queue <<
551 * @cl: the target class <<
552 * @diff: diff time in microseconds <<
553 * 515 *
554 * This should be the only way how to change c 516 * This should be the only way how to change classe's mode under normal
555 * circumstances. Routine will update feed lis !! 517 * cirsumstances. Routine will update feed lists linkage, change mode
556 * and add class to the wait event queue if ap 518 * and add class to the wait event queue if appropriate. New mode should
557 * be different from old one and cl->pq_key ha 519 * be different from old one and cl->pq_key has to be valid if changing
558 * to mode other than HTB_CAN_SEND (see htb_ad 520 * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
559 */ 521 */
560 static void 522 static void
561 htb_change_class_mode(struct htb_sched *q, str 523 htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)
562 { 524 {
563 enum htb_cmode new_mode = htb_class_mo 525 enum htb_cmode new_mode = htb_class_mode(cl, diff);
564 526
565 if (new_mode == cl->cmode) 527 if (new_mode == cl->cmode)
566 return; 528 return;
567 529
568 if (new_mode == HTB_CANT_SEND) { <<
569 cl->overlimits++; <<
570 q->overlimits++; <<
571 } <<
572 <<
573 if (cl->prio_activity) { /* not 530 if (cl->prio_activity) { /* not necessary: speed optimization */
574 if (cl->cmode != HTB_CANT_SEND 531 if (cl->cmode != HTB_CANT_SEND)
575 htb_deactivate_prios(q 532 htb_deactivate_prios(q, cl);
576 cl->cmode = new_mode; 533 cl->cmode = new_mode;
577 if (new_mode != HTB_CANT_SEND) 534 if (new_mode != HTB_CANT_SEND)
578 htb_activate_prios(q, 535 htb_activate_prios(q, cl);
579 } else 536 } else
580 cl->cmode = new_mode; 537 cl->cmode = new_mode;
581 } 538 }
582 539
583 /** 540 /**
584 * htb_activate - inserts leaf cl into appropr 541 * htb_activate - inserts leaf cl into appropriate active feeds
585 * @q: the priority event queue <<
586 * @cl: the target class <<
587 * 542 *
588 * Routine learns (new) priority of leaf and a 543 * Routine learns (new) priority of leaf and activates feed chain
589 * for the prio. It can be called on already a 544 * for the prio. It can be called on already active leaf safely.
590 * It also adds leaf into droplist. 545 * It also adds leaf into droplist.
591 */ 546 */
592 static inline void htb_activate(struct htb_sch 547 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
593 { 548 {
594 WARN_ON(cl->level || !cl->leaf.q || !c !! 549 WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
595 550
596 if (!cl->prio_activity) { 551 if (!cl->prio_activity) {
597 cl->prio_activity = 1 << cl->p 552 cl->prio_activity = 1 << cl->prio;
598 htb_activate_prios(q, cl); 553 htb_activate_prios(q, cl);
>> 554 list_add_tail(&cl->un.leaf.drop_list,
>> 555 q->drops + cl->prio);
599 } 556 }
600 } 557 }
601 558
602 /** 559 /**
603 * htb_deactivate - remove leaf cl from active 560 * htb_deactivate - remove leaf cl from active feeds
604 * @q: the priority event queue <<
605 * @cl: the target class <<
606 * 561 *
607 * Make sure that leaf is active. In the other 562 * Make sure that leaf is active. In the other words it can't be called
608 * with non-active leaf. It also removes class 563 * with non-active leaf. It also removes class from the drop list.
609 */ 564 */
610 static inline void htb_deactivate(struct htb_s 565 static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl)
611 { 566 {
612 WARN_ON(!cl->prio_activity); 567 WARN_ON(!cl->prio_activity);
613 568
614 htb_deactivate_prios(q, cl); 569 htb_deactivate_prios(q, cl);
615 cl->prio_activity = 0; 570 cl->prio_activity = 0;
>> 571 list_del_init(&cl->un.leaf.drop_list);
>> 572 }
>> 573
>> 574 static void htb_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,
>> 575 struct qdisc_skb_head *qh)
>> 576 {
>> 577 struct sk_buff *last = qh->tail;
>> 578
>> 579 if (last) {
>> 580 skb->next = NULL;
>> 581 last->next = skb;
>> 582 qh->tail = skb;
>> 583 } else {
>> 584 qh->tail = skb;
>> 585 qh->head = skb;
>> 586 }
>> 587 qh->qlen++;
616 } 588 }
617 589
618 static int htb_enqueue(struct sk_buff *skb, st 590 static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,
619 struct sk_buff **to_fre 591 struct sk_buff **to_free)
620 { 592 {
621 int ret; !! 593 int uninitialized_var(ret);
622 unsigned int len = qdisc_pkt_len(skb); <<
623 struct htb_sched *q = qdisc_priv(sch); 594 struct htb_sched *q = qdisc_priv(sch);
624 struct htb_class *cl = htb_classify(sk 595 struct htb_class *cl = htb_classify(skb, sch, &ret);
625 596
626 if (cl == HTB_DIRECT) { 597 if (cl == HTB_DIRECT) {
627 /* enqueue to helper queue */ 598 /* enqueue to helper queue */
628 if (q->direct_queue.qlen < q-> 599 if (q->direct_queue.qlen < q->direct_qlen) {
629 __qdisc_enqueue_tail(s !! 600 htb_enqueue_tail(skb, sch, &q->direct_queue);
630 q->direct_pkts++; 601 q->direct_pkts++;
631 } else { 602 } else {
632 return qdisc_drop(skb, 603 return qdisc_drop(skb, sch, to_free);
633 } 604 }
634 #ifdef CONFIG_NET_CLS_ACT 605 #ifdef CONFIG_NET_CLS_ACT
635 } else if (!cl) { 606 } else if (!cl) {
636 if (ret & __NET_XMIT_BYPASS) 607 if (ret & __NET_XMIT_BYPASS)
637 qdisc_qstats_drop(sch) 608 qdisc_qstats_drop(sch);
638 __qdisc_drop(skb, to_free); 609 __qdisc_drop(skb, to_free);
639 return ret; 610 return ret;
640 #endif 611 #endif
641 } else if ((ret = qdisc_enqueue(skb, c !! 612 } else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q,
642 to_fre 613 to_free)) != NET_XMIT_SUCCESS) {
643 if (net_xmit_drop_count(ret)) 614 if (net_xmit_drop_count(ret)) {
644 qdisc_qstats_drop(sch) 615 qdisc_qstats_drop(sch);
645 cl->drops++; 616 cl->drops++;
646 } 617 }
647 return ret; 618 return ret;
648 } else { 619 } else {
649 htb_activate(q, cl); 620 htb_activate(q, cl);
650 } 621 }
651 622
652 sch->qstats.backlog += len; !! 623 qdisc_qstats_backlog_inc(sch, skb);
653 sch->q.qlen++; 624 sch->q.qlen++;
654 return NET_XMIT_SUCCESS; 625 return NET_XMIT_SUCCESS;
655 } 626 }
656 627
657 static inline void htb_accnt_tokens(struct htb 628 static inline void htb_accnt_tokens(struct htb_class *cl, int bytes, s64 diff)
658 { 629 {
659 s64 toks = diff + cl->tokens; 630 s64 toks = diff + cl->tokens;
660 631
661 if (toks > cl->buffer) 632 if (toks > cl->buffer)
662 toks = cl->buffer; 633 toks = cl->buffer;
663 toks -= (s64) psched_l2t_ns(&cl->rate, 634 toks -= (s64) psched_l2t_ns(&cl->rate, bytes);
664 if (toks <= -cl->mbuffer) 635 if (toks <= -cl->mbuffer)
665 toks = 1 - cl->mbuffer; 636 toks = 1 - cl->mbuffer;
666 637
667 cl->tokens = toks; 638 cl->tokens = toks;
668 } 639 }
669 640
670 static inline void htb_accnt_ctokens(struct ht 641 static inline void htb_accnt_ctokens(struct htb_class *cl, int bytes, s64 diff)
671 { 642 {
672 s64 toks = diff + cl->ctokens; 643 s64 toks = diff + cl->ctokens;
673 644
674 if (toks > cl->cbuffer) 645 if (toks > cl->cbuffer)
675 toks = cl->cbuffer; 646 toks = cl->cbuffer;
676 toks -= (s64) psched_l2t_ns(&cl->ceil, 647 toks -= (s64) psched_l2t_ns(&cl->ceil, bytes);
677 if (toks <= -cl->mbuffer) 648 if (toks <= -cl->mbuffer)
678 toks = 1 - cl->mbuffer; 649 toks = 1 - cl->mbuffer;
679 650
680 cl->ctokens = toks; 651 cl->ctokens = toks;
681 } 652 }
682 653
683 /** 654 /**
684 * htb_charge_class - charges amount "bytes" t 655 * htb_charge_class - charges amount "bytes" to leaf and ancestors
685 * @q: the priority event queue <<
686 * @cl: the class to start iterate <<
687 * @level: the minimum level to account <<
688 * @skb: the socket buffer <<
689 * 656 *
690 * Routine assumes that packet "bytes" long wa 657 * Routine assumes that packet "bytes" long was dequeued from leaf cl
691 * borrowing from "level". It accounts bytes t 658 * borrowing from "level". It accounts bytes to ceil leaky bucket for
692 * leaf and all ancestors and to rate bucket f 659 * leaf and all ancestors and to rate bucket for ancestors at levels
693 * "level" and higher. It also handles possibl 660 * "level" and higher. It also handles possible change of mode resulting
694 * from the update. Note that mode can also in 661 * from the update. Note that mode can also increase here (MAY_BORROW to
695 * CAN_SEND) because we can use more precise c 662 * CAN_SEND) because we can use more precise clock that event queue here.
696 * In such case we remove class from event que 663 * In such case we remove class from event queue first.
697 */ 664 */
698 static void htb_charge_class(struct htb_sched 665 static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
699 int level, struct 666 int level, struct sk_buff *skb)
700 { 667 {
701 int bytes = qdisc_pkt_len(skb); 668 int bytes = qdisc_pkt_len(skb);
702 enum htb_cmode old_mode; 669 enum htb_cmode old_mode;
703 s64 diff; 670 s64 diff;
704 671
705 while (cl) { 672 while (cl) {
706 diff = min_t(s64, q->now - cl- 673 diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
707 if (cl->level >= level) { 674 if (cl->level >= level) {
708 if (cl->level == level 675 if (cl->level == level)
709 cl->xstats.len 676 cl->xstats.lends++;
710 htb_accnt_tokens(cl, b 677 htb_accnt_tokens(cl, bytes, diff);
711 } else { 678 } else {
712 cl->xstats.borrows++; 679 cl->xstats.borrows++;
713 cl->tokens += diff; 680 cl->tokens += diff; /* we moved t_c; update tokens */
714 } 681 }
715 htb_accnt_ctokens(cl, bytes, d 682 htb_accnt_ctokens(cl, bytes, diff);
716 cl->t_c = q->now; 683 cl->t_c = q->now;
717 684
718 old_mode = cl->cmode; 685 old_mode = cl->cmode;
719 diff = 0; 686 diff = 0;
720 htb_change_class_mode(q, cl, & 687 htb_change_class_mode(q, cl, &diff);
721 if (old_mode != cl->cmode) { 688 if (old_mode != cl->cmode) {
722 if (old_mode != HTB_CA 689 if (old_mode != HTB_CAN_SEND)
723 htb_safe_rb_er 690 htb_safe_rb_erase(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
724 if (cl->cmode != HTB_C 691 if (cl->cmode != HTB_CAN_SEND)
725 htb_add_to_wai 692 htb_add_to_wait_tree(q, cl, diff);
726 } 693 }
727 694
728 /* update basic stats except f 695 /* update basic stats except for leaves which are already updated */
729 if (cl->level) 696 if (cl->level)
730 bstats_update(&cl->bst 697 bstats_update(&cl->bstats, skb);
731 698
732 cl = cl->parent; 699 cl = cl->parent;
733 } 700 }
734 } 701 }
735 702
736 /** 703 /**
737 * htb_do_events - make mode changes to classe 704 * htb_do_events - make mode changes to classes at the level
738 * @q: the priority event queue <<
739 * @level: which wait_pq in 'q->hlevel' <<
740 * @start: start jiffies <<
741 * 705 *
742 * Scans event queue for pending events and ap 706 * Scans event queue for pending events and applies them. Returns time of
743 * next pending event (0 for no event in pq, q 707 * next pending event (0 for no event in pq, q->now for too many events).
744 * Note: Applied are events whose have cl->pq_ 708 * Note: Applied are events whose have cl->pq_key <= q->now.
745 */ 709 */
746 static s64 htb_do_events(struct htb_sched *q, 710 static s64 htb_do_events(struct htb_sched *q, const int level,
747 unsigned long start) 711 unsigned long start)
748 { 712 {
749 /* don't run for longer than 2 jiffies 713 /* don't run for longer than 2 jiffies; 2 is used instead of
750 * 1 to simplify things when jiffy is 714 * 1 to simplify things when jiffy is going to be incremented
751 * too soon 715 * too soon
752 */ 716 */
753 unsigned long stop_at = start + 2; 717 unsigned long stop_at = start + 2;
754 struct rb_root *wait_pq = &q->hlevel[l 718 struct rb_root *wait_pq = &q->hlevel[level].wait_pq;
755 719
756 while (time_before(jiffies, stop_at)) 720 while (time_before(jiffies, stop_at)) {
757 struct htb_class *cl; 721 struct htb_class *cl;
758 s64 diff; 722 s64 diff;
759 struct rb_node *p = rb_first(w 723 struct rb_node *p = rb_first(wait_pq);
760 724
761 if (!p) 725 if (!p)
762 return 0; 726 return 0;
763 727
764 cl = rb_entry(p, struct htb_cl 728 cl = rb_entry(p, struct htb_class, pq_node);
765 if (cl->pq_key > q->now) 729 if (cl->pq_key > q->now)
766 return cl->pq_key; 730 return cl->pq_key;
767 731
768 htb_safe_rb_erase(p, wait_pq); 732 htb_safe_rb_erase(p, wait_pq);
769 diff = min_t(s64, q->now - cl- 733 diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
770 htb_change_class_mode(q, cl, & 734 htb_change_class_mode(q, cl, &diff);
771 if (cl->cmode != HTB_CAN_SEND) 735 if (cl->cmode != HTB_CAN_SEND)
772 htb_add_to_wait_tree(q 736 htb_add_to_wait_tree(q, cl, diff);
773 } 737 }
774 738
775 /* too much load - let's continue afte 739 /* too much load - let's continue after a break for scheduling */
776 if (!(q->warned & HTB_WARN_TOOMANYEVEN 740 if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) {
777 pr_warn("htb: too many events! 741 pr_warn("htb: too many events!\n");
778 q->warned |= HTB_WARN_TOOMANYE 742 q->warned |= HTB_WARN_TOOMANYEVENTS;
779 } 743 }
780 744
781 return q->now; 745 return q->now;
782 } 746 }
783 747
784 /* Returns class->node+prio from id-tree where 748 /* Returns class->node+prio from id-tree where classe's id is >= id. NULL
785 * is no such one exists. 749 * is no such one exists.
786 */ 750 */
787 static struct rb_node *htb_id_find_next_upper( 751 static struct rb_node *htb_id_find_next_upper(int prio, struct rb_node *n,
788 752 u32 id)
789 { 753 {
790 struct rb_node *r = NULL; 754 struct rb_node *r = NULL;
791 while (n) { 755 while (n) {
792 struct htb_class *cl = 756 struct htb_class *cl =
793 rb_entry(n, struct htb_cla 757 rb_entry(n, struct htb_class, node[prio]);
794 758
795 if (id > cl->common.classid) { 759 if (id > cl->common.classid) {
796 n = n->rb_right; 760 n = n->rb_right;
797 } else if (id < cl->common.cla 761 } else if (id < cl->common.classid) {
798 r = n; 762 r = n;
799 n = n->rb_left; 763 n = n->rb_left;
800 } else { 764 } else {
801 return n; 765 return n;
802 } 766 }
803 } 767 }
804 return r; 768 return r;
805 } 769 }
806 770
807 /** 771 /**
808 * htb_lookup_leaf - returns next leaf class i 772 * htb_lookup_leaf - returns next leaf class in DRR order
809 * @hprio: the current one <<
810 * @prio: which prio in class <<
811 * 773 *
812 * Find leaf where current feed pointers point 774 * Find leaf where current feed pointers points to.
813 */ 775 */
814 static struct htb_class *htb_lookup_leaf(struc 776 static struct htb_class *htb_lookup_leaf(struct htb_prio *hprio, const int prio)
815 { 777 {
816 int i; 778 int i;
817 struct { 779 struct {
818 struct rb_node *root; 780 struct rb_node *root;
819 struct rb_node **pptr; 781 struct rb_node **pptr;
820 u32 *pid; 782 u32 *pid;
821 } stk[TC_HTB_MAXDEPTH], *sp = stk; 783 } stk[TC_HTB_MAXDEPTH], *sp = stk;
822 784
823 BUG_ON(!hprio->row.rb_node); 785 BUG_ON(!hprio->row.rb_node);
824 sp->root = hprio->row.rb_node; 786 sp->root = hprio->row.rb_node;
825 sp->pptr = &hprio->ptr; 787 sp->pptr = &hprio->ptr;
826 sp->pid = &hprio->last_ptr_id; 788 sp->pid = &hprio->last_ptr_id;
827 789
828 for (i = 0; i < 65535; i++) { 790 for (i = 0; i < 65535; i++) {
829 if (!*sp->pptr && *sp->pid) { 791 if (!*sp->pptr && *sp->pid) {
830 /* ptr was invalidated 792 /* ptr was invalidated but id is valid - try to recover
831 * the original or nex 793 * the original or next ptr
832 */ 794 */
833 *sp->pptr = 795 *sp->pptr =
834 htb_id_find_next_u 796 htb_id_find_next_upper(prio, sp->root, *sp->pid);
835 } 797 }
836 *sp->pid = 0; /* ptr is vali 798 *sp->pid = 0; /* ptr is valid now so that remove this hint as it
837 * can become 799 * can become out of date quickly
838 */ 800 */
839 if (!*sp->pptr) { /* we 801 if (!*sp->pptr) { /* we are at right end; rewind & go up */
840 *sp->pptr = sp->root; 802 *sp->pptr = sp->root;
841 while ((*sp->pptr)->rb 803 while ((*sp->pptr)->rb_left)
842 *sp->pptr = (* 804 *sp->pptr = (*sp->pptr)->rb_left;
843 if (sp > stk) { 805 if (sp > stk) {
844 sp--; 806 sp--;
845 if (!*sp->pptr 807 if (!*sp->pptr) {
846 WARN_O 808 WARN_ON(1);
847 return 809 return NULL;
848 } 810 }
849 htb_next_rb_no 811 htb_next_rb_node(sp->pptr);
850 } 812 }
851 } else { 813 } else {
852 struct htb_class *cl; 814 struct htb_class *cl;
853 struct htb_prio *clp; 815 struct htb_prio *clp;
854 816
855 cl = rb_entry(*sp->ppt 817 cl = rb_entry(*sp->pptr, struct htb_class, node[prio]);
856 if (!cl->level) 818 if (!cl->level)
857 return cl; 819 return cl;
858 clp = &cl->inner.clpri !! 820 clp = &cl->un.inner.clprio[prio];
859 (++sp)->root = clp->fe 821 (++sp)->root = clp->feed.rb_node;
860 sp->pptr = &clp->ptr; 822 sp->pptr = &clp->ptr;
861 sp->pid = &clp->last_p 823 sp->pid = &clp->last_ptr_id;
862 } 824 }
863 } 825 }
864 WARN_ON(1); 826 WARN_ON(1);
865 return NULL; 827 return NULL;
866 } 828 }
867 829
868 /* dequeues packet at given priority and level 830 /* dequeues packet at given priority and level; call only if
869 * you are sure that there is active class at 831 * you are sure that there is active class at prio/level
870 */ 832 */
871 static struct sk_buff *htb_dequeue_tree(struct 833 static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, const int prio,
872 const 834 const int level)
873 { 835 {
874 struct sk_buff *skb = NULL; 836 struct sk_buff *skb = NULL;
875 struct htb_class *cl, *start; 837 struct htb_class *cl, *start;
876 struct htb_level *hlevel = &q->hlevel[ 838 struct htb_level *hlevel = &q->hlevel[level];
877 struct htb_prio *hprio = &hlevel->hpri 839 struct htb_prio *hprio = &hlevel->hprio[prio];
878 840
879 /* look initial class up in the row */ 841 /* look initial class up in the row */
880 start = cl = htb_lookup_leaf(hprio, pr 842 start = cl = htb_lookup_leaf(hprio, prio);
881 843
882 do { 844 do {
883 next: 845 next:
884 if (unlikely(!cl)) 846 if (unlikely(!cl))
885 return NULL; 847 return NULL;
886 848
887 /* class can be empty - it is 849 /* class can be empty - it is unlikely but can be true if leaf
888 * qdisc drops packets in enqu 850 * qdisc drops packets in enqueue routine or if someone used
889 * graft operation on the leaf 851 * graft operation on the leaf since last dequeue;
890 * simply deactivate and skip 852 * simply deactivate and skip such class
891 */ 853 */
892 if (unlikely(cl->leaf.q->q.qle !! 854 if (unlikely(cl->un.leaf.q->q.qlen == 0)) {
893 struct htb_class *next 855 struct htb_class *next;
894 htb_deactivate(q, cl); 856 htb_deactivate(q, cl);
895 857
896 /* row/level might bec 858 /* row/level might become empty */
897 if ((q->row_mask[level 859 if ((q->row_mask[level] & (1 << prio)) == 0)
898 return NULL; 860 return NULL;
899 861
900 next = htb_lookup_leaf 862 next = htb_lookup_leaf(hprio, prio);
901 863
902 if (cl == start) 864 if (cl == start) /* fix start if we just deleted it */
903 start = next; 865 start = next;
904 cl = next; 866 cl = next;
905 goto next; 867 goto next;
906 } 868 }
907 869
908 skb = cl->leaf.q->dequeue(cl-> !! 870 skb = cl->un.leaf.q->dequeue(cl->un.leaf.q);
909 if (likely(skb != NULL)) 871 if (likely(skb != NULL))
910 break; 872 break;
911 873
912 qdisc_warn_nonwc("htb", cl->le !! 874 qdisc_warn_nonwc("htb", cl->un.leaf.q);
913 htb_next_rb_node(level ? &cl-> !! 875 htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr:
914 &q->h 876 &q->hlevel[0].hprio[prio].ptr);
915 cl = htb_lookup_leaf(hprio, pr 877 cl = htb_lookup_leaf(hprio, prio);
916 878
917 } while (cl != start); 879 } while (cl != start);
918 880
919 if (likely(skb != NULL)) { 881 if (likely(skb != NULL)) {
920 bstats_update(&cl->bstats, skb 882 bstats_update(&cl->bstats, skb);
921 cl->leaf.deficit[level] -= qdi !! 883 cl->un.leaf.deficit[level] -= qdisc_pkt_len(skb);
922 if (cl->leaf.deficit[level] < !! 884 if (cl->un.leaf.deficit[level] < 0) {
923 cl->leaf.deficit[level !! 885 cl->un.leaf.deficit[level] += cl->quantum;
924 htb_next_rb_node(level !! 886 htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr :
925 887 &q->hlevel[0].hprio[prio].ptr);
926 } 888 }
927 /* this used to be after charg 889 /* this used to be after charge_class but this constelation
928 * gives us slightly better pe 890 * gives us slightly better performance
929 */ 891 */
930 if (!cl->leaf.q->q.qlen) !! 892 if (!cl->un.leaf.q->q.qlen)
931 htb_deactivate(q, cl); 893 htb_deactivate(q, cl);
932 htb_charge_class(q, cl, level, 894 htb_charge_class(q, cl, level, skb);
933 } 895 }
934 return skb; 896 return skb;
935 } 897 }
936 898
937 static struct sk_buff *htb_dequeue(struct Qdis 899 static struct sk_buff *htb_dequeue(struct Qdisc *sch)
938 { 900 {
939 struct sk_buff *skb; 901 struct sk_buff *skb;
940 struct htb_sched *q = qdisc_priv(sch); 902 struct htb_sched *q = qdisc_priv(sch);
941 int level; 903 int level;
942 s64 next_event; 904 s64 next_event;
943 unsigned long start_at; 905 unsigned long start_at;
944 906
945 /* try to dequeue direct packets as hi 907 /* try to dequeue direct packets as high prio (!) to minimize cpu work */
946 skb = __qdisc_dequeue_head(&q->direct_ 908 skb = __qdisc_dequeue_head(&q->direct_queue);
947 if (skb != NULL) { 909 if (skb != NULL) {
948 ok: 910 ok:
949 qdisc_bstats_update(sch, skb); 911 qdisc_bstats_update(sch, skb);
950 qdisc_qstats_backlog_dec(sch, 912 qdisc_qstats_backlog_dec(sch, skb);
951 sch->q.qlen--; 913 sch->q.qlen--;
952 return skb; 914 return skb;
953 } 915 }
954 916
955 if (!sch->q.qlen) 917 if (!sch->q.qlen)
956 goto fin; 918 goto fin;
957 q->now = ktime_get_ns(); 919 q->now = ktime_get_ns();
958 start_at = jiffies; 920 start_at = jiffies;
959 921
960 next_event = q->now + 5LLU * NSEC_PER_ 922 next_event = q->now + 5LLU * NSEC_PER_SEC;
961 923
962 for (level = 0; level < TC_HTB_MAXDEPT 924 for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
963 /* common case optimization - 925 /* common case optimization - skip event handler quickly */
964 int m; 926 int m;
965 s64 event = q->near_ev_cache[l 927 s64 event = q->near_ev_cache[level];
966 928
967 if (q->now >= event) { 929 if (q->now >= event) {
968 event = htb_do_events( 930 event = htb_do_events(q, level, start_at);
969 if (!event) 931 if (!event)
970 event = q->now 932 event = q->now + NSEC_PER_SEC;
971 q->near_ev_cache[level 933 q->near_ev_cache[level] = event;
972 } 934 }
973 935
974 if (next_event > event) 936 if (next_event > event)
975 next_event = event; 937 next_event = event;
976 938
977 m = ~q->row_mask[level]; 939 m = ~q->row_mask[level];
978 while (m != (int)(-1)) { 940 while (m != (int)(-1)) {
979 int prio = ffz(m); 941 int prio = ffz(m);
980 942
981 m |= 1 << prio; 943 m |= 1 << prio;
982 skb = htb_dequeue_tree 944 skb = htb_dequeue_tree(q, prio, level);
983 if (likely(skb != NULL 945 if (likely(skb != NULL))
984 goto ok; 946 goto ok;
985 } 947 }
986 } 948 }
>> 949 qdisc_qstats_overlimit(sch);
987 if (likely(next_event > q->now)) 950 if (likely(next_event > q->now))
988 qdisc_watchdog_schedule_ns(&q- 951 qdisc_watchdog_schedule_ns(&q->watchdog, next_event);
989 else 952 else
990 schedule_work(&q->work); 953 schedule_work(&q->work);
991 fin: 954 fin:
992 return skb; 955 return skb;
993 } 956 }
994 957
995 /* reset all classes */ 958 /* reset all classes */
996 /* always caled under BH & queue lock */ 959 /* always caled under BH & queue lock */
997 static void htb_reset(struct Qdisc *sch) 960 static void htb_reset(struct Qdisc *sch)
998 { 961 {
999 struct htb_sched *q = qdisc_priv(sch); 962 struct htb_sched *q = qdisc_priv(sch);
1000 struct htb_class *cl; 963 struct htb_class *cl;
1001 unsigned int i; 964 unsigned int i;
1002 965
1003 for (i = 0; i < q->clhash.hashsize; i 966 for (i = 0; i < q->clhash.hashsize; i++) {
1004 hlist_for_each_entry(cl, &q-> 967 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
1005 if (cl->level) 968 if (cl->level)
1006 memset(&cl->i !! 969 memset(&cl->un.inner, 0, sizeof(cl->un.inner));
1007 else { 970 else {
1008 if (cl->leaf. !! 971 if (cl->un.leaf.q)
1009 qdisc !! 972 qdisc_reset(cl->un.leaf.q);
>> 973 INIT_LIST_HEAD(&cl->un.leaf.drop_list);
1010 } 974 }
1011 cl->prio_activity = 0 975 cl->prio_activity = 0;
1012 cl->cmode = HTB_CAN_S 976 cl->cmode = HTB_CAN_SEND;
1013 } 977 }
1014 } 978 }
1015 qdisc_watchdog_cancel(&q->watchdog); 979 qdisc_watchdog_cancel(&q->watchdog);
1016 __qdisc_reset_queue(&q->direct_queue) 980 __qdisc_reset_queue(&q->direct_queue);
>> 981 sch->q.qlen = 0;
>> 982 sch->qstats.backlog = 0;
1017 memset(q->hlevel, 0, sizeof(q->hlevel 983 memset(q->hlevel, 0, sizeof(q->hlevel));
1018 memset(q->row_mask, 0, sizeof(q->row_ 984 memset(q->row_mask, 0, sizeof(q->row_mask));
>> 985 for (i = 0; i < TC_HTB_NUMPRIO; i++)
>> 986 INIT_LIST_HEAD(q->drops + i);
1019 } 987 }
1020 988
1021 static const struct nla_policy htb_policy[TCA 989 static const struct nla_policy htb_policy[TCA_HTB_MAX + 1] = {
1022 [TCA_HTB_PARMS] = { .len = sizeof(str 990 [TCA_HTB_PARMS] = { .len = sizeof(struct tc_htb_opt) },
1023 [TCA_HTB_INIT] = { .len = sizeof(str 991 [TCA_HTB_INIT] = { .len = sizeof(struct tc_htb_glob) },
1024 [TCA_HTB_CTAB] = { .type = NLA_BINAR 992 [TCA_HTB_CTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
1025 [TCA_HTB_RTAB] = { .type = NLA_BINAR 993 [TCA_HTB_RTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
1026 [TCA_HTB_DIRECT_QLEN] = { .type = NLA 994 [TCA_HTB_DIRECT_QLEN] = { .type = NLA_U32 },
1027 [TCA_HTB_RATE64] = { .type = NLA_U64 995 [TCA_HTB_RATE64] = { .type = NLA_U64 },
1028 [TCA_HTB_CEIL64] = { .type = NLA_U64 996 [TCA_HTB_CEIL64] = { .type = NLA_U64 },
1029 [TCA_HTB_OFFLOAD] = { .type = NLA_FLA <<
1030 }; 997 };
1031 998
1032 static void htb_work_func(struct work_struct 999 static void htb_work_func(struct work_struct *work)
1033 { 1000 {
1034 struct htb_sched *q = container_of(wo 1001 struct htb_sched *q = container_of(work, struct htb_sched, work);
1035 struct Qdisc *sch = q->watchdog.qdisc 1002 struct Qdisc *sch = q->watchdog.qdisc;
1036 1003
1037 rcu_read_lock(); 1004 rcu_read_lock();
1038 __netif_schedule(qdisc_root(sch)); 1005 __netif_schedule(qdisc_root(sch));
1039 rcu_read_unlock(); 1006 rcu_read_unlock();
1040 } 1007 }
1041 1008
1042 static int htb_offload(struct net_device *dev !! 1009 static int htb_init(struct Qdisc *sch, struct nlattr *opt)
1043 { 1010 {
1044 return dev->netdev_ops->ndo_setup_tc( <<
1045 } <<
1046 <<
1047 static int htb_init(struct Qdisc *sch, struct <<
1048 struct netlink_ext_ack *e <<
1049 { <<
1050 struct net_device *dev = qdisc_dev(sc <<
1051 struct tc_htb_qopt_offload offload_op <<
1052 struct htb_sched *q = qdisc_priv(sch) 1011 struct htb_sched *q = qdisc_priv(sch);
1053 struct nlattr *tb[TCA_HTB_MAX + 1]; 1012 struct nlattr *tb[TCA_HTB_MAX + 1];
1054 struct tc_htb_glob *gopt; 1013 struct tc_htb_glob *gopt;
1055 unsigned int ntx; <<
1056 bool offload; <<
1057 int err; 1014 int err;
1058 !! 1015 int i;
1059 qdisc_watchdog_init(&q->watchdog, sch <<
1060 INIT_WORK(&q->work, htb_work_func); <<
1061 1016
1062 if (!opt) 1017 if (!opt)
1063 return -EINVAL; 1018 return -EINVAL;
1064 1019
1065 err = tcf_block_get(&q->block, &q->fi !! 1020 err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
1066 if (err) <<
1067 return err; <<
1068 <<
1069 err = nla_parse_nested_deprecated(tb, <<
1070 NUL <<
1071 if (err < 0) 1021 if (err < 0)
1072 return err; 1022 return err;
1073 1023
1074 if (!tb[TCA_HTB_INIT]) 1024 if (!tb[TCA_HTB_INIT])
1075 return -EINVAL; 1025 return -EINVAL;
1076 1026
1077 gopt = nla_data(tb[TCA_HTB_INIT]); 1027 gopt = nla_data(tb[TCA_HTB_INIT]);
1078 if (gopt->version != HTB_VER >> 16) 1028 if (gopt->version != HTB_VER >> 16)
1079 return -EINVAL; 1029 return -EINVAL;
1080 1030
1081 offload = nla_get_flag(tb[TCA_HTB_OFF <<
1082 <<
1083 if (offload) { <<
1084 if (sch->parent != TC_H_ROOT) <<
1085 NL_SET_ERR_MSG(extack <<
1086 return -EOPNOTSUPP; <<
1087 } <<
1088 <<
1089 if (!tc_can_offload(dev) || ! <<
1090 NL_SET_ERR_MSG(extack <<
1091 return -EOPNOTSUPP; <<
1092 } <<
1093 <<
1094 q->num_direct_qdiscs = dev->r <<
1095 q->direct_qdiscs = kcalloc(q- <<
1096 si <<
1097 GF <<
1098 if (!q->direct_qdiscs) <<
1099 return -ENOMEM; <<
1100 } <<
1101 <<
1102 err = qdisc_class_hash_init(&q->clhas 1031 err = qdisc_class_hash_init(&q->clhash);
1103 if (err < 0) 1032 if (err < 0)
1104 return err; 1033 return err;
>> 1034 for (i = 0; i < TC_HTB_NUMPRIO; i++)
>> 1035 INIT_LIST_HEAD(q->drops + i);
>> 1036
>> 1037 qdisc_watchdog_init(&q->watchdog, sch);
>> 1038 INIT_WORK(&q->work, htb_work_func);
>> 1039 qdisc_skb_head_init(&q->direct_queue);
1105 1040
1106 if (tb[TCA_HTB_DIRECT_QLEN]) 1041 if (tb[TCA_HTB_DIRECT_QLEN])
1107 q->direct_qlen = nla_get_u32( 1042 q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]);
1108 else 1043 else
1109 q->direct_qlen = qdisc_dev(sc 1044 q->direct_qlen = qdisc_dev(sch)->tx_queue_len;
1110 1045
1111 if ((q->rate2quantum = gopt->rate2qua 1046 if ((q->rate2quantum = gopt->rate2quantum) < 1)
1112 q->rate2quantum = 1; 1047 q->rate2quantum = 1;
1113 q->defcls = gopt->defcls; 1048 q->defcls = gopt->defcls;
1114 1049
1115 if (!offload) <<
1116 return 0; <<
1117 <<
1118 for (ntx = 0; ntx < q->num_direct_qdi <<
1119 struct netdev_queue *dev_queu <<
1120 struct Qdisc *qdisc; <<
1121 <<
1122 qdisc = qdisc_create_dflt(dev <<
1123 TC_ <<
1124 if (!qdisc) { <<
1125 return -ENOMEM; <<
1126 } <<
1127 <<
1128 q->direct_qdiscs[ntx] = qdisc <<
1129 qdisc->flags |= TCQ_F_ONETXQU <<
1130 } <<
1131 <<
1132 sch->flags |= TCQ_F_MQROOT; <<
1133 <<
1134 offload_opt = (struct tc_htb_qopt_off <<
1135 .command = TC_HTB_CREATE, <<
1136 .parent_classid = TC_H_MAJ(sc <<
1137 .classid = TC_H_MIN(q->defcls <<
1138 .extack = extack, <<
1139 }; <<
1140 err = htb_offload(dev, &offload_opt); <<
1141 if (err) <<
1142 return err; <<
1143 <<
1144 /* Defer this assignment, so that htb <<
1145 * parts (especially calling ndo_setu <<
1146 */ <<
1147 q->offload = true; <<
1148 <<
1149 return 0; 1050 return 0;
1150 } 1051 }
1151 1052
1152 static void htb_attach_offload(struct Qdisc * <<
1153 { <<
1154 struct net_device *dev = qdisc_dev(sc <<
1155 struct htb_sched *q = qdisc_priv(sch) <<
1156 unsigned int ntx; <<
1157 <<
1158 for (ntx = 0; ntx < q->num_direct_qdi <<
1159 struct Qdisc *old, *qdisc = q <<
1160 <<
1161 old = dev_graft_qdisc(qdisc-> <<
1162 qdisc_put(old); <<
1163 qdisc_hash_add(qdisc, false); <<
1164 } <<
1165 for (ntx = q->num_direct_qdiscs; ntx <<
1166 struct netdev_queue *dev_queu <<
1167 struct Qdisc *old = dev_graft <<
1168 <<
1169 qdisc_put(old); <<
1170 } <<
1171 <<
1172 kfree(q->direct_qdiscs); <<
1173 q->direct_qdiscs = NULL; <<
1174 } <<
1175 <<
1176 static void htb_attach_software(struct Qdisc <<
1177 { <<
1178 struct net_device *dev = qdisc_dev(sc <<
1179 unsigned int ntx; <<
1180 <<
1181 /* Resemble qdisc_graft behavior. */ <<
1182 for (ntx = 0; ntx < dev->num_tx_queue <<
1183 struct netdev_queue *dev_queu <<
1184 struct Qdisc *old = dev_graft <<
1185 <<
1186 qdisc_refcount_inc(sch); <<
1187 <<
1188 qdisc_put(old); <<
1189 } <<
1190 } <<
1191 <<
1192 static void htb_attach(struct Qdisc *sch) <<
1193 { <<
1194 struct htb_sched *q = qdisc_priv(sch) <<
1195 <<
1196 if (q->offload) <<
1197 htb_attach_offload(sch); <<
1198 else <<
1199 htb_attach_software(sch); <<
1200 } <<
1201 <<
1202 static int htb_dump(struct Qdisc *sch, struct 1053 static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
1203 { 1054 {
1204 struct htb_sched *q = qdisc_priv(sch) 1055 struct htb_sched *q = qdisc_priv(sch);
1205 struct nlattr *nest; 1056 struct nlattr *nest;
1206 struct tc_htb_glob gopt; 1057 struct tc_htb_glob gopt;
1207 1058
1208 if (q->offload) <<
1209 sch->flags |= TCQ_F_OFFLOADED <<
1210 else <<
1211 sch->flags &= ~TCQ_F_OFFLOADE <<
1212 <<
1213 sch->qstats.overlimits = q->overlimit <<
1214 /* Its safe to not acquire qdisc lock 1059 /* Its safe to not acquire qdisc lock. As we hold RTNL,
1215 * no change can happen on the qdisc 1060 * no change can happen on the qdisc parameters.
1216 */ 1061 */
1217 1062
1218 gopt.direct_pkts = q->direct_pkts; 1063 gopt.direct_pkts = q->direct_pkts;
1219 gopt.version = HTB_VER; 1064 gopt.version = HTB_VER;
1220 gopt.rate2quantum = q->rate2quantum; 1065 gopt.rate2quantum = q->rate2quantum;
1221 gopt.defcls = q->defcls; 1066 gopt.defcls = q->defcls;
1222 gopt.debug = 0; 1067 gopt.debug = 0;
1223 1068
1224 nest = nla_nest_start_noflag(skb, TCA !! 1069 nest = nla_nest_start(skb, TCA_OPTIONS);
1225 if (nest == NULL) 1070 if (nest == NULL)
1226 goto nla_put_failure; 1071 goto nla_put_failure;
1227 if (nla_put(skb, TCA_HTB_INIT, sizeof 1072 if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
1228 nla_put_u32(skb, TCA_HTB_DIRECT_Q 1073 nla_put_u32(skb, TCA_HTB_DIRECT_QLEN, q->direct_qlen))
1229 goto nla_put_failure; 1074 goto nla_put_failure;
1230 if (q->offload && nla_put_flag(skb, T <<
1231 goto nla_put_failure; <<
1232 1075
1233 return nla_nest_end(skb, nest); 1076 return nla_nest_end(skb, nest);
1234 1077
1235 nla_put_failure: 1078 nla_put_failure:
1236 nla_nest_cancel(skb, nest); 1079 nla_nest_cancel(skb, nest);
1237 return -1; 1080 return -1;
1238 } 1081 }
1239 1082
1240 static int htb_dump_class(struct Qdisc *sch, 1083 static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
1241 struct sk_buff *skb 1084 struct sk_buff *skb, struct tcmsg *tcm)
1242 { 1085 {
1243 struct htb_class *cl = (struct htb_cl 1086 struct htb_class *cl = (struct htb_class *)arg;
1244 struct htb_sched *q = qdisc_priv(sch) <<
1245 struct nlattr *nest; 1087 struct nlattr *nest;
1246 struct tc_htb_opt opt; 1088 struct tc_htb_opt opt;
1247 1089
1248 /* Its safe to not acquire qdisc lock 1090 /* Its safe to not acquire qdisc lock. As we hold RTNL,
1249 * no change can happen on the class 1091 * no change can happen on the class parameters.
1250 */ 1092 */
1251 tcm->tcm_parent = cl->parent ? cl->pa 1093 tcm->tcm_parent = cl->parent ? cl->parent->common.classid : TC_H_ROOT;
1252 tcm->tcm_handle = cl->common.classid; 1094 tcm->tcm_handle = cl->common.classid;
1253 if (!cl->level && cl->leaf.q) !! 1095 if (!cl->level && cl->un.leaf.q)
1254 tcm->tcm_info = cl->leaf.q->h !! 1096 tcm->tcm_info = cl->un.leaf.q->handle;
1255 1097
1256 nest = nla_nest_start_noflag(skb, TCA !! 1098 nest = nla_nest_start(skb, TCA_OPTIONS);
1257 if (nest == NULL) 1099 if (nest == NULL)
1258 goto nla_put_failure; 1100 goto nla_put_failure;
1259 1101
1260 memset(&opt, 0, sizeof(opt)); 1102 memset(&opt, 0, sizeof(opt));
1261 1103
1262 psched_ratecfg_getrate(&opt.rate, &cl 1104 psched_ratecfg_getrate(&opt.rate, &cl->rate);
1263 opt.buffer = PSCHED_NS2TICKS(cl->buff 1105 opt.buffer = PSCHED_NS2TICKS(cl->buffer);
1264 psched_ratecfg_getrate(&opt.ceil, &cl 1106 psched_ratecfg_getrate(&opt.ceil, &cl->ceil);
1265 opt.cbuffer = PSCHED_NS2TICKS(cl->cbu 1107 opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer);
1266 opt.quantum = cl->quantum; 1108 opt.quantum = cl->quantum;
1267 opt.prio = cl->prio; 1109 opt.prio = cl->prio;
1268 opt.level = cl->level; 1110 opt.level = cl->level;
1269 if (nla_put(skb, TCA_HTB_PARMS, sizeo 1111 if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt))
1270 goto nla_put_failure; 1112 goto nla_put_failure;
1271 if (q->offload && nla_put_flag(skb, T <<
1272 goto nla_put_failure; <<
1273 if ((cl->rate.rate_bytes_ps >= (1ULL 1113 if ((cl->rate.rate_bytes_ps >= (1ULL << 32)) &&
1274 nla_put_u64_64bit(skb, TCA_HTB_RA 1114 nla_put_u64_64bit(skb, TCA_HTB_RATE64, cl->rate.rate_bytes_ps,
1275 TCA_HTB_PAD)) 1115 TCA_HTB_PAD))
1276 goto nla_put_failure; 1116 goto nla_put_failure;
1277 if ((cl->ceil.rate_bytes_ps >= (1ULL 1117 if ((cl->ceil.rate_bytes_ps >= (1ULL << 32)) &&
1278 nla_put_u64_64bit(skb, TCA_HTB_CE 1118 nla_put_u64_64bit(skb, TCA_HTB_CEIL64, cl->ceil.rate_bytes_ps,
1279 TCA_HTB_PAD)) 1119 TCA_HTB_PAD))
1280 goto nla_put_failure; 1120 goto nla_put_failure;
1281 1121
1282 return nla_nest_end(skb, nest); 1122 return nla_nest_end(skb, nest);
1283 1123
1284 nla_put_failure: 1124 nla_put_failure:
1285 nla_nest_cancel(skb, nest); 1125 nla_nest_cancel(skb, nest);
1286 return -1; 1126 return -1;
1287 } 1127 }
1288 1128
1289 static void htb_offload_aggregate_stats(struc <<
1290 struc <<
1291 { <<
1292 u64 bytes = 0, packets = 0; <<
1293 struct htb_class *c; <<
1294 unsigned int i; <<
1295 <<
1296 gnet_stats_basic_sync_init(&cl->bstat <<
1297 <<
1298 for (i = 0; i < q->clhash.hashsize; i <<
1299 hlist_for_each_entry(c, &q->c <<
1300 struct htb_class *p = <<
1301 <<
1302 while (p && p->level <<
1303 p = p->parent <<
1304 <<
1305 if (p != cl) <<
1306 continue; <<
1307 <<
1308 bytes += u64_stats_re <<
1309 packets += u64_stats_ <<
1310 if (c->level == 0) { <<
1311 bytes += u64_ <<
1312 packets += u6 <<
1313 } <<
1314 } <<
1315 } <<
1316 _bstats_update(&cl->bstats, bytes, pa <<
1317 } <<
1318 <<
1319 static int 1129 static int
1320 htb_dump_class_stats(struct Qdisc *sch, unsig 1130 htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
1321 { 1131 {
1322 struct htb_class *cl = (struct htb_cl 1132 struct htb_class *cl = (struct htb_class *)arg;
1323 struct htb_sched *q = qdisc_priv(sch) <<
1324 struct gnet_stats_queue qs = { 1133 struct gnet_stats_queue qs = {
1325 .drops = cl->drops, 1134 .drops = cl->drops,
1326 .overlimits = cl->overlimits, <<
1327 }; 1135 };
1328 __u32 qlen = 0; 1136 __u32 qlen = 0;
1329 1137
1330 if (!cl->level && cl->leaf.q) !! 1138 if (!cl->level && cl->un.leaf.q) {
1331 qdisc_qstats_qlen_backlog(cl- !! 1139 qlen = cl->un.leaf.q->q.qlen;
1332 !! 1140 qs.backlog = cl->un.leaf.q->qstats.backlog;
>> 1141 }
1333 cl->xstats.tokens = clamp_t(s64, PSCH 1142 cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
1334 INT_MIN, 1143 INT_MIN, INT_MAX);
1335 cl->xstats.ctokens = clamp_t(s64, PSC 1144 cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
1336 INT_MIN, 1145 INT_MIN, INT_MAX);
1337 1146
1338 if (q->offload) { !! 1147 if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
1339 if (!cl->level) { !! 1148 d, NULL, &cl->bstats) < 0 ||
1340 if (cl->leaf.q) <<
1341 cl->bstats = <<
1342 else <<
1343 gnet_stats_ba <<
1344 _bstats_update(&cl->b <<
1345 u64_st <<
1346 u64_st <<
1347 } else { <<
1348 htb_offload_aggregate <<
1349 } <<
1350 } <<
1351 <<
1352 if (gnet_stats_copy_basic(d, NULL, &c <<
1353 gnet_stats_copy_rate_est(d, &cl-> 1149 gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
1354 gnet_stats_copy_queue(d, NULL, &q 1150 gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
1355 return -1; 1151 return -1;
1356 1152
1357 return gnet_stats_copy_app(d, &cl->xs 1153 return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));
1358 } 1154 }
1359 1155
1360 static struct netdev_queue * <<
1361 htb_select_queue(struct Qdisc *sch, struct tc <<
1362 { <<
1363 struct net_device *dev = qdisc_dev(sc <<
1364 struct tc_htb_qopt_offload offload_op <<
1365 struct htb_sched *q = qdisc_priv(sch) <<
1366 int err; <<
1367 <<
1368 if (!q->offload) <<
1369 return sch->dev_queue; <<
1370 <<
1371 offload_opt = (struct tc_htb_qopt_off <<
1372 .command = TC_HTB_LEAF_QUERY_ <<
1373 .classid = TC_H_MIN(tcm->tcm_ <<
1374 }; <<
1375 err = htb_offload(dev, &offload_opt); <<
1376 if (err || offload_opt.qid >= dev->nu <<
1377 return NULL; <<
1378 return netdev_get_tx_queue(dev, offlo <<
1379 } <<
1380 <<
1381 static struct Qdisc * <<
1382 htb_graft_helper(struct netdev_queue *dev_que <<
1383 { <<
1384 struct net_device *dev = dev_queue->d <<
1385 struct Qdisc *old_q; <<
1386 <<
1387 if (dev->flags & IFF_UP) <<
1388 dev_deactivate(dev); <<
1389 old_q = dev_graft_qdisc(dev_queue, ne <<
1390 if (new_q) <<
1391 new_q->flags |= TCQ_F_ONETXQU <<
1392 if (dev->flags & IFF_UP) <<
1393 dev_activate(dev); <<
1394 <<
1395 return old_q; <<
1396 } <<
1397 <<
1398 static struct netdev_queue *htb_offload_get_q <<
1399 { <<
1400 struct netdev_queue *queue; <<
1401 <<
1402 queue = cl->leaf.offload_queue; <<
1403 if (!(cl->leaf.q->flags & TCQ_F_BUILT <<
1404 WARN_ON(cl->leaf.q->dev_queue <<
1405 <<
1406 return queue; <<
1407 } <<
1408 <<
1409 static void htb_offload_move_qdisc(struct Qdi <<
1410 struct htb <<
1411 { <<
1412 struct netdev_queue *queue_old, *queu <<
1413 struct net_device *dev = qdisc_dev(sc <<
1414 <<
1415 queue_old = htb_offload_get_queue(cl_ <<
1416 queue_new = htb_offload_get_queue(cl_ <<
1417 <<
1418 if (!destroying) { <<
1419 struct Qdisc *qdisc; <<
1420 <<
1421 if (dev->flags & IFF_UP) <<
1422 dev_deactivate(dev); <<
1423 qdisc = dev_graft_qdisc(queue <<
1424 WARN_ON(qdisc != cl_old->leaf <<
1425 } <<
1426 <<
1427 if (!(cl_old->leaf.q->flags & TCQ_F_B <<
1428 cl_old->leaf.q->dev_queue = q <<
1429 cl_old->leaf.offload_queue = queue_ne <<
1430 <<
1431 if (!destroying) { <<
1432 struct Qdisc *qdisc; <<
1433 <<
1434 qdisc = dev_graft_qdisc(queue <<
1435 if (dev->flags & IFF_UP) <<
1436 dev_activate(dev); <<
1437 WARN_ON(!(qdisc->flags & TCQ_ <<
1438 } <<
1439 } <<
1440 <<
1441 static int htb_graft(struct Qdisc *sch, unsig 1156 static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
1442 struct Qdisc **old, stru !! 1157 struct Qdisc **old)
1443 { 1158 {
1444 struct netdev_queue *dev_queue = sch- <<
1445 struct htb_class *cl = (struct htb_cl 1159 struct htb_class *cl = (struct htb_class *)arg;
1446 struct htb_sched *q = qdisc_priv(sch) <<
1447 struct Qdisc *old_q; <<
1448 1160
1449 if (cl->level) 1161 if (cl->level)
1450 return -EINVAL; 1162 return -EINVAL;
>> 1163 if (new == NULL &&
>> 1164 (new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
>> 1165 cl->common.classid)) == NULL)
>> 1166 return -ENOBUFS;
1451 1167
1452 if (q->offload) !! 1168 *old = qdisc_replace(sch, new, &cl->un.leaf.q);
1453 dev_queue = htb_offload_get_q <<
1454 <<
1455 if (!new) { <<
1456 new = qdisc_create_dflt(dev_q <<
1457 cl->c <<
1458 if (!new) <<
1459 return -ENOBUFS; <<
1460 } <<
1461 <<
1462 if (q->offload) { <<
1463 /* One ref for cl->leaf.q, th <<
1464 qdisc_refcount_inc(new); <<
1465 old_q = htb_graft_helper(dev_ <<
1466 } <<
1467 <<
1468 *old = qdisc_replace(sch, new, &cl->l <<
1469 <<
1470 if (q->offload) { <<
1471 WARN_ON(old_q != *old); <<
1472 qdisc_put(old_q); <<
1473 } <<
1474 <<
1475 return 0; 1169 return 0;
1476 } 1170 }
1477 1171
1478 static struct Qdisc *htb_leaf(struct Qdisc *s 1172 static struct Qdisc *htb_leaf(struct Qdisc *sch, unsigned long arg)
1479 { 1173 {
1480 struct htb_class *cl = (struct htb_cl 1174 struct htb_class *cl = (struct htb_class *)arg;
1481 return !cl->level ? cl->leaf.q : NULL !! 1175 return !cl->level ? cl->un.leaf.q : NULL;
1482 } 1176 }
1483 1177
1484 static void htb_qlen_notify(struct Qdisc *sch 1178 static void htb_qlen_notify(struct Qdisc *sch, unsigned long arg)
1485 { 1179 {
1486 struct htb_class *cl = (struct htb_cl 1180 struct htb_class *cl = (struct htb_class *)arg;
1487 1181
1488 htb_deactivate(qdisc_priv(sch), cl); !! 1182 if (cl->un.leaf.q->q.qlen == 0)
>> 1183 htb_deactivate(qdisc_priv(sch), cl);
>> 1184 }
>> 1185
>> 1186 static unsigned long htb_get(struct Qdisc *sch, u32 classid)
>> 1187 {
>> 1188 struct htb_class *cl = htb_find(classid, sch);
>> 1189 if (cl)
>> 1190 cl->refcnt++;
>> 1191 return (unsigned long)cl;
1489 } 1192 }
1490 1193
1491 static inline int htb_parent_last_child(struc 1194 static inline int htb_parent_last_child(struct htb_class *cl)
1492 { 1195 {
1493 if (!cl->parent) 1196 if (!cl->parent)
1494 /* the root class */ 1197 /* the root class */
1495 return 0; 1198 return 0;
1496 if (cl->parent->children > 1) 1199 if (cl->parent->children > 1)
1497 /* not the last child */ 1200 /* not the last child */
1498 return 0; 1201 return 0;
1499 return 1; 1202 return 1;
1500 } 1203 }
1501 1204
1502 static void htb_parent_to_leaf(struct Qdisc * !! 1205 static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl,
1503 struct Qdisc * 1206 struct Qdisc *new_q)
1504 { 1207 {
1505 struct htb_sched *q = qdisc_priv(sch) <<
1506 struct htb_class *parent = cl->parent 1208 struct htb_class *parent = cl->parent;
1507 1209
1508 WARN_ON(cl->level || !cl->leaf.q || c !! 1210 WARN_ON(cl->level || !cl->un.leaf.q || cl->prio_activity);
1509 1211
1510 if (parent->cmode != HTB_CAN_SEND) 1212 if (parent->cmode != HTB_CAN_SEND)
1511 htb_safe_rb_erase(&parent->pq 1213 htb_safe_rb_erase(&parent->pq_node,
1512 &q->hlevel[ 1214 &q->hlevel[parent->level].wait_pq);
1513 1215
1514 parent->level = 0; 1216 parent->level = 0;
1515 memset(&parent->inner, 0, sizeof(pare !! 1217 memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1516 parent->leaf.q = new_q ? new_q : &noo !! 1218 INIT_LIST_HEAD(&parent->un.leaf.drop_list);
>> 1219 parent->un.leaf.q = new_q ? new_q : &noop_qdisc;
1517 parent->tokens = parent->buffer; 1220 parent->tokens = parent->buffer;
1518 parent->ctokens = parent->cbuffer; 1221 parent->ctokens = parent->cbuffer;
1519 parent->t_c = ktime_get_ns(); 1222 parent->t_c = ktime_get_ns();
1520 parent->cmode = HTB_CAN_SEND; 1223 parent->cmode = HTB_CAN_SEND;
1521 if (q->offload) <<
1522 parent->leaf.offload_queue = <<
1523 } <<
1524 <<
1525 static void htb_parent_to_leaf_offload(struct <<
1526 struct <<
1527 struct <<
1528 { <<
1529 struct Qdisc *old_q; <<
1530 <<
1531 /* One ref for cl->leaf.q, the other <<
1532 if (new_q) <<
1533 qdisc_refcount_inc(new_q); <<
1534 old_q = htb_graft_helper(dev_queue, n <<
1535 WARN_ON(!(old_q->flags & TCQ_F_BUILTI <<
1536 } <<
1537 <<
1538 static int htb_destroy_class_offload(struct Q <<
1539 bool las <<
1540 struct n <<
1541 { <<
1542 struct tc_htb_qopt_offload offload_op <<
1543 struct netdev_queue *dev_queue; <<
1544 struct Qdisc *q = cl->leaf.q; <<
1545 struct Qdisc *old; <<
1546 int err; <<
1547 <<
1548 if (cl->level) <<
1549 return -EINVAL; <<
1550 <<
1551 WARN_ON(!q); <<
1552 dev_queue = htb_offload_get_queue(cl) <<
1553 /* When destroying, caller qdisc_graf <<
1554 * qdisc_put for the qdisc being dest <<
1555 * does not need to graft or qdisc_pu <<
1556 */ <<
1557 if (!destroying) { <<
1558 old = htb_graft_helper(dev_qu <<
1559 /* Last qdisc grafted should <<
1560 * calling htb_delete. <<
1561 */ <<
1562 WARN_ON(old != q); <<
1563 } <<
1564 <<
1565 if (cl->parent) { <<
1566 _bstats_update(&cl->parent->b <<
1567 u64_stats_read <<
1568 u64_stats_read <<
1569 } <<
1570 <<
1571 offload_opt = (struct tc_htb_qopt_off <<
1572 .command = !last_child ? TC_H <<
1573 destroying ? TC_HT <<
1574 TC_HTB_LEAF_DEL_LA <<
1575 .classid = cl->common.classid <<
1576 .extack = extack, <<
1577 }; <<
1578 err = htb_offload(qdisc_dev(sch), &of <<
1579 <<
1580 if (!destroying) { <<
1581 if (!err) <<
1582 qdisc_put(old); <<
1583 else <<
1584 htb_graft_helper(dev_ <<
1585 } <<
1586 <<
1587 if (last_child) <<
1588 return err; <<
1589 <<
1590 if (!err && offload_opt.classid != TC <<
1591 u32 classid = TC_H_MAJ(sch->h <<
1592 TC_H_MIN(offloa <<
1593 struct htb_class *moved_cl = <<
1594 <<
1595 htb_offload_move_qdisc(sch, m <<
1596 } <<
1597 <<
1598 return err; <<
1599 } 1224 }
1600 1225
1601 static void htb_destroy_class(struct Qdisc *s 1226 static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
1602 { 1227 {
1603 if (!cl->level) { 1228 if (!cl->level) {
1604 WARN_ON(!cl->leaf.q); !! 1229 WARN_ON(!cl->un.leaf.q);
1605 qdisc_put(cl->leaf.q); !! 1230 qdisc_destroy(cl->un.leaf.q);
1606 } 1231 }
1607 gen_kill_estimator(&cl->rate_est); 1232 gen_kill_estimator(&cl->rate_est);
1608 tcf_block_put(cl->block); !! 1233 tcf_destroy_chain(&cl->filter_list);
1609 kfree(cl); 1234 kfree(cl);
1610 } 1235 }
1611 1236
1612 static void htb_destroy(struct Qdisc *sch) 1237 static void htb_destroy(struct Qdisc *sch)
1613 { 1238 {
1614 struct net_device *dev = qdisc_dev(sc <<
1615 struct tc_htb_qopt_offload offload_op <<
1616 struct htb_sched *q = qdisc_priv(sch) 1239 struct htb_sched *q = qdisc_priv(sch);
1617 struct hlist_node *next; 1240 struct hlist_node *next;
1618 bool nonempty, changed; <<
1619 struct htb_class *cl; 1241 struct htb_class *cl;
1620 unsigned int i; 1242 unsigned int i;
1621 1243
1622 cancel_work_sync(&q->work); 1244 cancel_work_sync(&q->work);
1623 qdisc_watchdog_cancel(&q->watchdog); 1245 qdisc_watchdog_cancel(&q->watchdog);
1624 /* This line used to be after htb_des 1246 /* This line used to be after htb_destroy_class call below
1625 * and surprisingly it worked in 2.4. 1247 * and surprisingly it worked in 2.4. But it must precede it
1626 * because filter need its target cla 1248 * because filter need its target class alive to be able to call
1627 * unbind_filter on it (without Oops) 1249 * unbind_filter on it (without Oops).
1628 */ 1250 */
1629 tcf_block_put(q->block); !! 1251 tcf_destroy_chain(&q->filter_list);
1630 1252
1631 for (i = 0; i < q->clhash.hashsize; i 1253 for (i = 0; i < q->clhash.hashsize; i++) {
1632 hlist_for_each_entry(cl, &q-> !! 1254 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode)
1633 tcf_block_put(cl->blo !! 1255 tcf_destroy_chain(&cl->filter_list);
1634 cl->block = NULL; !! 1256 }
1635 } !! 1257 for (i = 0; i < q->clhash.hashsize; i++) {
>> 1258 hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i],
>> 1259 common.hnode)
>> 1260 htb_destroy_class(sch, cl);
1636 } 1261 }
1637 <<
1638 do { <<
1639 nonempty = false; <<
1640 changed = false; <<
1641 for (i = 0; i < q->clhash.has <<
1642 hlist_for_each_entry_ <<
1643 <<
1644 bool last_chi <<
1645 <<
1646 if (!q->offlo <<
1647 htb_d <<
1648 conti <<
1649 } <<
1650 <<
1651 nonempty = tr <<
1652 <<
1653 if (cl->level <<
1654 conti <<
1655 <<
1656 changed = tru <<
1657 <<
1658 last_child = <<
1659 htb_destroy_c <<
1660 <<
1661 qdisc_class_h <<
1662 <<
1663 if (cl->paren <<
1664 cl->p <<
1665 if (last_chil <<
1666 htb_p <<
1667 htb_destroy_c <<
1668 } <<
1669 } <<
1670 } while (changed); <<
1671 WARN_ON(nonempty); <<
1672 <<
1673 qdisc_class_hash_destroy(&q->clhash); 1262 qdisc_class_hash_destroy(&q->clhash);
1674 __qdisc_reset_queue(&q->direct_queue) 1263 __qdisc_reset_queue(&q->direct_queue);
1675 <<
1676 if (q->offload) { <<
1677 offload_opt = (struct tc_htb_ <<
1678 .command = TC_HTB_DES <<
1679 }; <<
1680 htb_offload(dev, &offload_opt <<
1681 } <<
1682 <<
1683 if (!q->direct_qdiscs) <<
1684 return; <<
1685 for (i = 0; i < q->num_direct_qdiscs <<
1686 qdisc_put(q->direct_qdiscs[i] <<
1687 kfree(q->direct_qdiscs); <<
1688 } 1264 }
1689 1265
1690 static int htb_delete(struct Qdisc *sch, unsi !! 1266 static int htb_delete(struct Qdisc *sch, unsigned long arg)
1691 struct netlink_ext_ack <<
1692 { 1267 {
1693 struct htb_sched *q = qdisc_priv(sch) 1268 struct htb_sched *q = qdisc_priv(sch);
1694 struct htb_class *cl = (struct htb_cl 1269 struct htb_class *cl = (struct htb_class *)arg;
1695 struct Qdisc *new_q = NULL; 1270 struct Qdisc *new_q = NULL;
1696 int last_child = 0; 1271 int last_child = 0;
1697 int err; <<
1698 1272
1699 /* TODO: why don't allow to delete su 1273 /* TODO: why don't allow to delete subtree ? references ? does
1700 * tc subsys guarantee us that in htb 1274 * tc subsys guarantee us that in htb_destroy it holds no class
1701 * refs so that we can remove childre 1275 * refs so that we can remove children safely there ?
1702 */ 1276 */
1703 if (cl->children || qdisc_class_in_us !! 1277 if (cl->children || cl->filter_cnt)
1704 NL_SET_ERR_MSG(extack, "HTB c <<
1705 return -EBUSY; 1278 return -EBUSY;
1706 } <<
1707 1279
1708 if (!cl->level && htb_parent_last_chi !! 1280 if (!cl->level && htb_parent_last_child(cl)) {
>> 1281 new_q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
>> 1282 cl->parent->common.classid);
1709 last_child = 1; 1283 last_child = 1;
1710 <<
1711 if (q->offload) { <<
1712 err = htb_destroy_class_offlo <<
1713 <<
1714 if (err) <<
1715 return err; <<
1716 } <<
1717 <<
1718 if (last_child) { <<
1719 struct netdev_queue *dev_queu <<
1720 <<
1721 if (q->offload) <<
1722 dev_queue = htb_offlo <<
1723 <<
1724 new_q = qdisc_create_dflt(dev <<
1725 cl- <<
1726 NUL <<
1727 if (q->offload) <<
1728 htb_parent_to_leaf_of <<
1729 } 1284 }
1730 1285
1731 sch_tree_lock(sch); 1286 sch_tree_lock(sch);
1732 1287
1733 if (!cl->level) !! 1288 if (!cl->level) {
1734 qdisc_purge_queue(cl->leaf.q) !! 1289 unsigned int qlen = cl->un.leaf.q->q.qlen;
>> 1290 unsigned int backlog = cl->un.leaf.q->qstats.backlog;
>> 1291
>> 1292 qdisc_reset(cl->un.leaf.q);
>> 1293 qdisc_tree_reduce_backlog(cl->un.leaf.q, qlen, backlog);
>> 1294 }
1735 1295
1736 /* delete from hash and active; remai 1296 /* delete from hash and active; remainder in destroy_class */
1737 qdisc_class_hash_remove(&q->clhash, & 1297 qdisc_class_hash_remove(&q->clhash, &cl->common);
1738 if (cl->parent) 1298 if (cl->parent)
1739 cl->parent->children--; 1299 cl->parent->children--;
1740 1300
1741 if (cl->prio_activity) 1301 if (cl->prio_activity)
1742 htb_deactivate(q, cl); 1302 htb_deactivate(q, cl);
1743 1303
1744 if (cl->cmode != HTB_CAN_SEND) 1304 if (cl->cmode != HTB_CAN_SEND)
1745 htb_safe_rb_erase(&cl->pq_nod 1305 htb_safe_rb_erase(&cl->pq_node,
1746 &q->hlevel[ 1306 &q->hlevel[cl->level].wait_pq);
1747 1307
1748 if (last_child) 1308 if (last_child)
1749 htb_parent_to_leaf(sch, cl, n !! 1309 htb_parent_to_leaf(q, cl, new_q);
1750 1310
1751 sch_tree_unlock(sch); !! 1311 BUG_ON(--cl->refcnt == 0);
>> 1312 /*
>> 1313 * This shouldn't happen: we "hold" one cops->get() when called
>> 1314 * from tc_ctl_tclass; the destroy method is done from cops->put().
>> 1315 */
1752 1316
1753 htb_destroy_class(sch, cl); !! 1317 sch_tree_unlock(sch);
1754 return 0; 1318 return 0;
1755 } 1319 }
1756 1320
>> 1321 static void htb_put(struct Qdisc *sch, unsigned long arg)
>> 1322 {
>> 1323 struct htb_class *cl = (struct htb_class *)arg;
>> 1324
>> 1325 if (--cl->refcnt == 0)
>> 1326 htb_destroy_class(sch, cl);
>> 1327 }
>> 1328
1757 static int htb_change_class(struct Qdisc *sch 1329 static int htb_change_class(struct Qdisc *sch, u32 classid,
1758 u32 parentid, str 1330 u32 parentid, struct nlattr **tca,
1759 unsigned long *ar !! 1331 unsigned long *arg)
1760 { 1332 {
1761 int err = -EINVAL; 1333 int err = -EINVAL;
1762 struct htb_sched *q = qdisc_priv(sch) 1334 struct htb_sched *q = qdisc_priv(sch);
1763 struct htb_class *cl = (struct htb_cl 1335 struct htb_class *cl = (struct htb_class *)*arg, *parent;
1764 struct tc_htb_qopt_offload offload_op <<
1765 struct nlattr *opt = tca[TCA_OPTIONS] 1336 struct nlattr *opt = tca[TCA_OPTIONS];
1766 struct nlattr *tb[TCA_HTB_MAX + 1]; 1337 struct nlattr *tb[TCA_HTB_MAX + 1];
1767 struct Qdisc *parent_qdisc = NULL; <<
1768 struct netdev_queue *dev_queue; <<
1769 struct tc_htb_opt *hopt; 1338 struct tc_htb_opt *hopt;
1770 u64 rate64, ceil64; 1339 u64 rate64, ceil64;
1771 int warn = 0; <<
1772 1340
1773 /* extract all subattrs from opt attr 1341 /* extract all subattrs from opt attr */
1774 if (!opt) 1342 if (!opt)
1775 goto failure; 1343 goto failure;
1776 1344
1777 err = nla_parse_nested_deprecated(tb, !! 1345 err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
1778 ext <<
1779 if (err < 0) 1346 if (err < 0)
1780 goto failure; 1347 goto failure;
1781 1348
1782 err = -EINVAL; 1349 err = -EINVAL;
1783 if (tb[TCA_HTB_PARMS] == NULL) 1350 if (tb[TCA_HTB_PARMS] == NULL)
1784 goto failure; 1351 goto failure;
1785 1352
1786 parent = parentid == TC_H_ROOT ? NULL 1353 parent = parentid == TC_H_ROOT ? NULL : htb_find(parentid, sch);
1787 1354
1788 hopt = nla_data(tb[TCA_HTB_PARMS]); 1355 hopt = nla_data(tb[TCA_HTB_PARMS]);
1789 if (!hopt->rate.rate || !hopt->ceil.r 1356 if (!hopt->rate.rate || !hopt->ceil.rate)
1790 goto failure; 1357 goto failure;
1791 1358
1792 if (q->offload) { <<
1793 /* Options not supported by t <<
1794 if (hopt->rate.overhead || ho <<
1795 NL_SET_ERR_MSG(extack <<
1796 goto failure; <<
1797 } <<
1798 if (hopt->rate.mpu || hopt->c <<
1799 NL_SET_ERR_MSG(extack <<
1800 goto failure; <<
1801 } <<
1802 } <<
1803 <<
1804 /* Keeping backward compatible with r 1359 /* Keeping backward compatible with rate_table based iproute2 tc */
1805 if (hopt->rate.linklayer == TC_LINKLA 1360 if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE)
1806 qdisc_put_rtab(qdisc_get_rtab !! 1361 qdisc_put_rtab(qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]));
1807 <<
1808 1362
1809 if (hopt->ceil.linklayer == TC_LINKLA 1363 if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE)
1810 qdisc_put_rtab(qdisc_get_rtab !! 1364 qdisc_put_rtab(qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]));
1811 <<
1812 <<
1813 rate64 = tb[TCA_HTB_RATE64] ? nla_get <<
1814 ceil64 = tb[TCA_HTB_CEIL64] ? nla_get <<
1815 1365
1816 if (!cl) { /* new class 1366 if (!cl) { /* new class */
1817 struct net_device *dev = qdis !! 1367 struct Qdisc *new_q;
1818 struct Qdisc *new_q, *old_q; <<
1819 int prio; 1368 int prio;
1820 struct { 1369 struct {
1821 struct nlattr 1370 struct nlattr nla;
1822 struct gnet_estimator 1371 struct gnet_estimator opt;
1823 } est = { 1372 } est = {
1824 .nla = { 1373 .nla = {
1825 .nla_len 1374 .nla_len = nla_attr_size(sizeof(est.opt)),
1826 .nla_type 1375 .nla_type = TCA_RATE,
1827 }, 1376 },
1828 .opt = { 1377 .opt = {
1829 /* 4s interva 1378 /* 4s interval, 16s averaging constant */
1830 .interval 1379 .interval = 2,
1831 .ewma_log 1380 .ewma_log = 2,
1832 }, 1381 },
1833 }; 1382 };
1834 1383
1835 /* check for valid classid */ 1384 /* check for valid classid */
1836 if (!classid || TC_H_MAJ(clas 1385 if (!classid || TC_H_MAJ(classid ^ sch->handle) ||
1837 htb_find(classid, sch)) 1386 htb_find(classid, sch))
1838 goto failure; 1387 goto failure;
1839 1388
1840 /* check maximal depth */ 1389 /* check maximal depth */
1841 if (parent && parent->parent 1390 if (parent && parent->parent && parent->parent->level < 2) {
1842 NL_SET_ERR_MSG_MOD(ex !! 1391 pr_err("htb: tree is too deep\n");
1843 goto failure; 1392 goto failure;
1844 } 1393 }
1845 err = -ENOBUFS; 1394 err = -ENOBUFS;
1846 cl = kzalloc(sizeof(*cl), GFP 1395 cl = kzalloc(sizeof(*cl), GFP_KERNEL);
1847 if (!cl) 1396 if (!cl)
1848 goto failure; 1397 goto failure;
1849 1398
1850 gnet_stats_basic_sync_init(&c <<
1851 gnet_stats_basic_sync_init(&c <<
1852 <<
1853 err = tcf_block_get(&cl->bloc <<
1854 if (err) { <<
1855 kfree(cl); <<
1856 goto failure; <<
1857 } <<
1858 if (htb_rate_est || tca[TCA_R 1399 if (htb_rate_est || tca[TCA_RATE]) {
1859 err = gen_new_estimat 1400 err = gen_new_estimator(&cl->bstats, NULL,
1860 1401 &cl->rate_est,
1861 1402 NULL,
1862 !! 1403 qdisc_root_sleeping_running(sch),
1863 1404 tca[TCA_RATE] ? : &est.nla);
1864 if (err) !! 1405 if (err) {
1865 goto err_bloc !! 1406 kfree(cl);
>> 1407 goto failure;
>> 1408 }
1866 } 1409 }
1867 1410
>> 1411 cl->refcnt = 1;
1868 cl->children = 0; 1412 cl->children = 0;
>> 1413 INIT_LIST_HEAD(&cl->un.leaf.drop_list);
1869 RB_CLEAR_NODE(&cl->pq_node); 1414 RB_CLEAR_NODE(&cl->pq_node);
1870 1415
1871 for (prio = 0; prio < TC_HTB_ 1416 for (prio = 0; prio < TC_HTB_NUMPRIO; prio++)
1872 RB_CLEAR_NODE(&cl->no 1417 RB_CLEAR_NODE(&cl->node[prio]);
1873 1418
1874 cl->common.classid = classid; <<
1875 <<
1876 /* Make sure nothing interrup <<
1877 * ndo_setup_tc calls. <<
1878 */ <<
1879 ASSERT_RTNL(); <<
1880 <<
1881 /* create leaf qdisc early be 1419 /* create leaf qdisc early because it uses kmalloc(GFP_KERNEL)
1882 * so that can't be used insi 1420 * so that can't be used inside of sch_tree_lock
1883 * -- thanks to Karlis Peisen 1421 * -- thanks to Karlis Peisenieks
1884 */ 1422 */
1885 if (!q->offload) { !! 1423 new_q = qdisc_create_dflt(sch->dev_queue,
1886 dev_queue = sch->dev_ !! 1424 &pfifo_qdisc_ops, classid);
1887 } else if (!(parent && !paren <<
1888 /* Assign a dev_queue <<
1889 offload_opt = (struct <<
1890 .command = TC <<
1891 .classid = cl <<
1892 .parent_class <<
1893 TC_H_ <<
1894 TC_HT <<
1895 .rate = max_t <<
1896 .ceil = max_t <<
1897 .prio = hopt- <<
1898 .quantum = ho <<
1899 .extack = ext <<
1900 }; <<
1901 err = htb_offload(dev <<
1902 if (err) { <<
1903 NL_SET_ERR_MS <<
1904 <<
1905 goto err_kill <<
1906 } <<
1907 dev_queue = netdev_ge <<
1908 } else { /* First child. */ <<
1909 dev_queue = htb_offlo <<
1910 old_q = htb_graft_hel <<
1911 WARN_ON(old_q != pare <<
1912 offload_opt = (struct <<
1913 .command = TC <<
1914 .classid = cl <<
1915 .parent_class <<
1916 TC_H_ <<
1917 .rate = max_t <<
1918 .ceil = max_t <<
1919 .prio = hopt- <<
1920 .quantum = ho <<
1921 .extack = ext <<
1922 }; <<
1923 err = htb_offload(dev <<
1924 if (err) { <<
1925 NL_SET_ERR_MS <<
1926 <<
1927 htb_graft_hel <<
1928 goto err_kill <<
1929 } <<
1930 _bstats_update(&paren <<
1931 u64_st <<
1932 u64_st <<
1933 qdisc_put(old_q); <<
1934 } <<
1935 new_q = qdisc_create_dflt(dev <<
1936 cla <<
1937 if (q->offload) { <<
1938 /* One ref for cl->le <<
1939 if (new_q) <<
1940 qdisc_refcoun <<
1941 old_q = htb_graft_hel <<
1942 /* No qdisc_put neede <<
1943 WARN_ON(!(old_q->flag <<
1944 } <<
1945 sch_tree_lock(sch); 1425 sch_tree_lock(sch);
1946 if (parent && !parent->level) 1426 if (parent && !parent->level) {
>> 1427 unsigned int qlen = parent->un.leaf.q->q.qlen;
>> 1428 unsigned int backlog = parent->un.leaf.q->qstats.backlog;
>> 1429
1947 /* turn parent into i 1430 /* turn parent into inner node */
1948 qdisc_purge_queue(par !! 1431 qdisc_reset(parent->un.leaf.q);
1949 parent_qdisc = parent !! 1432 qdisc_tree_reduce_backlog(parent->un.leaf.q, qlen, backlog);
>> 1433 qdisc_destroy(parent->un.leaf.q);
1950 if (parent->prio_acti 1434 if (parent->prio_activity)
1951 htb_deactivat 1435 htb_deactivate(q, parent);
1952 1436
1953 /* remove from evt li 1437 /* remove from evt list because of level change */
1954 if (parent->cmode != 1438 if (parent->cmode != HTB_CAN_SEND) {
1955 htb_safe_rb_e 1439 htb_safe_rb_erase(&parent->pq_node, &q->hlevel[0].wait_pq);
1956 parent->cmode 1440 parent->cmode = HTB_CAN_SEND;
1957 } 1441 }
1958 parent->level = (pare 1442 parent->level = (parent->parent ? parent->parent->level
1959 : TC 1443 : TC_HTB_MAXDEPTH) - 1;
1960 memset(&parent->inner !! 1444 memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1961 } 1445 }
1962 <<
1963 /* leaf (we) needs elementary 1446 /* leaf (we) needs elementary qdisc */
1964 cl->leaf.q = new_q ? new_q : !! 1447 cl->un.leaf.q = new_q ? new_q : &noop_qdisc;
1965 if (q->offload) <<
1966 cl->leaf.offload_queu <<
1967 1448
>> 1449 cl->common.classid = classid;
1968 cl->parent = parent; 1450 cl->parent = parent;
1969 1451
1970 /* set class to be in HTB_CAN 1452 /* set class to be in HTB_CAN_SEND state */
1971 cl->tokens = PSCHED_TICKS2NS( 1453 cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
1972 cl->ctokens = PSCHED_TICKS2NS 1454 cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
1973 cl->mbuffer = 60ULL * NSEC_PE 1455 cl->mbuffer = 60ULL * NSEC_PER_SEC; /* 1min */
1974 cl->t_c = ktime_get_ns(); 1456 cl->t_c = ktime_get_ns();
1975 cl->cmode = HTB_CAN_SEND; 1457 cl->cmode = HTB_CAN_SEND;
1976 1458
1977 /* attach to the hash list an 1459 /* attach to the hash list and parent's family */
1978 qdisc_class_hash_insert(&q->c 1460 qdisc_class_hash_insert(&q->clhash, &cl->common);
1979 if (parent) 1461 if (parent)
1980 parent->children++; 1462 parent->children++;
1981 if (cl->leaf.q != &noop_qdisc !! 1463 if (cl->un.leaf.q != &noop_qdisc)
1982 qdisc_hash_add(cl->le !! 1464 qdisc_hash_add(cl->un.leaf.q, true);
1983 } else { 1465 } else {
1984 if (tca[TCA_RATE]) { 1466 if (tca[TCA_RATE]) {
1985 err = gen_replace_est 1467 err = gen_replace_estimator(&cl->bstats, NULL,
1986 1468 &cl->rate_est,
1987 1469 NULL,
1988 !! 1470 qdisc_root_sleeping_running(sch),
1989 1471 tca[TCA_RATE]);
1990 if (err) 1472 if (err)
1991 return err; 1473 return err;
1992 } 1474 }
1993 <<
1994 if (q->offload) { <<
1995 struct net_device *de <<
1996 <<
1997 offload_opt = (struct <<
1998 .command = TC <<
1999 .classid = cl <<
2000 .rate = max_t <<
2001 .ceil = max_t <<
2002 .prio = hopt- <<
2003 .quantum = ho <<
2004 .extack = ext <<
2005 }; <<
2006 err = htb_offload(dev <<
2007 if (err) <<
2008 /* Estimator <<
2009 * as well, s <<
2010 * the estima <<
2011 * offload an <<
2012 * only when <<
2013 */ <<
2014 return err; <<
2015 } <<
2016 <<
2017 sch_tree_lock(sch); 1475 sch_tree_lock(sch);
2018 } 1476 }
2019 1477
>> 1478 rate64 = tb[TCA_HTB_RATE64] ? nla_get_u64(tb[TCA_HTB_RATE64]) : 0;
>> 1479
>> 1480 ceil64 = tb[TCA_HTB_CEIL64] ? nla_get_u64(tb[TCA_HTB_CEIL64]) : 0;
>> 1481
2020 psched_ratecfg_precompute(&cl->rate, 1482 psched_ratecfg_precompute(&cl->rate, &hopt->rate, rate64);
2021 psched_ratecfg_precompute(&cl->ceil, 1483 psched_ratecfg_precompute(&cl->ceil, &hopt->ceil, ceil64);
2022 1484
2023 /* it used to be a nasty bug here, we 1485 /* it used to be a nasty bug here, we have to check that node
2024 * is really leaf before changing cl- !! 1486 * is really leaf before changing cl->un.leaf !
2025 */ 1487 */
2026 if (!cl->level) { 1488 if (!cl->level) {
2027 u64 quantum = cl->rate.rate_b 1489 u64 quantum = cl->rate.rate_bytes_ps;
2028 1490
2029 do_div(quantum, q->rate2quant 1491 do_div(quantum, q->rate2quantum);
2030 cl->quantum = min_t(u64, quan 1492 cl->quantum = min_t(u64, quantum, INT_MAX);
2031 1493
2032 if (!hopt->quantum && cl->qua 1494 if (!hopt->quantum && cl->quantum < 1000) {
2033 warn = -1; !! 1495 pr_warn("HTB: quantum of class %X is small. Consider r2q change.\n",
>> 1496 cl->common.classid);
2034 cl->quantum = 1000; 1497 cl->quantum = 1000;
2035 } 1498 }
2036 if (!hopt->quantum && cl->qua 1499 if (!hopt->quantum && cl->quantum > 200000) {
2037 warn = 1; !! 1500 pr_warn("HTB: quantum of class %X is big. Consider r2q change.\n",
>> 1501 cl->common.classid);
2038 cl->quantum = 200000; 1502 cl->quantum = 200000;
2039 } 1503 }
2040 if (hopt->quantum) 1504 if (hopt->quantum)
2041 cl->quantum = hopt->q 1505 cl->quantum = hopt->quantum;
2042 if ((cl->prio = hopt->prio) > 1506 if ((cl->prio = hopt->prio) >= TC_HTB_NUMPRIO)
2043 cl->prio = TC_HTB_NUM 1507 cl->prio = TC_HTB_NUMPRIO - 1;
2044 } 1508 }
2045 1509
2046 cl->buffer = PSCHED_TICKS2NS(hopt->bu 1510 cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
2047 cl->cbuffer = PSCHED_TICKS2NS(hopt->c 1511 cl->cbuffer = PSCHED_TICKS2NS(hopt->cbuffer);
2048 1512
2049 sch_tree_unlock(sch); 1513 sch_tree_unlock(sch);
2050 qdisc_put(parent_qdisc); <<
2051 <<
2052 if (warn) <<
2053 NL_SET_ERR_MSG_FMT_MOD(extack <<
2054 "quant <<
2055 cl->co <<
2056 1514
2057 qdisc_class_hash_grow(sch, &q->clhash 1515 qdisc_class_hash_grow(sch, &q->clhash);
2058 1516
2059 *arg = (unsigned long)cl; 1517 *arg = (unsigned long)cl;
2060 return 0; 1518 return 0;
2061 1519
2062 err_kill_estimator: <<
2063 gen_kill_estimator(&cl->rate_est); <<
2064 err_block_put: <<
2065 tcf_block_put(cl->block); <<
2066 kfree(cl); <<
2067 failure: 1520 failure:
2068 return err; 1521 return err;
2069 } 1522 }
2070 1523
2071 static struct tcf_block *htb_tcf_block(struct !! 1524 static struct tcf_proto __rcu **htb_find_tcf(struct Qdisc *sch,
2072 struct !! 1525 unsigned long arg)
2073 { 1526 {
2074 struct htb_sched *q = qdisc_priv(sch) 1527 struct htb_sched *q = qdisc_priv(sch);
2075 struct htb_class *cl = (struct htb_cl 1528 struct htb_class *cl = (struct htb_class *)arg;
>> 1529 struct tcf_proto __rcu **fl = cl ? &cl->filter_list : &q->filter_list;
2076 1530
2077 return cl ? cl->block : q->block; !! 1531 return fl;
2078 } 1532 }
2079 1533
2080 static unsigned long htb_bind_filter(struct Q 1534 static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent,
2081 u32 clas 1535 u32 classid)
2082 { 1536 {
2083 struct htb_class *cl = htb_find(class 1537 struct htb_class *cl = htb_find(classid, sch);
2084 1538
2085 /*if (cl && !cl->level) return 0; 1539 /*if (cl && !cl->level) return 0;
2086 * The line above used to be there to 1540 * The line above used to be there to prevent attaching filters to
2087 * leaves. But at least tc_index filt 1541 * leaves. But at least tc_index filter uses this just to get class
2088 * for other reasons so that we have 1542 * for other reasons so that we have to allow for it.
2089 * ---- 1543 * ----
2090 * 19.6.2002 As Werner explained it i 1544 * 19.6.2002 As Werner explained it is ok - bind filter is just
2091 * another way to "lock" the class - 1545 * another way to "lock" the class - unlike "get" this lock can
2092 * be broken by class during destroy 1546 * be broken by class during destroy IIUC.
2093 */ 1547 */
2094 if (cl) 1548 if (cl)
2095 qdisc_class_get(&cl->common); !! 1549 cl->filter_cnt++;
2096 return (unsigned long)cl; 1550 return (unsigned long)cl;
2097 } 1551 }
2098 1552
2099 static void htb_unbind_filter(struct Qdisc *s 1553 static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg)
2100 { 1554 {
2101 struct htb_class *cl = (struct htb_cl 1555 struct htb_class *cl = (struct htb_class *)arg;
2102 1556
2103 qdisc_class_put(&cl->common); !! 1557 if (cl)
>> 1558 cl->filter_cnt--;
2104 } 1559 }
2105 1560
2106 static void htb_walk(struct Qdisc *sch, struc 1561 static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)
2107 { 1562 {
2108 struct htb_sched *q = qdisc_priv(sch) 1563 struct htb_sched *q = qdisc_priv(sch);
2109 struct htb_class *cl; 1564 struct htb_class *cl;
2110 unsigned int i; 1565 unsigned int i;
2111 1566
2112 if (arg->stop) 1567 if (arg->stop)
2113 return; 1568 return;
2114 1569
2115 for (i = 0; i < q->clhash.hashsize; i 1570 for (i = 0; i < q->clhash.hashsize; i++) {
2116 hlist_for_each_entry(cl, &q-> 1571 hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
2117 if (!tc_qdisc_stats_d !! 1572 if (arg->count < arg->skip) {
>> 1573 arg->count++;
>> 1574 continue;
>> 1575 }
>> 1576 if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
>> 1577 arg->stop = 1;
2118 return; 1578 return;
>> 1579 }
>> 1580 arg->count++;
2119 } 1581 }
2120 } 1582 }
2121 } 1583 }
2122 1584
2123 static const struct Qdisc_class_ops htb_class 1585 static const struct Qdisc_class_ops htb_class_ops = {
2124 .select_queue = htb_select_qu <<
2125 .graft = htb_graft, 1586 .graft = htb_graft,
2126 .leaf = htb_leaf, 1587 .leaf = htb_leaf,
2127 .qlen_notify = htb_qlen_noti 1588 .qlen_notify = htb_qlen_notify,
2128 .find = htb_search, !! 1589 .get = htb_get,
>> 1590 .put = htb_put,
2129 .change = htb_change_cl 1591 .change = htb_change_class,
2130 .delete = htb_delete, 1592 .delete = htb_delete,
2131 .walk = htb_walk, 1593 .walk = htb_walk,
2132 .tcf_block = htb_tcf_block !! 1594 .tcf_chain = htb_find_tcf,
2133 .bind_tcf = htb_bind_filt 1595 .bind_tcf = htb_bind_filter,
2134 .unbind_tcf = htb_unbind_fi 1596 .unbind_tcf = htb_unbind_filter,
2135 .dump = htb_dump_clas 1597 .dump = htb_dump_class,
2136 .dump_stats = htb_dump_clas 1598 .dump_stats = htb_dump_class_stats,
2137 }; 1599 };
2138 1600
2139 static struct Qdisc_ops htb_qdisc_ops __read_ 1601 static struct Qdisc_ops htb_qdisc_ops __read_mostly = {
2140 .cl_ops = &htb_class_op 1602 .cl_ops = &htb_class_ops,
2141 .id = "htb", 1603 .id = "htb",
2142 .priv_size = sizeof(struct 1604 .priv_size = sizeof(struct htb_sched),
2143 .enqueue = htb_enqueue, 1605 .enqueue = htb_enqueue,
2144 .dequeue = htb_dequeue, 1606 .dequeue = htb_dequeue,
2145 .peek = qdisc_peek_de 1607 .peek = qdisc_peek_dequeued,
2146 .init = htb_init, 1608 .init = htb_init,
2147 .attach = htb_attach, <<
2148 .reset = htb_reset, 1609 .reset = htb_reset,
2149 .destroy = htb_destroy, 1610 .destroy = htb_destroy,
2150 .dump = htb_dump, 1611 .dump = htb_dump,
2151 .owner = THIS_MODULE, 1612 .owner = THIS_MODULE,
2152 }; 1613 };
2153 MODULE_ALIAS_NET_SCH("htb"); <<
2154 1614
2155 static int __init htb_module_init(void) 1615 static int __init htb_module_init(void)
2156 { 1616 {
2157 return register_qdisc(&htb_qdisc_ops) 1617 return register_qdisc(&htb_qdisc_ops);
2158 } 1618 }
2159 static void __exit htb_module_exit(void) 1619 static void __exit htb_module_exit(void)
2160 { 1620 {
2161 unregister_qdisc(&htb_qdisc_ops); 1621 unregister_qdisc(&htb_qdisc_ops);
2162 } 1622 }
2163 1623
2164 module_init(htb_module_init) 1624 module_init(htb_module_init)
2165 module_exit(htb_module_exit) 1625 module_exit(htb_module_exit)
2166 MODULE_LICENSE("GPL"); 1626 MODULE_LICENSE("GPL");
2167 MODULE_DESCRIPTION("Hierarchical Token Bucket <<
2168 1627
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.