Skip to content

L
linux
Commit 87990467 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files
Options

[HTB]: Lindent 

Code was a mess in terms of indentation.  Run through Lindent
script, and cleanup the damage. Also, don't use, vim magic
comment, and substitute inline for __inline__.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18a63e86
Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 475 deletions
net/sched/sch_htb.c
View file @ 87990467
/* vim: ts=8 sw=8 /*
* net/sched/sch_htb.c Hierarchical token bucket, feed tree version * net/sched/sch_htb.c Hierarchical token bucket, feed tree version
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
one less than their parent. one less than their parent.
*/ */
#define HTB_HSIZE 16 /* classid hash size */ #define HTB_HSIZE 16 /* classid hash size */
#define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */ #define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */
#define HTB_RATECM 1 /* whether to use rate computer */ #define HTB_RATECM 1 /* whether to use rate computer */
#define HTB_HYSTERESIS 1/* whether to use mode hysteresis for speedup */ #define HTB_HYSTERESIS 1 /* whether to use mode hysteresis for speedup */
#define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */ #define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */
#if HTB_VER >> 16 != TC_HTB_PROTOVER #if HTB_VER >> 16 != TC_HTB_PROTOVER
#error "Mismatched sch_htb.c and pkt_sch.h" #error "Mismatched sch_htb.c and pkt_sch.h"
...@@ -80,154 +80,152 @@ ...@@ -80,154 +80,152 @@
/* used internaly to keep status of single class */ /* used internaly to keep status of single class */
enum htb_cmode { enum htb_cmode {
HTB_CANT_SEND, /* class can't send and can't borrow */ HTB_CANT_SEND, /* class can't send and can't borrow */
HTB_MAY_BORROW, /* class can't send but may borrow */ HTB_MAY_BORROW, /* class can't send but may borrow */
HTB_CAN_SEND /* class can send */ HTB_CAN_SEND /* class can send */
}; };
/* interior & leaf nodes; props specific to leaves are marked L: */ /* interior & leaf nodes; props specific to leaves are marked L: */
struct htb_class struct htb_class {
{ /* general class parameters */
/* general class parameters */ u32 classid;
u32 classid; struct gnet_stats_basic bstats;
struct gnet_stats_basic bstats; struct gnet_stats_queue qstats;
struct gnet_stats_queue qstats; struct gnet_stats_rate_est rate_est;
struct gnet_stats_rate_est rate_est; struct tc_htb_xstats xstats; /* our special stats */
struct tc_htb_xstats xstats;/* our special stats */ int refcnt; /* usage count of this class */
int refcnt; /* usage count of this class */
#ifdef HTB_RATECM #ifdef HTB_RATECM
/* rate measurement counters */ /* rate measurement counters */
unsigned long rate_bytes,sum_bytes; unsigned long rate_bytes, sum_bytes;
unsigned long rate_packets,sum_packets; unsigned long rate_packets, sum_packets;
#endif #endif
/* topology */ /* topology */
int level; /* our level (see above) */ int level; /* our level (see above) */
struct htb_class *parent; /* parent class */ struct htb_class *parent; /* parent class */
struct list_head hlist; /* classid hash list item */ struct list_head hlist; /* classid hash list item */
struct list_head sibling; /* sibling list item */ struct list_head sibling; /* sibling list item */
struct list_head children; /* children list */ struct list_head children; /* children list */
union { union {
struct htb_class_leaf { struct htb_class_leaf {
struct Qdisc *q; struct Qdisc *q;
int prio; int prio;
int aprio; int aprio;
int quantum; int quantum;
int deficit[TC_HTB_MAXDEPTH]; int deficit[TC_HTB_MAXDEPTH];
struct list_head drop_list; struct list_head drop_list;
} leaf; } leaf;
struct htb_class_inner { struct htb_class_inner {
struct rb_root feed[TC_HTB_NUMPRIO]; /* feed trees */ struct rb_root feed[TC_HTB_NUMPRIO]; /* feed trees */
struct rb_node *ptr[TC_HTB_NUMPRIO]; /* current class ptr */ struct rb_node *ptr[TC_HTB_NUMPRIO]; /* current class ptr */
/* When class changes from state 1->2 and disconnects from /* When class changes from state 1->2 and disconnects from
parent's feed then we lost ptr value and start from the parent's feed then we lost ptr value and start from the
first child again. Here we store classid of the first child again. Here we store classid of the
last valid ptr (used when ptr is NULL). */ last valid ptr (used when ptr is NULL). */
u32 last_ptr_id[TC_HTB_NUMPRIO]; u32 last_ptr_id[TC_HTB_NUMPRIO];
} inner; } inner;
} un; } un;
struct rb_node node[TC_HTB_NUMPRIO]; /* node for self or feed tree */ struct rb_node node[TC_HTB_NUMPRIO]; /* node for self or feed tree */
struct rb_node pq_node; /* node for event queue */ struct rb_node pq_node; /* node for event queue */
unsigned long pq_key; /* the same type as jiffies global */ unsigned long pq_key; /* the same type as jiffies global */
int prio_activity; /* for which prios are we active */ int prio_activity; /* for which prios are we active */
enum htb_cmode cmode; /* current mode of the class */ enum htb_cmode cmode; /* current mode of the class */
/* class attached filters */ /* class attached filters */
struct tcf_proto *filter_list; struct tcf_proto *filter_list;
int filter_cnt; int filter_cnt;
int warned; /* only one warning about non work conserving .. */ int warned; /* only one warning about non work conserving .. */
/* token bucket parameters */ /* token bucket parameters */
struct qdisc_rate_table *rate; /* rate table of the class itself */ struct qdisc_rate_table *rate; /* rate table of the class itself */
struct qdisc_rate_table *ceil; /* ceiling rate (limits borrows too) */ struct qdisc_rate_table *ceil; /* ceiling rate (limits borrows too) */
long buffer,cbuffer; /* token bucket depth/rate */ long buffer, cbuffer; /* token bucket depth/rate */
psched_tdiff_t mbuffer; /* max wait time */ psched_tdiff_t mbuffer; /* max wait time */
long tokens,ctokens; /* current number of tokens */ long tokens, ctokens; /* current number of tokens */
psched_time_t t_c; /* checkpoint time */ psched_time_t t_c; /* checkpoint time */
}; };
/* TODO: maybe compute rate when size is too large .. or drop ? */ /* TODO: maybe compute rate when size is too large .. or drop ? */
static __inline__ long L2T(struct htb_class *cl,struct qdisc_rate_table *rate, static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate,
int size) int size)
{ {
int slot = size >> rate->rate.cell_log; int slot = size >> rate->rate.cell_log;
if (slot > 255) { if (slot > 255) {
cl->xstats.giants++; cl->xstats.giants++;
slot = 255; slot = 255;
} }
return rate->data[slot]; return rate->data[slot];
} }
struct htb_sched struct htb_sched {
{ struct list_head root; /* root classes list */
struct list_head root; /* root classes list */ struct list_head hash[HTB_HSIZE]; /* hashed by classid */
struct list_head hash[HTB_HSIZE]; /* hashed by classid */ struct list_head drops[TC_HTB_NUMPRIO]; /* active leaves (for drops) */
struct list_head drops[TC_HTB_NUMPRIO]; /* active leaves (for drops) */
/* self list - roots of self generating tree */
/* self list - roots of self generating tree */ struct rb_root row[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO];
struct rb_root row[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO]; int row_mask[TC_HTB_MAXDEPTH];
int row_mask[TC_HTB_MAXDEPTH]; struct rb_node *ptr[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO];
struct rb_node *ptr[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO]; u32 last_ptr_id[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO];
u32 last_ptr_id[TC_HTB_MAXDEPTH][TC_HTB_NUMPRIO];
/* self wait list - roots of wait PQs per row */ /* self wait list - roots of wait PQs per row */
struct rb_root wait_pq[TC_HTB_MAXDEPTH]; struct rb_root wait_pq[TC_HTB_MAXDEPTH];
/* time of nearest event per level (row) */ /* time of nearest event per level (row) */
unsigned long near_ev_cache[TC_HTB_MAXDEPTH]; unsigned long near_ev_cache[TC_HTB_MAXDEPTH];
/* cached value of jiffies in dequeue */ /* cached value of jiffies in dequeue */
unsigned long jiffies; unsigned long jiffies;
/* whether we hit non-work conserving class during this dequeue; we use */ /* whether we hit non-work conserving class during this dequeue; we use */
int nwc_hit; /* this to disable mindelay complaint in dequeue */ int nwc_hit; /* this to disable mindelay complaint in dequeue */
int defcls; /* class where unclassified flows go to */ int defcls; /* class where unclassified flows go to */
/* filters for qdisc itself */ /* filters for qdisc itself */
struct tcf_proto *filter_list; struct tcf_proto *filter_list;
int filter_cnt; int filter_cnt;
int rate2quantum; /* quant = rate / rate2quantum */ int rate2quantum; /* quant = rate / rate2quantum */
psched_time_t now; /* cached dequeue time */ psched_time_t now; /* cached dequeue time */
struct timer_list timer; /* send delay timer */ struct timer_list timer; /* send delay timer */
#ifdef HTB_RATECM #ifdef HTB_RATECM
struct timer_list rttim; /* rate computer timer */ struct timer_list rttim; /* rate computer timer */
int recmp_bucket; /* which hash bucket to recompute next */ int recmp_bucket; /* which hash bucket to recompute next */
#endif #endif
/* non shaped skbs; let them go directly thru */
struct sk_buff_head direct_queue;
int direct_qlen; /* max qlen of above */
long direct_pkts; /* non shaped skbs; let them go directly thru */
struct sk_buff_head direct_queue;
int direct_qlen; /* max qlen of above */
long direct_pkts;
}; };
/* compute hash of size HTB_HSIZE for given handle */ /* compute hash of size HTB_HSIZE for given handle */
static __inline__ int htb_hash(u32 h) static inline int htb_hash(u32 h)
{ {
#if HTB_HSIZE != 16 #if HTB_HSIZE != 16
#error "Declare new hash for your HTB_HSIZE" #error "Declare new hash for your HTB_HSIZE"
#endif #endif
h ^= h>>8; /* stolen from cbq_hash */ h ^= h >> 8; /* stolen from cbq_hash */
h ^= h>>4; h ^= h >> 4;
return h & 0xf; return h & 0xf;
} }
/* find class in global hash table using given handle */ /* find class in global hash table using given handle */
static __inline__ struct htb_class *htb_find(u32 handle, struct Qdisc *sch) static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct list_head *p; struct list_head *p;
if (TC_H_MAJ(handle) != sch->handle) if (TC_H_MAJ(handle) != sch->handle)
return NULL; return NULL;
list_for_each (p,q->hash+htb_hash(handle)) { list_for_each(p, q->hash + htb_hash(handle)) {
struct htb_class *cl = list_entry(p,struct htb_class,hlist); struct htb_class *cl = list_entry(p, struct htb_class, hlist);
if (cl->classid == handle) if (cl->classid == handle)
return cl; return cl;
} }
...@@ -252,7 +250,8 @@ static inline u32 htb_classid(struct htb_class *cl) ...@@ -252,7 +250,8 @@ static inline u32 htb_classid(struct htb_class *cl)
return (cl && cl != HTB_DIRECT) ? cl->classid : TC_H_UNSPEC; return (cl && cl != HTB_DIRECT) ? cl->classid : TC_H_UNSPEC;
} }
static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
int *qerr)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl; struct htb_class *cl;
...@@ -264,8 +263,8 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in ...@@ -264,8 +263,8 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in
note that nfmark can be used too by attaching filter fw with no note that nfmark can be used too by attaching filter fw with no
rules in it */ rules in it */
if (skb->priority == sch->handle) if (skb->priority == sch->handle)
return HTB_DIRECT; /* X:0 (direct flow) selected */ return HTB_DIRECT; /* X:0 (direct flow) selected */
if ((cl = htb_find(skb->priority,sch)) != NULL && cl->level == 0) if ((cl = htb_find(skb->priority, sch)) != NULL && cl->level == 0)
return cl; return cl;
*qerr = NET_XMIT_BYPASS; *qerr = NET_XMIT_BYPASS;
...@@ -274,7 +273,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in ...@@ -274,7 +273,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
switch (result) { switch (result) {
case TC_ACT_QUEUED: case TC_ACT_QUEUED:
case TC_ACT_STOLEN: case TC_ACT_STOLEN:
*qerr = NET_XMIT_SUCCESS; *qerr = NET_XMIT_SUCCESS;
case TC_ACT_SHOT: case TC_ACT_SHOT:
return NULL; return NULL;
...@@ -283,22 +282,22 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in ...@@ -283,22 +282,22 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in
if (result == TC_POLICE_SHOT) if (result == TC_POLICE_SHOT)
return HTB_DIRECT; return HTB_DIRECT;
#endif #endif
if ((cl = (void*)res.class) == NULL) { if ((cl = (void *)res.class) == NULL) {
if (res.classid == sch->handle) if (res.classid == sch->handle)
return HTB_DIRECT; /* X:0 (direct flow) */ return HTB_DIRECT; /* X:0 (direct flow) */
if ((cl = htb_find(res.classid,sch)) == NULL) if ((cl = htb_find(res.classid, sch)) == NULL)
break; /* filter selected invalid classid */ break; /* filter selected invalid classid */
} }
if (!cl->level) if (!cl->level)
return cl; /* we hit leaf; return it */ return cl; /* we hit leaf; return it */
/* we have got inner class; apply inner filter chain */ /* we have got inner class; apply inner filter chain */
tcf = cl->filter_list; tcf = cl->filter_list;
} }
/* classification failed; try to use default class */ /* classification failed; try to use default class */
cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch->handle),q->defcls),sch); cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch->handle), q->defcls), sch);
if (!cl || cl->level) if (!cl || cl->level)
return HTB_DIRECT; /* bad default .. this is safe bet */ return HTB_DIRECT; /* bad default .. this is safe bet */
return cl; return cl;
} }
...@@ -308,18 +307,19 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in ...@@ -308,18 +307,19 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in
* Routine adds class to the list (actually tree) sorted by classid. * Routine adds class to the list (actually tree) sorted by classid.
* Make sure that class is not already on such list for given prio. * Make sure that class is not already on such list for given prio.
*/ */
static void htb_add_to_id_tree (struct rb_root *root, static void htb_add_to_id_tree(struct rb_root *root,
struct htb_class *cl,int prio) struct htb_class *cl, int prio)
{ {
struct rb_node **p = &root->rb_node, *parent = NULL; struct rb_node **p = &root->rb_node, *parent = NULL;
while (*p) { while (*p) {
struct htb_class *c; parent = *p; struct htb_class *c;
parent = *p;
c = rb_entry(parent, struct htb_class, node[prio]); c = rb_entry(parent, struct htb_class, node[prio]);
if (cl->classid > c->classid) if (cl->classid > c->classid)
p = &parent->rb_right; p = &parent->rb_right;
else else
p = &parent->rb_left; p = &parent->rb_left;
} }
rb_link_node(&cl->node[prio], parent, p); rb_link_node(&cl->node[prio], parent, p);
...@@ -333,8 +333,8 @@ static void htb_add_to_id_tree (struct rb_root *root, ...@@ -333,8 +333,8 @@ static void htb_add_to_id_tree (struct rb_root *root,
* change its mode in cl->pq_key microseconds. Make sure that class is not * change its mode in cl->pq_key microseconds. Make sure that class is not
* already in the queue. * already in the queue.
*/ */
static void htb_add_to_wait_tree (struct htb_sched *q, static void htb_add_to_wait_tree(struct htb_sched *q,
struct htb_class *cl,long delay) struct htb_class *cl, long delay)
{ {
struct rb_node **p = &q->wait_pq[cl->level].rb_node, *parent = NULL; struct rb_node **p = &q->wait_pq[cl->level].rb_node, *parent = NULL;
...@@ -345,13 +345,14 @@ static void htb_add_to_wait_tree (struct htb_sched *q, ...@@ -345,13 +345,14 @@ static void htb_add_to_wait_tree (struct htb_sched *q,
/* update the nearest event cache */ /* update the nearest event cache */
if (time_after(q->near_ev_cache[cl->level], cl->pq_key)) if (time_after(q->near_ev_cache[cl->level], cl->pq_key))
q->near_ev_cache[cl->level] = cl->pq_key; q->near_ev_cache[cl->level] = cl->pq_key;
while (*p) { while (*p) {
struct htb_class *c; parent = *p; struct htb_class *c;
parent = *p;
c = rb_entry(parent, struct htb_class, pq_node); c = rb_entry(parent, struct htb_class, pq_node);
if (time_after_eq(cl->pq_key, c->pq_key)) if (time_after_eq(cl->pq_key, c->pq_key))
p = &parent->rb_right; p = &parent->rb_right;
else else
p = &parent->rb_left; p = &parent->rb_left;
} }
rb_link_node(&cl->pq_node, parent, p); rb_link_node(&cl->pq_node, parent, p);
...@@ -375,14 +376,14 @@ static void htb_next_rb_node(struct rb_node **n) ...@@ -375,14 +376,14 @@ static void htb_next_rb_node(struct rb_node **n)
* The class is added to row at priorities marked in mask. * The class is added to row at priorities marked in mask.
* It does nothing if mask == 0. * It does nothing if mask == 0.
*/ */
static inline void htb_add_class_to_row(struct htb_sched *q, static inline void htb_add_class_to_row(struct htb_sched *q,
struct htb_class *cl,int mask) struct htb_class *cl, int mask)
{ {
q->row_mask[cl->level] |= mask; q->row_mask[cl->level] |= mask;
while (mask) { while (mask) {
int prio = ffz(~mask); int prio = ffz(~mask);
mask &= ~(1 << prio); mask &= ~(1 << prio);
htb_add_to_id_tree(q->row[cl->level]+prio,cl,prio); htb_add_to_id_tree(q->row[cl->level] + prio, cl, prio);
} }
} }
...@@ -392,18 +393,18 @@ static inline void htb_add_class_to_row(struct htb_sched *q, ...@@ -392,18 +393,18 @@ static inline void htb_add_class_to_row(struct htb_sched *q,
* The class is removed from row at priorities marked in mask. * The class is removed from row at priorities marked in mask.
* It does nothing if mask == 0. * It does nothing if mask == 0.
*/ */
static __inline__ void htb_remove_class_from_row(struct htb_sched *q, static inline void htb_remove_class_from_row(struct htb_sched *q,
struct htb_class *cl,int mask) struct htb_class *cl, int mask)
{ {
int m = 0; int m = 0;
while (mask) { while (mask) {
int prio = ffz(~mask); int prio = ffz(~mask);
mask &= ~(1 << prio); mask &= ~(1 << prio);
if (q->ptr[cl->level][prio] == cl->node+prio) if (q->ptr[cl->level][prio] == cl->node + prio)
htb_next_rb_node(q->ptr[cl->level]+prio); htb_next_rb_node(q->ptr[cl->level] + prio);
rb_erase(cl->node + prio,q->row[cl->level]+prio); rb_erase(cl->node + prio, q->row[cl->level] + prio);
if (!q->row[cl->level][prio].rb_node) if (!q->row[cl->level][prio].rb_node)
m |= 1 << prio; m |= 1 << prio;
} }
q->row_mask[cl->level] &= ~m; q->row_mask[cl->level] &= ~m;
...@@ -416,30 +417,31 @@ static __inline__ void htb_remove_class_from_row(struct htb_sched *q, ...@@ -416,30 +417,31 @@ static __inline__ void htb_remove_class_from_row(struct htb_sched *q,
* for priorities it is participating on. cl->cmode must be new * for priorities it is participating on. cl->cmode must be new
* (activated) mode. It does nothing if cl->prio_activity == 0. * (activated) mode. It does nothing if cl->prio_activity == 0.
*/ */
static void htb_activate_prios(struct htb_sched *q,struct htb_class *cl) static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl)
{ {
struct htb_class *p = cl->parent; struct htb_class *p = cl->parent;
long m,mask = cl->prio_activity; long m, mask = cl->prio_activity;
while (cl->cmode == HTB_MAY_BORROW && p && mask) { while (cl->cmode == HTB_MAY_BORROW && p && mask) {
m = mask;
m = mask; while (m) { while (m) {
int prio = ffz(~m); int prio = ffz(~m);
m &= ~(1 << prio); m &= ~(1 << prio);
if (p->un.inner.feed[prio].rb_node) if (p->un.inner.feed[prio].rb_node)
/* parent already has its feed in use so that /* parent already has its feed in use so that
reset bit in mask as parent is already ok */ reset bit in mask as parent is already ok */
mask &= ~(1 << prio); mask &= ~(1 << prio);
htb_add_to_id_tree(p->un.inner.feed+prio,cl,prio); htb_add_to_id_tree(p->un.inner.feed + prio, cl, prio);
} }
p->prio_activity |= mask; p->prio_activity |= mask;
cl = p; p = cl->parent; cl = p;
p = cl->parent;
} }
if (cl->cmode == HTB_CAN_SEND && mask) if (cl->cmode == HTB_CAN_SEND && mask)
htb_add_class_to_row(q,cl,mask); htb_add_class_to_row(q, cl, mask);
} }
/** /**
...@@ -452,35 +454,36 @@ static void htb_activate_prios(struct htb_sched *q,struct htb_class *cl) ...@@ -452,35 +454,36 @@ static void htb_activate_prios(struct htb_sched *q,struct htb_class *cl)
static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl) static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl)
{ {
struct htb_class *p = cl->parent; struct htb_class *p = cl->parent;
long m,mask = cl->prio_activity; long m, mask = cl->prio_activity;
while (cl->cmode == HTB_MAY_BORROW && p && mask) { while (cl->cmode == HTB_MAY_BORROW && p && mask) {
m = mask; mask = 0; m = mask;
mask = 0;
while (m) { while (m) {
int prio = ffz(~m); int prio = ffz(~m);
m &= ~(1 << prio); m &= ~(1 << prio);
if (p->un.inner.ptr[prio] == cl->node+prio) { if (p->un.inner.ptr[prio] == cl->node + prio) {
/* we are removing child which is pointed to from /* we are removing child which is pointed to from
parent feed - forget the pointer but remember parent feed - forget the pointer but remember
classid */ classid */
p->un.inner.last_ptr_id[prio] = cl->classid; p->un.inner.last_ptr_id[prio] = cl->classid;
p->un.inner.ptr[prio] = NULL; p->un.inner.ptr[prio] = NULL;
} }
rb_erase(cl->node + prio,p->un.inner.feed + prio); rb_erase(cl->node + prio, p->un.inner.feed + prio);
if (!p->un.inner.feed[prio].rb_node) if (!p->un.inner.feed[prio].rb_node)
mask |= 1 << prio; mask |= 1 << prio;
} }
p->prio_activity &= ~mask; p->prio_activity &= ~mask;
cl = p; p = cl->parent; cl = p;
p = cl->parent;
} }
if (cl->cmode == HTB_CAN_SEND && mask) if (cl->cmode == HTB_CAN_SEND && mask)
htb_remove_class_from_row(q,cl,mask); htb_remove_class_from_row(q, cl, mask);
} }
#if HTB_HYSTERESIS #if HTB_HYSTERESIS
...@@ -508,21 +511,21 @@ static inline long htb_hiwater(const struct htb_class *cl) ...@@ -508,21 +511,21 @@ static inline long htb_hiwater(const struct htb_class *cl)
* 0 .. -cl->{c,}buffer range. It is meant to limit number of * 0 .. -cl->{c,}buffer range. It is meant to limit number of
* mode transitions per time unit. The speed gain is about 1/6. * mode transitions per time unit. The speed gain is about 1/6.
*/ */
static __inline__ enum htb_cmode static inline enum htb_cmode
htb_class_mode(struct htb_class *cl,long *diff) htb_class_mode(struct htb_class *cl, long *diff)
{ {
long toks; long toks;
if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) { if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
*diff = -toks; *diff = -toks;
return HTB_CANT_SEND; return HTB_CANT_SEND;
} }
if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl)) if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
return HTB_CAN_SEND; return HTB_CAN_SEND;
*diff = -toks; *diff = -toks;
return HTB_MAY_BORROW; return HTB_MAY_BORROW;
} }
/** /**
...@@ -534,22 +537,21 @@ htb_class_mode(struct htb_class *cl,long *diff) ...@@ -534,22 +537,21 @@ htb_class_mode(struct htb_class *cl,long *diff)
* be different from old one and cl->pq_key has to be valid if changing * be different from old one and cl->pq_key has to be valid if changing
* to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree). * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
*/ */
static void static void
htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff) htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff)
{ {
enum htb_cmode new_mode = htb_class_mode(cl,diff); enum htb_cmode new_mode = htb_class_mode(cl, diff);
if (new_mode == cl->cmode) if (new_mode == cl->cmode)
return; return;
if (cl->prio_activity) { /* not necessary: speed optimization */ if (cl->prio_activity) { /* not necessary: speed optimization */
if (cl->cmode != HTB_CANT_SEND) if (cl->cmode != HTB_CANT_SEND)
htb_deactivate_prios(q,cl); htb_deactivate_prios(q, cl);
cl->cmode = new_mode; cl->cmode = new_mode;
if (new_mode != HTB_CANT_SEND) if (new_mode != HTB_CANT_SEND)
htb_activate_prios(q,cl); htb_activate_prios(q, cl);
} else } else
cl->cmode = new_mode; cl->cmode = new_mode;
} }
...@@ -560,14 +562,15 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff) ...@@ -560,14 +562,15 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff)
* for the prio. It can be called on already active leaf safely. * for the prio. It can be called on already active leaf safely.
* It also adds leaf into droplist. * It also adds leaf into droplist.
*/ */
static __inline__ void htb_activate(struct htb_sched *q,struct htb_class *cl) static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
{ {
BUG_TRAP(!cl->level && cl->un.leaf.q && cl->un.leaf.q->q.qlen); BUG_TRAP(!cl->level && cl->un.leaf.q && cl->un.leaf.q->q.qlen);
if (!cl->prio_activity) { if (!cl->prio_activity) {
cl->prio_activity = 1 << (cl->un.leaf.aprio = cl->un.leaf.prio); cl->prio_activity = 1 << (cl->un.leaf.aprio = cl->un.leaf.prio);
htb_activate_prios(q,cl); htb_activate_prios(q, cl);
list_add_tail(&cl->un.leaf.drop_list,q->drops+cl->un.leaf.aprio); list_add_tail(&cl->un.leaf.drop_list,
q->drops + cl->un.leaf.aprio);
} }
} }
...@@ -577,97 +580,100 @@ static __inline__ void htb_activate(struct htb_sched *q,struct htb_class *cl) ...@@ -577,97 +580,100 @@ static __inline__ void htb_activate(struct htb_sched *q,struct htb_class *cl)
* Make sure that leaf is active. In the other words it can't be called * Make sure that leaf is active. In the other words it can't be called
* with non-active leaf. It also removes class from the drop list. * with non-active leaf. It also removes class from the drop list.
*/ */
static __inline__ void static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl)
htb_deactivate(struct htb_sched *q,struct htb_class *cl)
{ {
BUG_TRAP(cl->prio_activity); BUG_TRAP(cl->prio_activity);
htb_deactivate_prios(q,cl); htb_deactivate_prios(q, cl);
cl->prio_activity = 0; cl->prio_activity = 0;
list_del_init(&cl->un.leaf.drop_list); list_del_init(&cl->un.leaf.drop_list);
} }
static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
{ {
int ret; int ret;
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = htb_classify(skb,sch,&ret); struct htb_class *cl = htb_classify(skb, sch, &ret);
if (cl == HTB_DIRECT) { if (cl == HTB_DIRECT) {
/* enqueue to helper queue */ /* enqueue to helper queue */
if (q->direct_queue.qlen < q->direct_qlen) { if (q->direct_queue.qlen < q->direct_qlen) {
__skb_queue_tail(&q->direct_queue, skb); __skb_queue_tail(&q->direct_queue, skb);
q->direct_pkts++; q->direct_pkts++;
} else { } else {
kfree_skb(skb); kfree_skb(skb);
sch->qstats.drops++; sch->qstats.drops++;
return NET_XMIT_DROP; return NET_XMIT_DROP;
} }
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
} else if (!cl) { } else if (!cl) {
if (ret == NET_XMIT_BYPASS) if (ret == NET_XMIT_BYPASS)
sch->qstats.drops++; sch->qstats.drops++;
kfree_skb (skb); kfree_skb(skb);
return ret; return ret;
#endif #endif
} else if (cl->un.leaf.q->enqueue(skb, cl->un.leaf.q) != NET_XMIT_SUCCESS) { } else if (cl->un.leaf.q->enqueue(skb, cl->un.leaf.q) !=
sch->qstats.drops++; NET_XMIT_SUCCESS) {
cl->qstats.drops++; sch->qstats.drops++;
return NET_XMIT_DROP; cl->qstats.drops++;
} else { return NET_XMIT_DROP;
cl->bstats.packets++; cl->bstats.bytes += skb->len; } else {
htb_activate (q,cl); cl->bstats.packets++;
} cl->bstats.bytes += skb->len;
htb_activate(q, cl);
sch->q.qlen++; }
sch->bstats.packets++; sch->bstats.bytes += skb->len;
return NET_XMIT_SUCCESS; sch->q.qlen++;
sch->bstats.packets++;
sch->bstats.bytes += skb->len;
return NET_XMIT_SUCCESS;
} }
/* TODO: requeuing packet charges it to policers again !! */ /* TODO: requeuing packet charges it to policers again !! */
static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch) static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
int ret = NET_XMIT_SUCCESS; int ret = NET_XMIT_SUCCESS;
struct htb_class *cl = htb_classify(skb,sch, &ret); struct htb_class *cl = htb_classify(skb, sch, &ret);
struct sk_buff *tskb; struct sk_buff *tskb;
if (cl == HTB_DIRECT || !cl) { if (cl == HTB_DIRECT || !cl) {
/* enqueue to helper queue */ /* enqueue to helper queue */
if (q->direct_queue.qlen < q->direct_qlen && cl) { if (q->direct_queue.qlen < q->direct_qlen && cl) {
__skb_queue_head(&q->direct_queue, skb); __skb_queue_head(&q->direct_queue, skb);
} else { } else {
__skb_queue_head(&q->direct_queue, skb); __skb_queue_head(&q->direct_queue, skb);
tskb = __skb_dequeue_tail(&q->direct_queue); tskb = __skb_dequeue_tail(&q->direct_queue);
kfree_skb (tskb); kfree_skb(tskb);
sch->qstats.drops++; sch->qstats.drops++;
return NET_XMIT_CN; return NET_XMIT_CN;
} }
} else if (cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q) != NET_XMIT_SUCCESS) { } else if (cl->un.leaf.q->ops->requeue(skb, cl->un.leaf.q) !=
sch->qstats.drops++; NET_XMIT_SUCCESS) {
cl->qstats.drops++; sch->qstats.drops++;
return NET_XMIT_DROP; cl->qstats.drops++;
} else return NET_XMIT_DROP;
htb_activate (q,cl); } else
htb_activate(q, cl);
sch->q.qlen++;
sch->qstats.requeues++; sch->q.qlen++;
return NET_XMIT_SUCCESS; sch->qstats.requeues++;
return NET_XMIT_SUCCESS;
} }
static void htb_timer(unsigned long arg) static void htb_timer(unsigned long arg)
{ {
struct Qdisc *sch = (struct Qdisc*)arg; struct Qdisc *sch = (struct Qdisc *)arg;
sch->flags &= ~TCQ_F_THROTTLED; sch->flags &= ~TCQ_F_THROTTLED;
wmb(); wmb();
netif_schedule(sch->dev); netif_schedule(sch->dev);
} }
#ifdef HTB_RATECM #ifdef HTB_RATECM
#define RT_GEN(D,R) R+=D-(R/HTB_EWMAC);D=0 #define RT_GEN(D,R) R+=D-(R/HTB_EWMAC);D=0
static void htb_rate_timer(unsigned long arg) static void htb_rate_timer(unsigned long arg)
{ {
struct Qdisc *sch = (struct Qdisc*)arg; struct Qdisc *sch = (struct Qdisc *)arg;
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct list_head *p; struct list_head *p;
...@@ -678,13 +684,13 @@ static void htb_rate_timer(unsigned long arg) ...@@ -678,13 +684,13 @@ static void htb_rate_timer(unsigned long arg)
add_timer(&q->rttim); add_timer(&q->rttim);
/* scan and recompute one bucket at time */ /* scan and recompute one bucket at time */
if (++q->recmp_bucket >= HTB_HSIZE) if (++q->recmp_bucket >= HTB_HSIZE)
q->recmp_bucket = 0; q->recmp_bucket = 0;
list_for_each (p,q->hash+q->recmp_bucket) { list_for_each(p, q->hash + q->recmp_bucket) {
struct htb_class *cl = list_entry(p,struct htb_class,hlist); struct htb_class *cl = list_entry(p, struct htb_class, hlist);
RT_GEN (cl->sum_bytes,cl->rate_bytes); RT_GEN(cl->sum_bytes, cl->rate_bytes);
RT_GEN (cl->sum_packets,cl->rate_packets); RT_GEN(cl->sum_packets, cl->rate_packets);
} }
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
} }
...@@ -701,10 +707,10 @@ static void htb_rate_timer(unsigned long arg) ...@@ -701,10 +707,10 @@ static void htb_rate_timer(unsigned long arg)
* CAN_SEND) because we can use more precise clock that event queue here. * CAN_SEND) because we can use more precise clock that event queue here.
* In such case we remove class from event queue first. * In such case we remove class from event queue first.
*/ */
static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
int level,int bytes) int level, int bytes)
{ {
long toks,diff; long toks, diff;
enum htb_cmode old_mode; enum htb_cmode old_mode;
#define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ #define HTB_ACCNT(T,B,R) toks = diff + cl->T; \
...@@ -714,29 +720,31 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, ...@@ -714,29 +720,31 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
cl->T = toks cl->T = toks
while (cl) { while (cl) {
diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer); diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer);
if (cl->level >= level) { if (cl->level >= level) {
if (cl->level == level) cl->xstats.lends++; if (cl->level == level)
HTB_ACCNT (tokens,buffer,rate); cl->xstats.lends++;
HTB_ACCNT(tokens, buffer, rate);
} else { } else {
cl->xstats.borrows++; cl->xstats.borrows++;
cl->tokens += diff; /* we moved t_c; update tokens */ cl->tokens += diff; /* we moved t_c; update tokens */
} }
HTB_ACCNT (ctokens,cbuffer,ceil); HTB_ACCNT(ctokens, cbuffer, ceil);
cl->t_c = q->now; cl->t_c = q->now;
old_mode = cl->cmode; diff = 0; old_mode = cl->cmode;
htb_change_class_mode(q,cl,&diff); diff = 0;
htb_change_class_mode(q, cl, &diff);
if (old_mode != cl->cmode) { if (old_mode != cl->cmode) {
if (old_mode != HTB_CAN_SEND) if (old_mode != HTB_CAN_SEND)
rb_erase(&cl->pq_node,q->wait_pq+cl->level); rb_erase(&cl->pq_node, q->wait_pq + cl->level);
if (cl->cmode != HTB_CAN_SEND) if (cl->cmode != HTB_CAN_SEND)
htb_add_to_wait_tree (q,cl,diff); htb_add_to_wait_tree(q, cl, diff);
} }
#ifdef HTB_RATECM #ifdef HTB_RATECM
/* update rate counters */ /* update rate counters */
cl->sum_bytes += bytes; cl->sum_packets++; cl->sum_bytes += bytes;
cl->sum_packets++;
#endif #endif
/* update byte stats except for leaves which are already updated */ /* update byte stats except for leaves which are already updated */
...@@ -755,7 +763,7 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, ...@@ -755,7 +763,7 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
* next pending event (0 for no event in pq). * next pending event (0 for no event in pq).
* Note: Aplied are events whose have cl->pq_key <= jiffies. * Note: Aplied are events whose have cl->pq_key <= jiffies.
*/ */
static long htb_do_events(struct htb_sched *q,int level) static long htb_do_events(struct htb_sched *q, int level)
{ {
int i; int i;
...@@ -763,34 +771,38 @@ static long htb_do_events(struct htb_sched *q,int level) ...@@ -763,34 +771,38 @@ static long htb_do_events(struct htb_sched *q,int level)
struct htb_class *cl; struct htb_class *cl;
long diff; long diff;
struct rb_node *p = q->wait_pq[level].rb_node; struct rb_node *p = q->wait_pq[level].rb_node;
if (!p) return 0; if (!p)
while (p->rb_left) p = p->rb_left; return 0;
while (p->rb_left)
p = p->rb_left;
cl = rb_entry(p, struct htb_class, pq_node); cl = rb_entry(p, struct htb_class, pq_node);
if (time_after(cl->pq_key, q->jiffies)) { if (time_after(cl->pq_key, q->jiffies)) {
return cl->pq_key - q->jiffies; return cl->pq_key - q->jiffies;
} }
rb_erase(p,q->wait_pq+level); rb_erase(p, q->wait_pq + level);
diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer); diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer);
htb_change_class_mode(q,cl,&diff); htb_change_class_mode(q, cl, &diff);
if (cl->cmode != HTB_CAN_SEND) if (cl->cmode != HTB_CAN_SEND)
htb_add_to_wait_tree (q,cl,diff); htb_add_to_wait_tree(q, cl, diff);
} }
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_WARNING "htb: too many events !\n"); printk(KERN_WARNING "htb: too many events !\n");
return HZ/10; return HZ / 10;
} }
/* Returns class->node+prio from id-tree where classe's id is >= id. NULL /* Returns class->node+prio from id-tree where classe's id is >= id. NULL
is no such one exists. */ is no such one exists. */
static struct rb_node * static struct rb_node *htb_id_find_next_upper(int prio, struct rb_node *n,
htb_id_find_next_upper(int prio,struct rb_node *n,u32 id) u32 id)
{ {
struct rb_node *r = NULL; struct rb_node *r = NULL;
while (n) { while (n) {
struct htb_class *cl = rb_entry(n,struct htb_class,node[prio]); struct htb_class *cl =
if (id == cl->classid) return n; rb_entry(n, struct htb_class, node[prio]);
if (id == cl->classid)
return n;
if (id > cl->classid) { if (id > cl->classid) {
n = n->rb_right; n = n->rb_right;
} else { } else {
...@@ -806,46 +818,49 @@ htb_id_find_next_upper(int prio,struct rb_node *n,u32 id) ...@@ -806,46 +818,49 @@ htb_id_find_next_upper(int prio,struct rb_node *n,u32 id)
* *
* Find leaf where current feed pointers points to. * Find leaf where current feed pointers points to.
*/ */
static struct htb_class * static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
htb_lookup_leaf(struct rb_root *tree,int prio,struct rb_node **pptr,u32 *pid) struct rb_node **pptr, u32 * pid)
{ {
int i; int i;
struct { struct {
struct rb_node *root; struct rb_node *root;
struct rb_node **pptr; struct rb_node **pptr;
u32 *pid; u32 *pid;
} stk[TC_HTB_MAXDEPTH],*sp = stk; } stk[TC_HTB_MAXDEPTH], *sp = stk;
BUG_TRAP(tree->rb_node); BUG_TRAP(tree->rb_node);
sp->root = tree->rb_node; sp->root = tree->rb_node;
sp->pptr = pptr; sp->pptr = pptr;
sp->pid = pid; sp->pid = pid;
for (i = 0; i < 65535; i++) { for (i = 0; i < 65535; i++) {
if (!*sp->pptr && *sp->pid) { if (!*sp->pptr && *sp->pid) {
/* ptr was invalidated but id is valid - try to recover /* ptr was invalidated but id is valid - try to recover
the original or next ptr */ the original or next ptr */
*sp->pptr = htb_id_find_next_upper(prio,sp->root,*sp->pid); *sp->pptr =
htb_id_find_next_upper(prio, sp->root, *sp->pid);
} }
*sp->pid = 0; /* ptr is valid now so that remove this hint as it *sp->pid = 0; /* ptr is valid now so that remove this hint as it
can become out of date quickly */ can become out of date quickly */
if (!*sp->pptr) { /* we are at right end; rewind & go up */ if (!*sp->pptr) { /* we are at right end; rewind & go up */
*sp->pptr = sp->root; *sp->pptr = sp->root;
while ((*sp->pptr)->rb_left) while ((*sp->pptr)->rb_left)
*sp->pptr = (*sp->pptr)->rb_left; *sp->pptr = (*sp->pptr)->rb_left;
if (sp > stk) { if (sp > stk) {
sp--; sp--;
BUG_TRAP(*sp->pptr); if(!*sp->pptr) return NULL; BUG_TRAP(*sp->pptr);
htb_next_rb_node (sp->pptr); if (!*sp->pptr)
return NULL;
htb_next_rb_node(sp->pptr);
} }
} else { } else {
struct htb_class *cl; struct htb_class *cl;
cl = rb_entry(*sp->pptr,struct htb_class,node[prio]); cl = rb_entry(*sp->pptr, struct htb_class, node[prio]);
if (!cl->level) if (!cl->level)
return cl; return cl;
(++sp)->root = cl->un.inner.feed[prio].rb_node; (++sp)->root = cl->un.inner.feed[prio].rb_node;
sp->pptr = cl->un.inner.ptr+prio; sp->pptr = cl->un.inner.ptr + prio;
sp->pid = cl->un.inner.last_ptr_id+prio; sp->pid = cl->un.inner.last_ptr_id + prio;
} }
} }
BUG_TRAP(0); BUG_TRAP(0);
...@@ -854,19 +869,21 @@ htb_lookup_leaf(struct rb_root *tree,int prio,struct rb_node **pptr,u32 *pid) ...@@ -854,19 +869,21 @@ htb_lookup_leaf(struct rb_root *tree,int prio,struct rb_node **pptr,u32 *pid)
/* dequeues packet at given priority and level; call only if /* dequeues packet at given priority and level; call only if
you are sure that there is active class at prio/level */ you are sure that there is active class at prio/level */
static struct sk_buff * static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
htb_dequeue_tree(struct htb_sched *q,int prio,int level) int level)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
struct htb_class *cl,*start; struct htb_class *cl, *start;
/* look initial class up in the row */ /* look initial class up in the row */
start = cl = htb_lookup_leaf (q->row[level]+prio,prio, start = cl = htb_lookup_leaf(q->row[level] + prio, prio,
q->ptr[level]+prio,q->last_ptr_id[level]+prio); q->ptr[level] + prio,
q->last_ptr_id[level] + prio);
do { do {
next: next:
BUG_TRAP(cl); BUG_TRAP(cl);
if (!cl) return NULL; if (!cl)
return NULL;
/* class can be empty - it is unlikely but can be true if leaf /* class can be empty - it is unlikely but can be true if leaf
qdisc drops packets in enqueue routine or if someone used qdisc drops packets in enqueue routine or if someone used
...@@ -874,56 +891,64 @@ htb_dequeue_tree(struct htb_sched *q,int prio,int level) ...@@ -874,56 +891,64 @@ htb_dequeue_tree(struct htb_sched *q,int prio,int level)
simply deactivate and skip such class */ simply deactivate and skip such class */
if (unlikely(cl->un.leaf.q->q.qlen == 0)) { if (unlikely(cl->un.leaf.q->q.qlen == 0)) {
struct htb_class *next; struct htb_class *next;
htb_deactivate(q,cl); htb_deactivate(q, cl);
/* row/level might become empty */ /* row/level might become empty */
if ((q->row_mask[level] & (1 << prio)) == 0) if ((q->row_mask[level] & (1 << prio)) == 0)
return NULL; return NULL;
next = htb_lookup_leaf (q->row[level]+prio,
prio,q->ptr[level]+prio,q->last_ptr_id[level]+prio);
if (cl == start) /* fix start if we just deleted it */ next = htb_lookup_leaf(q->row[level] + prio,
prio, q->ptr[level] + prio,
q->last_ptr_id[level] + prio);
if (cl == start) /* fix start if we just deleted it */
start = next; start = next;
cl = next; cl = next;
goto next; goto next;
} }
if (likely((skb = cl->un.leaf.q->dequeue(cl->un.leaf.q)) != NULL)) skb = cl->un.leaf.q->dequeue(cl->un.leaf.q);
if (likely(skb != NULL))
break; break;
if (!cl->warned) { if (!cl->warned) {
printk(KERN_WARNING "htb: class %X isn't work conserving ?!\n",cl->classid); printk(KERN_WARNING
"htb: class %X isn't work conserving ?!\n",
cl->classid);
cl->warned = 1; cl->warned = 1;
} }
q->nwc_hit++; q->nwc_hit++;
htb_next_rb_node((level?cl->parent->un.inner.ptr:q->ptr[0])+prio); htb_next_rb_node((level ? cl->parent->un.inner.ptr : q->
cl = htb_lookup_leaf (q->row[level]+prio,prio,q->ptr[level]+prio, ptr[0]) + prio);
q->last_ptr_id[level]+prio); cl = htb_lookup_leaf(q->row[level] + prio, prio,
q->ptr[level] + prio,
q->last_ptr_id[level] + prio);
} while (cl != start); } while (cl != start);
if (likely(skb != NULL)) { if (likely(skb != NULL)) {
if ((cl->un.leaf.deficit[level] -= skb->len) < 0) { if ((cl->un.leaf.deficit[level] -= skb->len) < 0) {
cl->un.leaf.deficit[level] += cl->un.leaf.quantum; cl->un.leaf.deficit[level] += cl->un.leaf.quantum;
htb_next_rb_node((level?cl->parent->un.inner.ptr:q->ptr[0])+prio); htb_next_rb_node((level ? cl->parent->un.inner.ptr : q->
ptr[0]) + prio);
} }
/* this used to be after charge_class but this constelation /* this used to be after charge_class but this constelation
gives us slightly better performance */ gives us slightly better performance */
if (!cl->un.leaf.q->q.qlen) if (!cl->un.leaf.q->q.qlen)
htb_deactivate (q,cl); htb_deactivate(q, cl);
htb_charge_class (q,cl,level,skb->len); htb_charge_class(q, cl, level, skb->len);
} }
return skb; return skb;
} }
static void htb_delay_by(struct Qdisc *sch,long delay) static void htb_delay_by(struct Qdisc *sch, long delay)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
if (delay <= 0) delay = 1; if (delay <= 0)
if (unlikely(delay > 5*HZ)) { delay = 1;
if (unlikely(delay > 5 * HZ)) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_INFO "HTB delay %ld > 5sec\n", delay); printk(KERN_INFO "HTB delay %ld > 5sec\n", delay);
delay = 5*HZ; delay = 5 * HZ;
} }
/* why don't use jiffies here ? because expires can be in past */ /* why don't use jiffies here ? because expires can be in past */
mod_timer(&q->timer, q->jiffies + delay); mod_timer(&q->timer, q->jiffies + delay);
...@@ -941,13 +966,15 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) ...@@ -941,13 +966,15 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
q->jiffies = jiffies; q->jiffies = jiffies;
/* try to dequeue direct packets as high prio (!) to minimize cpu work */ /* try to dequeue direct packets as high prio (!) to minimize cpu work */
if ((skb = __skb_dequeue(&q->direct_queue)) != NULL) { skb = __skb_dequeue(&q->direct_queue);
if (skb != NULL) {
sch->flags &= ~TCQ_F_THROTTLED; sch->flags &= ~TCQ_F_THROTTLED;
sch->q.qlen--; sch->q.qlen--;
return skb; return skb;
} }
if (!sch->q.qlen) goto fin; if (!sch->q.qlen)
goto fin;
PSCHED_GET_TIME(q->now); PSCHED_GET_TIME(q->now);
min_delay = LONG_MAX; min_delay = LONG_MAX;
...@@ -957,18 +984,19 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) ...@@ -957,18 +984,19 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
int m; int m;
long delay; long delay;
if (time_after_eq(q->jiffies, q->near_ev_cache[level])) { if (time_after_eq(q->jiffies, q->near_ev_cache[level])) {
delay = htb_do_events(q,level); delay = htb_do_events(q, level);
q->near_ev_cache[level] = q->jiffies + (delay ? delay : HZ); q->near_ev_cache[level] =
q->jiffies + (delay ? delay : HZ);
} else } else
delay = q->near_ev_cache[level] - q->jiffies; delay = q->near_ev_cache[level] - q->jiffies;
if (delay && min_delay > delay) if (delay && min_delay > delay)
min_delay = delay; min_delay = delay;
m = ~q->row_mask[level]; m = ~q->row_mask[level];
while (m != (int)(-1)) { while (m != (int)(-1)) {
int prio = ffz (m); int prio = ffz(m);
m |= 1 << prio; m |= 1 << prio;
skb = htb_dequeue_tree(q,prio,level); skb = htb_dequeue_tree(q, prio, level);
if (likely(skb != NULL)) { if (likely(skb != NULL)) {
sch->q.qlen--; sch->q.qlen--;
sch->flags &= ~TCQ_F_THROTTLED; sch->flags &= ~TCQ_F_THROTTLED;
...@@ -976,28 +1004,28 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) ...@@ -976,28 +1004,28 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
} }
} }
} }
htb_delay_by (sch,min_delay > 5*HZ ? 5*HZ : min_delay); htb_delay_by(sch, min_delay > 5 * HZ ? 5 * HZ : min_delay);
fin: fin:
return skb; return skb;
} }
/* try to drop from each class (by prio) until one succeed */ /* try to drop from each class (by prio) until one succeed */
static unsigned int htb_drop(struct Qdisc* sch) static unsigned int htb_drop(struct Qdisc *sch)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
int prio; int prio;
for (prio = TC_HTB_NUMPRIO - 1; prio >= 0; prio--) { for (prio = TC_HTB_NUMPRIO - 1; prio >= 0; prio--) {
struct list_head *p; struct list_head *p;
list_for_each (p,q->drops+prio) { list_for_each(p, q->drops + prio) {
struct htb_class *cl = list_entry(p, struct htb_class, struct htb_class *cl = list_entry(p, struct htb_class,
un.leaf.drop_list); un.leaf.drop_list);
unsigned int len; unsigned int len;
if (cl->un.leaf.q->ops->drop && if (cl->un.leaf.q->ops->drop &&
(len = cl->un.leaf.q->ops->drop(cl->un.leaf.q))) { (len = cl->un.leaf.q->ops->drop(cl->un.leaf.q))) {
sch->q.qlen--; sch->q.qlen--;
if (!cl->un.leaf.q->q.qlen) if (!cl->un.leaf.q->q.qlen)
htb_deactivate (q,cl); htb_deactivate(q, cl);
return len; return len;
} }
} }
...@@ -1007,19 +1035,20 @@ static unsigned int htb_drop(struct Qdisc* sch) ...@@ -1007,19 +1035,20 @@ static unsigned int htb_drop(struct Qdisc* sch)
/* reset all classes */ /* reset all classes */
/* always caled under BH & queue lock */ /* always caled under BH & queue lock */
static void htb_reset(struct Qdisc* sch) static void htb_reset(struct Qdisc *sch)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
int i; int i;
for (i = 0; i < HTB_HSIZE; i++) { for (i = 0; i < HTB_HSIZE; i++) {
struct list_head *p; struct list_head *p;
list_for_each (p,q->hash+i) { list_for_each(p, q->hash + i) {
struct htb_class *cl = list_entry(p,struct htb_class,hlist); struct htb_class *cl =
list_entry(p, struct htb_class, hlist);
if (cl->level) if (cl->level)
memset(&cl->un.inner,0,sizeof(cl->un.inner)); memset(&cl->un.inner, 0, sizeof(cl->un.inner));
else { else {
if (cl->un.leaf.q) if (cl->un.leaf.q)
qdisc_reset(cl->un.leaf.q); qdisc_reset(cl->un.leaf.q);
INIT_LIST_HEAD(&cl->un.leaf.drop_list); INIT_LIST_HEAD(&cl->un.leaf.drop_list);
} }
...@@ -1032,12 +1061,12 @@ static void htb_reset(struct Qdisc* sch) ...@@ -1032,12 +1061,12 @@ static void htb_reset(struct Qdisc* sch)
del_timer(&q->timer); del_timer(&q->timer);
__skb_queue_purge(&q->direct_queue); __skb_queue_purge(&q->direct_queue);
sch->q.qlen = 0; sch->q.qlen = 0;
memset(q->row,0,sizeof(q->row)); memset(q->row, 0, sizeof(q->row));
memset(q->row_mask,0,sizeof(q->row_mask)); memset(q->row_mask, 0, sizeof(q->row_mask));
memset(q->wait_pq,0,sizeof(q->wait_pq)); memset(q->wait_pq, 0, sizeof(q->wait_pq));
memset(q->ptr,0,sizeof(q->ptr)); memset(q->ptr, 0, sizeof(q->ptr));
for (i = 0; i < TC_HTB_NUMPRIO; i++) for (i = 0; i < TC_HTB_NUMPRIO; i++)
INIT_LIST_HEAD(q->drops+i); INIT_LIST_HEAD(q->drops + i);
} }
static int htb_init(struct Qdisc *sch, struct rtattr *opt) static int htb_init(struct Qdisc *sch, struct rtattr *opt)
...@@ -1047,29 +1076,30 @@ static int htb_init(struct Qdisc *sch, struct rtattr *opt) ...@@ -1047,29 +1076,30 @@ static int htb_init(struct Qdisc *sch, struct rtattr *opt)
struct tc_htb_glob *gopt; struct tc_htb_glob *gopt;
int i; int i;
if (!opt || rtattr_parse_nested(tb, TCA_HTB_INIT, opt) || if (!opt || rtattr_parse_nested(tb, TCA_HTB_INIT, opt) ||
tb[TCA_HTB_INIT-1] == NULL || tb[TCA_HTB_INIT - 1] == NULL ||
RTA_PAYLOAD(tb[TCA_HTB_INIT-1]) < sizeof(*gopt)) { RTA_PAYLOAD(tb[TCA_HTB_INIT - 1]) < sizeof(*gopt)) {
printk(KERN_ERR "HTB: hey probably you have bad tc tool ?\n"); printk(KERN_ERR "HTB: hey probably you have bad tc tool ?\n");
return -EINVAL; return -EINVAL;
} }
gopt = RTA_DATA(tb[TCA_HTB_INIT-1]); gopt = RTA_DATA(tb[TCA_HTB_INIT - 1]);
if (gopt->version != HTB_VER >> 16) { if (gopt->version != HTB_VER >> 16) {
printk(KERN_ERR "HTB: need tc/htb version %d (minor is %d), you have %d\n", printk(KERN_ERR
HTB_VER >> 16,HTB_VER & 0xffff,gopt->version); "HTB: need tc/htb version %d (minor is %d), you have %d\n",
HTB_VER >> 16, HTB_VER & 0xffff, gopt->version);
return -EINVAL; return -EINVAL;
} }
INIT_LIST_HEAD(&q->root); INIT_LIST_HEAD(&q->root);
for (i = 0; i < HTB_HSIZE; i++) for (i = 0; i < HTB_HSIZE; i++)
INIT_LIST_HEAD(q->hash+i); INIT_LIST_HEAD(q->hash + i);
for (i = 0; i < TC_HTB_NUMPRIO; i++) for (i = 0; i < TC_HTB_NUMPRIO; i++)
INIT_LIST_HEAD(q->drops+i); INIT_LIST_HEAD(q->drops + i);
init_timer(&q->timer); init_timer(&q->timer);
skb_queue_head_init(&q->direct_queue); skb_queue_head_init(&q->direct_queue);
q->direct_qlen = sch->dev->tx_queue_len; q->direct_qlen = sch->dev->tx_queue_len;
if (q->direct_qlen < 2) /* some devices have zero tx_queue_len */ if (q->direct_qlen < 2) /* some devices have zero tx_queue_len */
q->direct_qlen = 2; q->direct_qlen = 2;
q->timer.function = htb_timer; q->timer.function = htb_timer;
q->timer.data = (unsigned long)sch; q->timer.data = (unsigned long)sch;
...@@ -1091,7 +1121,7 @@ static int htb_init(struct Qdisc *sch, struct rtattr *opt) ...@@ -1091,7 +1121,7 @@ static int htb_init(struct Qdisc *sch, struct rtattr *opt)
static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
unsigned char *b = skb->tail; unsigned char *b = skb->tail;
struct rtattr *rta; struct rtattr *rta;
struct tc_htb_glob gopt; struct tc_htb_glob gopt;
spin_lock_bh(&sch->dev->queue_lock); spin_lock_bh(&sch->dev->queue_lock);
...@@ -1101,7 +1131,7 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) ...@@ -1101,7 +1131,7 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
gopt.rate2quantum = q->rate2quantum; gopt.rate2quantum = q->rate2quantum;
gopt.defcls = q->defcls; gopt.defcls = q->defcls;
gopt.debug = 0; gopt.debug = 0;
rta = (struct rtattr*)b; rta = (struct rtattr *)b;
RTA_PUT(skb, TCA_OPTIONS, 0, NULL); RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
RTA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt); RTA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt);
rta->rta_len = skb->tail - b; rta->rta_len = skb->tail - b;
...@@ -1114,10 +1144,10 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) ...@@ -1114,10 +1144,10 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
} }
static int htb_dump_class(struct Qdisc *sch, unsigned long arg, static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
struct sk_buff *skb, struct tcmsg *tcm) struct sk_buff *skb, struct tcmsg *tcm)
{ {
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
unsigned char *b = skb->tail; unsigned char *b = skb->tail;
struct rtattr *rta; struct rtattr *rta;
struct tc_htb_opt opt; struct tc_htb_opt opt;
...@@ -1127,15 +1157,18 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1127,15 +1157,18 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
if (!cl->level && cl->un.leaf.q) if (!cl->level && cl->un.leaf.q)
tcm->tcm_info = cl->un.leaf.q->handle; tcm->tcm_info = cl->un.leaf.q->handle;
rta = (struct rtattr*)b; rta = (struct rtattr *)b;
RTA_PUT(skb, TCA_OPTIONS, 0, NULL); RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
memset (&opt,0,sizeof(opt)); memset(&opt, 0, sizeof(opt));
opt.rate = cl->rate->rate; opt.buffer = cl->buffer; opt.rate = cl->rate->rate;
opt.ceil = cl->ceil->rate; opt.cbuffer = cl->cbuffer; opt.buffer = cl->buffer;
opt.quantum = cl->un.leaf.quantum; opt.prio = cl->un.leaf.prio; opt.ceil = cl->ceil->rate;
opt.level = cl->level; opt.cbuffer = cl->cbuffer;
opt.quantum = cl->un.leaf.quantum;
opt.prio = cl->un.leaf.prio;
opt.level = cl->level;
RTA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt); RTA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt);
rta->rta_len = skb->tail - b; rta->rta_len = skb->tail - b;
spin_unlock_bh(&sch->dev->queue_lock); spin_unlock_bh(&sch->dev->queue_lock);
...@@ -1147,14 +1180,13 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, ...@@ -1147,14 +1180,13 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
} }
static int static int
htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
struct gnet_dump *d)
{ {
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
#ifdef HTB_RATECM #ifdef HTB_RATECM
cl->rate_est.bps = cl->rate_bytes/(HTB_EWMAC*HTB_HSIZE); cl->rate_est.bps = cl->rate_bytes / (HTB_EWMAC * HTB_HSIZE);
cl->rate_est.pps = cl->rate_packets/(HTB_EWMAC*HTB_HSIZE); cl->rate_est.pps = cl->rate_packets / (HTB_EWMAC * HTB_HSIZE);
#endif #endif
if (!cl->level && cl->un.leaf.q) if (!cl->level && cl->un.leaf.q)
...@@ -1171,21 +1203,22 @@ htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, ...@@ -1171,21 +1203,22 @@ htb_dump_class_stats(struct Qdisc *sch, unsigned long arg,
} }
static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
struct Qdisc **old) struct Qdisc **old)
{ {
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
if (cl && !cl->level) { if (cl && !cl->level) {
if (new == NULL && (new = qdisc_create_dflt(sch->dev, if (new == NULL && (new = qdisc_create_dflt(sch->dev,
&pfifo_qdisc_ops)) == NULL) &pfifo_qdisc_ops))
return -ENOBUFS; == NULL)
return -ENOBUFS;
sch_tree_lock(sch); sch_tree_lock(sch);
if ((*old = xchg(&cl->un.leaf.q, new)) != NULL) { if ((*old = xchg(&cl->un.leaf.q, new)) != NULL) {
if (cl->prio_activity) if (cl->prio_activity)
htb_deactivate (qdisc_priv(sch),cl); htb_deactivate(qdisc_priv(sch), cl);
/* TODO: is it correct ? Why CBQ doesn't do it ? */ /* TODO: is it correct ? Why CBQ doesn't do it ? */
sch->q.qlen -= (*old)->q.qlen; sch->q.qlen -= (*old)->q.qlen;
qdisc_reset(*old); qdisc_reset(*old);
} }
sch_tree_unlock(sch); sch_tree_unlock(sch);
...@@ -1194,16 +1227,16 @@ static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, ...@@ -1194,16 +1227,16 @@ static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
return -ENOENT; return -ENOENT;
} }
static struct Qdisc * htb_leaf(struct Qdisc *sch, unsigned long arg) static struct Qdisc *htb_leaf(struct Qdisc *sch, unsigned long arg)
{ {
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
return (cl && !cl->level) ? cl->un.leaf.q : NULL; return (cl && !cl->level) ? cl->un.leaf.q : NULL;
} }
static unsigned long htb_get(struct Qdisc *sch, u32 classid) static unsigned long htb_get(struct Qdisc *sch, u32 classid)
{ {
struct htb_class *cl = htb_find(classid,sch); struct htb_class *cl = htb_find(classid, sch);
if (cl) if (cl)
cl->refcnt++; cl->refcnt++;
return (unsigned long)cl; return (unsigned long)cl;
} }
...@@ -1218,7 +1251,7 @@ static void htb_destroy_filters(struct tcf_proto **fl) ...@@ -1218,7 +1251,7 @@ static void htb_destroy_filters(struct tcf_proto **fl)
} }
} }
static void htb_destroy_class(struct Qdisc* sch,struct htb_class *cl) static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
if (!cl->level) { if (!cl->level) {
...@@ -1228,44 +1261,44 @@ static void htb_destroy_class(struct Qdisc* sch,struct htb_class *cl) ...@@ -1228,44 +1261,44 @@ static void htb_destroy_class(struct Qdisc* sch,struct htb_class *cl)
} }
qdisc_put_rtab(cl->rate); qdisc_put_rtab(cl->rate);
qdisc_put_rtab(cl->ceil); qdisc_put_rtab(cl->ceil);
htb_destroy_filters (&cl->filter_list); htb_destroy_filters(&cl->filter_list);
while (!list_empty(&cl->children)) while (!list_empty(&cl->children))
htb_destroy_class (sch,list_entry(cl->children.next, htb_destroy_class(sch, list_entry(cl->children.next,
struct htb_class,sibling)); struct htb_class, sibling));
/* note: this delete may happen twice (see htb_delete) */ /* note: this delete may happen twice (see htb_delete) */
list_del(&cl->hlist); list_del(&cl->hlist);
list_del(&cl->sibling); list_del(&cl->sibling);
if (cl->prio_activity) if (cl->prio_activity)
htb_deactivate (q,cl); htb_deactivate(q, cl);
if (cl->cmode != HTB_CAN_SEND) if (cl->cmode != HTB_CAN_SEND)
rb_erase(&cl->pq_node,q->wait_pq+cl->level); rb_erase(&cl->pq_node, q->wait_pq + cl->level);
kfree(cl); kfree(cl);
} }
/* always caled under BH & queue lock */ /* always caled under BH & queue lock */
static void htb_destroy(struct Qdisc* sch) static void htb_destroy(struct Qdisc *sch)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
del_timer_sync (&q->timer); del_timer_sync(&q->timer);
#ifdef HTB_RATECM #ifdef HTB_RATECM
del_timer_sync (&q->rttim); del_timer_sync(&q->rttim);
#endif #endif
/* This line used to be after htb_destroy_class call below /* This line used to be after htb_destroy_class call below
and surprisingly it worked in 2.4. But it must precede it and surprisingly it worked in 2.4. But it must precede it
because filter need its target class alive to be able to call because filter need its target class alive to be able to call
unbind_filter on it (without Oops). */ unbind_filter on it (without Oops). */
htb_destroy_filters(&q->filter_list); htb_destroy_filters(&q->filter_list);
while (!list_empty(&q->root)) while (!list_empty(&q->root))
htb_destroy_class (sch,list_entry(q->root.next, htb_destroy_class(sch, list_entry(q->root.next,
struct htb_class,sibling)); struct htb_class, sibling));
__skb_queue_purge(&q->direct_queue); __skb_queue_purge(&q->direct_queue);
} }
...@@ -1273,23 +1306,23 @@ static void htb_destroy(struct Qdisc* sch) ...@@ -1273,23 +1306,23 @@ static void htb_destroy(struct Qdisc* sch)
static int htb_delete(struct Qdisc *sch, unsigned long arg) static int htb_delete(struct Qdisc *sch, unsigned long arg)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
// TODO: why don't allow to delete subtree ? references ? does // TODO: why don't allow to delete subtree ? references ? does
// tc subsys quarantee us that in htb_destroy it holds no class // tc subsys quarantee us that in htb_destroy it holds no class
// refs so that we can remove children safely there ? // refs so that we can remove children safely there ?
if (!list_empty(&cl->children) || cl->filter_cnt) if (!list_empty(&cl->children) || cl->filter_cnt)
return -EBUSY; return -EBUSY;
sch_tree_lock(sch); sch_tree_lock(sch);
/* delete from hash and active; remainder in destroy_class */ /* delete from hash and active; remainder in destroy_class */
list_del_init(&cl->hlist); list_del_init(&cl->hlist);
if (cl->prio_activity) if (cl->prio_activity)
htb_deactivate (q,cl); htb_deactivate(q, cl);
if (--cl->refcnt == 0) if (--cl->refcnt == 0)
htb_destroy_class(sch,cl); htb_destroy_class(sch, cl);
sch_tree_unlock(sch); sch_tree_unlock(sch);
return 0; return 0;
...@@ -1297,41 +1330,44 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) ...@@ -1297,41 +1330,44 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
static void htb_put(struct Qdisc *sch, unsigned long arg) static void htb_put(struct Qdisc *sch, unsigned long arg)
{ {
struct htb_class *cl = (struct htb_class*)arg; struct htb_class *cl = (struct htb_class *)arg;
if (--cl->refcnt == 0) if (--cl->refcnt == 0)
htb_destroy_class(sch,cl); htb_destroy_class(sch, cl);
} }
static int htb_change_class(struct Qdisc *sch, u32 classid, static int htb_change_class(struct Qdisc *sch, u32 classid,
u32 parentid, struct rtattr **tca, unsigned long *arg) u32 parentid, struct rtattr **tca,
unsigned long *arg)
{ {
int err = -EINVAL; int err = -EINVAL;
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = (struct htb_class*)*arg,*parent; struct htb_class *cl = (struct htb_class *)*arg, *parent;
struct rtattr *opt = tca[TCA_OPTIONS-1]; struct rtattr *opt = tca[TCA_OPTIONS - 1];
struct qdisc_rate_table *rtab = NULL, *ctab = NULL; struct qdisc_rate_table *rtab = NULL, *ctab = NULL;
struct rtattr *tb[TCA_HTB_RTAB]; struct rtattr *tb[TCA_HTB_RTAB];
struct tc_htb_opt *hopt; struct tc_htb_opt *hopt;
/* extract all subattrs from opt attr */ /* extract all subattrs from opt attr */
if (!opt || rtattr_parse_nested(tb, TCA_HTB_RTAB, opt) || if (!opt || rtattr_parse_nested(tb, TCA_HTB_RTAB, opt) ||
tb[TCA_HTB_PARMS-1] == NULL || tb[TCA_HTB_PARMS - 1] == NULL ||
RTA_PAYLOAD(tb[TCA_HTB_PARMS-1]) < sizeof(*hopt)) RTA_PAYLOAD(tb[TCA_HTB_PARMS - 1]) < sizeof(*hopt))
goto failure; goto failure;
parent = parentid == TC_H_ROOT ? NULL : htb_find (parentid,sch);
hopt = RTA_DATA(tb[TCA_HTB_PARMS-1]); parent = parentid == TC_H_ROOT ? NULL : htb_find(parentid, sch);
hopt = RTA_DATA(tb[TCA_HTB_PARMS - 1]);
rtab = qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB-1]); rtab = qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB - 1]);
ctab = qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB-1]); ctab = qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB - 1]);
if (!rtab || !ctab) goto failure; if (!rtab || !ctab)
goto failure;
if (!cl) { /* new class */ if (!cl) { /* new class */
struct Qdisc *new_q; struct Qdisc *new_q;
/* check for valid classid */ /* check for valid classid */
if (!classid || TC_H_MAJ(classid^sch->handle) || htb_find(classid,sch)) if (!classid || TC_H_MAJ(classid ^ sch->handle)
|| htb_find(classid, sch))
goto failure; goto failure;
/* check maximal depth */ /* check maximal depth */
...@@ -1342,7 +1378,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, ...@@ -1342,7 +1378,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
err = -ENOBUFS; err = -ENOBUFS;
if ((cl = kzalloc(sizeof(*cl), GFP_KERNEL)) == NULL) if ((cl = kzalloc(sizeof(*cl), GFP_KERNEL)) == NULL)
goto failure; goto failure;
cl->refcnt = 1; cl->refcnt = 1;
INIT_LIST_HEAD(&cl->sibling); INIT_LIST_HEAD(&cl->sibling);
INIT_LIST_HEAD(&cl->hlist); INIT_LIST_HEAD(&cl->hlist);
...@@ -1357,46 +1393,53 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, ...@@ -1357,46 +1393,53 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
if (parent && !parent->level) { if (parent && !parent->level) {
/* turn parent into inner node */ /* turn parent into inner node */
sch->q.qlen -= parent->un.leaf.q->q.qlen; sch->q.qlen -= parent->un.leaf.q->q.qlen;
qdisc_destroy (parent->un.leaf.q); qdisc_destroy(parent->un.leaf.q);
if (parent->prio_activity) if (parent->prio_activity)
htb_deactivate (q,parent); htb_deactivate(q, parent);
/* remove from evt list because of level change */ /* remove from evt list because of level change */
if (parent->cmode != HTB_CAN_SEND) { if (parent->cmode != HTB_CAN_SEND) {
rb_erase(&parent->pq_node,q->wait_pq); rb_erase(&parent->pq_node, q->wait_pq);
parent->cmode = HTB_CAN_SEND; parent->cmode = HTB_CAN_SEND;
} }
parent->level = (parent->parent ? parent->parent->level parent->level = (parent->parent ? parent->parent->level
: TC_HTB_MAXDEPTH) - 1; : TC_HTB_MAXDEPTH) - 1;
memset (&parent->un.inner,0,sizeof(parent->un.inner)); memset(&parent->un.inner, 0, sizeof(parent->un.inner));
} }
/* leaf (we) needs elementary qdisc */ /* leaf (we) needs elementary qdisc */
cl->un.leaf.q = new_q ? new_q : &noop_qdisc; cl->un.leaf.q = new_q ? new_q : &noop_qdisc;
cl->classid = classid; cl->parent = parent; cl->classid = classid;
cl->parent = parent;
/* set class to be in HTB_CAN_SEND state */ /* set class to be in HTB_CAN_SEND state */
cl->tokens = hopt->buffer; cl->tokens = hopt->buffer;
cl->ctokens = hopt->cbuffer; cl->ctokens = hopt->cbuffer;
cl->mbuffer = PSCHED_JIFFIE2US(HZ*60); /* 1min */ cl->mbuffer = PSCHED_JIFFIE2US(HZ * 60); /* 1min */
PSCHED_GET_TIME(cl->t_c); PSCHED_GET_TIME(cl->t_c);
cl->cmode = HTB_CAN_SEND; cl->cmode = HTB_CAN_SEND;
/* attach to the hash list and parent's family */ /* attach to the hash list and parent's family */
list_add_tail(&cl->hlist, q->hash+htb_hash(classid)); list_add_tail(&cl->hlist, q->hash + htb_hash(classid));
list_add_tail(&cl->sibling, parent ? &parent->children : &q->root); list_add_tail(&cl->sibling,
} else sch_tree_lock(sch); parent ? &parent->children : &q->root);
} else
sch_tree_lock(sch);
/* it used to be a nasty bug here, we have to check that node /* it used to be a nasty bug here, we have to check that node
is really leaf before changing cl->un.leaf ! */ is really leaf before changing cl->un.leaf ! */
if (!cl->level) { if (!cl->level) {
cl->un.leaf.quantum = rtab->rate.rate / q->rate2quantum; cl->un.leaf.quantum = rtab->rate.rate / q->rate2quantum;
if (!hopt->quantum && cl->un.leaf.quantum < 1000) { if (!hopt->quantum && cl->un.leaf.quantum < 1000) {
printk(KERN_WARNING "HTB: quantum of class %X is small. Consider r2q change.\n", cl->classid); printk(KERN_WARNING
"HTB: quantum of class %X is small. Consider r2q change.\n",
cl->classid);
cl->un.leaf.quantum = 1000; cl->un.leaf.quantum = 1000;
} }
if (!hopt->quantum && cl->un.leaf.quantum > 200000) { if (!hopt->quantum && cl->un.leaf.quantum > 200000) {
printk(KERN_WARNING "HTB: quantum of class %X is big. Consider r2q change.\n", cl->classid); printk(KERN_WARNING
"HTB: quantum of class %X is big. Consider r2q change.\n",
cl->classid);
cl->un.leaf.quantum = 200000; cl->un.leaf.quantum = 200000;
} }
if (hopt->quantum) if (hopt->quantum)
...@@ -1407,16 +1450,22 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, ...@@ -1407,16 +1450,22 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
cl->buffer = hopt->buffer; cl->buffer = hopt->buffer;
cl->cbuffer = hopt->cbuffer; cl->cbuffer = hopt->cbuffer;
if (cl->rate) qdisc_put_rtab(cl->rate); cl->rate = rtab; if (cl->rate)
if (cl->ceil) qdisc_put_rtab(cl->ceil); cl->ceil = ctab; qdisc_put_rtab(cl->rate);
cl->rate = rtab;
if (cl->ceil)
qdisc_put_rtab(cl->ceil);
cl->ceil = ctab;
sch_tree_unlock(sch); sch_tree_unlock(sch);
*arg = (unsigned long)cl; *arg = (unsigned long)cl;
return 0; return 0;
failure: failure:
if (rtab) qdisc_put_rtab(rtab); if (rtab)
if (ctab) qdisc_put_rtab(ctab); qdisc_put_rtab(rtab);
if (ctab)
qdisc_put_rtab(ctab);
return err; return err;
} }
...@@ -1430,23 +1479,23 @@ static struct tcf_proto **htb_find_tcf(struct Qdisc *sch, unsigned long arg) ...@@ -1430,23 +1479,23 @@ static struct tcf_proto **htb_find_tcf(struct Qdisc *sch, unsigned long arg)
} }
static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent, static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent,
u32 classid) u32 classid)
{ {
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = htb_find (classid,sch); struct htb_class *cl = htb_find(classid, sch);
/*if (cl && !cl->level) return 0; /*if (cl && !cl->level) return 0;
The line above used to be there to prevent attaching filters to The line above used to be there to prevent attaching filters to
leaves. But at least tc_index filter uses this just to get class leaves. But at least tc_index filter uses this just to get class
for other reasons so that we have to allow for it. for other reasons so that we have to allow for it.
---- ----
19.6.2002 As Werner explained it is ok - bind filter is just 19.6.2002 As Werner explained it is ok - bind filter is just
another way to "lock" the class - unlike "get" this lock can another way to "lock" the class - unlike "get" this lock can
be broken by class during destroy IIUC. be broken by class during destroy IIUC.
*/ */
if (cl) if (cl)
cl->filter_cnt++; cl->filter_cnt++;
else else
q->filter_cnt++; q->filter_cnt++;
return (unsigned long)cl; return (unsigned long)cl;
} }
...@@ -1456,9 +1505,9 @@ static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg) ...@@ -1456,9 +1505,9 @@ static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg)
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = (struct htb_class *)arg; struct htb_class *cl = (struct htb_class *)arg;
if (cl) if (cl)
cl->filter_cnt--; cl->filter_cnt--;
else else
q->filter_cnt--; q->filter_cnt--;
} }
...@@ -1472,8 +1521,9 @@ static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg) ...@@ -1472,8 +1521,9 @@ static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (i = 0; i < HTB_HSIZE; i++) { for (i = 0; i < HTB_HSIZE; i++) {
struct list_head *p; struct list_head *p;
list_for_each (p,q->hash+i) { list_for_each(p, q->hash + i) {
struct htb_class *cl = list_entry(p,struct htb_class,hlist); struct htb_class *cl =
list_entry(p, struct htb_class, hlist);
if (arg->count < arg->skip) { if (arg->count < arg->skip) {
arg->count++; arg->count++;
continue; continue;
...@@ -1521,12 +1571,13 @@ static struct Qdisc_ops htb_qdisc_ops = { ...@@ -1521,12 +1571,13 @@ static struct Qdisc_ops htb_qdisc_ops = {
static int __init htb_module_init(void) static int __init htb_module_init(void)
{ {
return register_qdisc(&htb_qdisc_ops); return register_qdisc(&htb_qdisc_ops);
} }
static void __exit htb_module_exit(void) static void __exit htb_module_exit(void)
{ {
unregister_qdisc(&htb_qdisc_ops); unregister_qdisc(&htb_qdisc_ops);
} }
module_init(htb_module_init) module_init(htb_module_init)
module_exit(htb_module_exit) module_exit(htb_module_exit)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7