2006-08-11 14:35:16 +08:00
|
|
|
/*
|
2005-04-17 06:20:36 +08:00
|
|
|
* net/sched/sch_htb.c Hierarchical token bucket, feed tree version
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* Authors: Martin Devera, <devik@cdi.cz>
|
|
|
|
*
|
|
|
|
* Credits (in time order) for older HTB versions:
|
|
|
|
* Stef Coene <stef.coene@docum.org>
|
|
|
|
* HTB support at LARTC mailing list
|
2007-02-09 22:25:16 +08:00
|
|
|
* Ondrej Kraus, <krauso@barr.cz>
|
2005-04-17 06:20:36 +08:00
|
|
|
* found missing INIT_QDISC(htb)
|
|
|
|
* Vladimir Smelhaus, Aamer Akhter, Bert Hubert
|
|
|
|
* helped a lot to locate nasty class stall bug
|
|
|
|
* Andi Kleen, Jamal Hadi, Bert Hubert
|
|
|
|
* code review and helpful comments on shaping
|
|
|
|
* Tomasz Wrona, <tw@eter.tym.pl>
|
|
|
|
* created test case so that I was able to fix nasty bug
|
|
|
|
* Wilfried Weissmann
|
|
|
|
* spotted bug in dequeue code and helped with fix
|
|
|
|
* Jiri Fojtasek
|
|
|
|
* fixed requeue routine
|
|
|
|
* and many others. thanks.
|
|
|
|
*/
|
|
|
|
#include <linux/module.h>
|
2008-06-17 07:39:32 +08:00
|
|
|
#include <linux/moduleparam.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/compiler.h>
|
2007-07-03 13:49:07 +08:00
|
|
|
#include <linux/rbtree.h>
|
2009-02-01 17:13:22 +08:00
|
|
|
#include <linux/workqueue.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2007-03-26 14:06:12 +08:00
|
|
|
#include <net/netlink.h>
|
2013-02-12 08:12:03 +08:00
|
|
|
#include <net/sch_generic.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <net/pkt_sched.h>
|
|
|
|
|
|
|
|
/* HTB algorithm.
|
|
|
|
Author: devik@cdi.cz
|
|
|
|
========================================================================
|
|
|
|
HTB is like TBF with multiple classes. It is also similar to CBQ because
|
2007-02-09 22:25:16 +08:00
|
|
|
it allows to assign priority to each class in hierarchy.
|
2005-04-17 06:20:36 +08:00
|
|
|
In fact it is another implementation of Floyd's formal sharing.
|
|
|
|
|
|
|
|
Levels:
|
2007-02-09 22:25:16 +08:00
|
|
|
Each class is assigned level. Leaf has ALWAYS level 0 and root
|
2005-04-17 06:20:36 +08:00
|
|
|
classes have level TC_HTB_MAXDEPTH-1. Interior nodes has level
|
|
|
|
one less than their parent.
|
|
|
|
*/
|
|
|
|
|
2008-06-17 07:39:32 +08:00
|
|
|
static int htb_hysteresis __read_mostly = 0; /* whether to use mode hysteresis for speedup */
|
2006-08-11 14:35:16 +08:00
|
|
|
#define HTB_VER 0x30011 /* major must be matched with number suplied by TC as version */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#if HTB_VER >> 16 != TC_HTB_PROTOVER
|
|
|
|
#error "Mismatched sch_htb.c and pkt_sch.h"
|
|
|
|
#endif
|
|
|
|
|
2008-06-17 07:39:32 +08:00
|
|
|
/* Module parameter and sysfs export */
|
|
|
|
module_param (htb_hysteresis, int, 0640);
|
|
|
|
MODULE_PARM_DESC(htb_hysteresis, "Hysteresis mode, less CPU load, less accurate");
|
|
|
|
|
2013-06-07 05:53:16 +08:00
|
|
|
static int htb_rate_est = 0; /* htb classes have a default rate estimator */
|
|
|
|
module_param(htb_rate_est, int, 0640);
|
|
|
|
MODULE_PARM_DESC(htb_rate_est, "setup a default rate estimator (4sec 16sec) for htb classes");
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* used internaly to keep status of single class */
|
|
|
|
enum htb_cmode {
|
2006-08-11 14:35:16 +08:00
|
|
|
HTB_CANT_SEND, /* class can't send and can't borrow */
|
|
|
|
HTB_MAY_BORROW, /* class can't send but may borrow */
|
|
|
|
HTB_CAN_SEND /* class can send */
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_prio {
|
|
|
|
union {
|
|
|
|
struct rb_root row;
|
|
|
|
struct rb_root feed;
|
|
|
|
};
|
|
|
|
struct rb_node *ptr;
|
|
|
|
/* When class changes from state 1->2 and disconnects from
|
|
|
|
* parent's feed then we lost ptr value and start from the
|
|
|
|
* first child again. Here we store classid of the
|
|
|
|
* last valid ptr (used when ptr is NULL).
|
|
|
|
*/
|
|
|
|
u32 last_ptr_id;
|
|
|
|
};
|
|
|
|
|
2013-06-13 22:58:30 +08:00
|
|
|
/* interior & leaf nodes; props specific to leaves are marked L:
|
|
|
|
* To reduce false sharing, place mostly read fields at beginning,
|
|
|
|
* and mostly written ones at the end.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class {
|
2008-07-06 14:22:35 +08:00
|
|
|
struct Qdisc_class_common common;
|
2013-06-13 22:58:30 +08:00
|
|
|
struct psched_ratecfg rate;
|
|
|
|
struct psched_ratecfg ceil;
|
|
|
|
s64 buffer, cbuffer;/* token bucket depth/rate */
|
|
|
|
s64 mbuffer; /* max wait time */
|
2013-08-02 13:32:07 +08:00
|
|
|
u32 prio; /* these two are used only by leaves... */
|
2013-06-13 22:58:30 +08:00
|
|
|
int quantum; /* but stored for parent-to-leaf return */
|
|
|
|
|
2014-09-13 11:05:27 +08:00
|
|
|
struct tcf_proto __rcu *filter_list; /* class attached filters */
|
2013-06-13 22:58:30 +08:00
|
|
|
int filter_cnt;
|
|
|
|
int refcnt; /* usage count of this class */
|
|
|
|
|
|
|
|
int level; /* our level (see above) */
|
|
|
|
unsigned int children;
|
|
|
|
struct htb_class *parent; /* parent class */
|
|
|
|
|
2013-06-06 23:43:22 +08:00
|
|
|
struct gnet_stats_rate_est64 rate_est;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-13 22:58:30 +08:00
|
|
|
/*
|
|
|
|
* Written often fields
|
|
|
|
*/
|
|
|
|
struct gnet_stats_basic_packed bstats;
|
|
|
|
struct tc_htb_xstats xstats; /* our special stats */
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-13 22:58:30 +08:00
|
|
|
/* token bucket parameters */
|
|
|
|
s64 tokens, ctokens;/* current number of tokens */
|
|
|
|
s64 t_c; /* checkpoint time */
|
2008-12-04 13:09:45 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
union {
|
|
|
|
struct htb_class_leaf {
|
|
|
|
struct list_head drop_list;
|
2013-06-15 18:30:10 +08:00
|
|
|
int deficit[TC_HTB_MAXDEPTH];
|
|
|
|
struct Qdisc *q;
|
2006-08-11 14:35:16 +08:00
|
|
|
} leaf;
|
|
|
|
struct htb_class_inner {
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_prio clprio[TC_HTB_NUMPRIO];
|
2006-08-11 14:35:16 +08:00
|
|
|
} inner;
|
|
|
|
} un;
|
2013-06-13 22:58:30 +08:00
|
|
|
s64 pq_key;
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-13 22:58:30 +08:00
|
|
|
int prio_activity; /* for which prios are we active */
|
|
|
|
enum htb_cmode cmode; /* current mode of the class */
|
|
|
|
struct rb_node pq_node; /* node for event queue */
|
|
|
|
struct rb_node node[TC_HTB_NUMPRIO]; /* node for self or feed tree */
|
2016-06-22 14:16:51 +08:00
|
|
|
|
|
|
|
unsigned int drops ____cacheline_aligned_in_smp;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_level {
|
|
|
|
struct rb_root wait_pq;
|
|
|
|
struct htb_prio hprio[TC_HTB_NUMPRIO];
|
|
|
|
};
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_sched {
|
2008-07-06 14:22:35 +08:00
|
|
|
struct Qdisc_class_hash clhash;
|
2013-06-15 18:30:10 +08:00
|
|
|
int defcls; /* class where unclassified flows go to */
|
|
|
|
int rate2quantum; /* quant = rate / rate2quantum */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
/* filters for qdisc itself */
|
2014-09-13 11:05:27 +08:00
|
|
|
struct tcf_proto __rcu *filter_list;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
#define HTB_WARN_TOOMANYEVENTS 0x1
|
|
|
|
unsigned int warned; /* only one warning */
|
|
|
|
int direct_qlen;
|
|
|
|
struct work_struct work;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
/* non shaped skbs; let them go directly thru */
|
2016-09-18 06:57:34 +08:00
|
|
|
struct qdisc_skb_head direct_queue;
|
2013-06-15 18:30:10 +08:00
|
|
|
long direct_pkts;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
struct qdisc_watchdog watchdog;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
s64 now; /* cached dequeue time */
|
|
|
|
struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
/* time of nearest event per level (row) */
|
|
|
|
s64 near_ev_cache[TC_HTB_MAXDEPTH];
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
int row_mask[TC_HTB_MAXDEPTH];
|
2009-02-01 17:13:05 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_level hlevel[TC_HTB_MAXDEPTH];
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* find class in global hash table using given handle */
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2008-07-06 14:22:35 +08:00
|
|
|
struct Qdisc_class_common *clc;
|
2006-08-11 14:35:38 +08:00
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
clc = qdisc_class_find(&q->clhash, handle);
|
|
|
|
if (clc == NULL)
|
2005-04-17 06:20:36 +08:00
|
|
|
return NULL;
|
2008-07-06 14:22:35 +08:00
|
|
|
return container_of(clc, struct htb_class, common);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_classify - classify a packet into class
|
|
|
|
*
|
|
|
|
* It returns NULL if the packet should be dropped or -1 if the packet
|
|
|
|
* should be passed directly thru. In all other cases leaf class is returned.
|
|
|
|
* We allow direct class selection by classid in priority. The we examine
|
|
|
|
* filters in qdisc and in inner nodes (if higher filter points to the inner
|
|
|
|
* node). If we end up with classid MAJOR:0 we enqueue the skb into special
|
2007-02-09 22:25:16 +08:00
|
|
|
* internal fifo (direct). These packets then go directly thru. If we still
|
2011-03-31 09:57:33 +08:00
|
|
|
* have no valid leaf we try to use MAJOR:default leaf. It still unsuccessful
|
2005-04-17 06:20:36 +08:00
|
|
|
* then finish and return direct queue.
|
|
|
|
*/
|
2011-01-20 03:26:56 +08:00
|
|
|
#define HTB_DIRECT ((struct htb_class *)-1L)
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|
|
|
int *qerr)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
|
|
|
struct htb_class *cl;
|
|
|
|
struct tcf_result res;
|
|
|
|
struct tcf_proto *tcf;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
/* allow to select class by setting skb->priority to valid classid;
|
2011-01-20 03:26:56 +08:00
|
|
|
* note that nfmark can be used too by attaching filter fw with no
|
|
|
|
* rules in it
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (skb->priority == sch->handle)
|
2006-08-11 14:35:16 +08:00
|
|
|
return HTB_DIRECT; /* X:0 (direct flow) selected */
|
2011-01-20 03:26:56 +08:00
|
|
|
cl = htb_find(skb->priority, sch);
|
2014-01-17 21:22:32 +08:00
|
|
|
if (cl) {
|
|
|
|
if (cl->level == 0)
|
|
|
|
return cl;
|
|
|
|
/* Start with inner filter chain if a non-leaf class is selected */
|
2014-09-13 11:05:27 +08:00
|
|
|
tcf = rcu_dereference_bh(cl->filter_list);
|
2014-01-17 21:22:32 +08:00
|
|
|
} else {
|
2014-09-13 11:05:27 +08:00
|
|
|
tcf = rcu_dereference_bh(q->filter_list);
|
2014-01-17 21:22:32 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-08-05 13:39:11 +08:00
|
|
|
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
|
2015-08-27 05:00:06 +08:00
|
|
|
while (tcf && (result = tc_classify(skb, tcf, &res, false)) >= 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
switch (result) {
|
|
|
|
case TC_ACT_QUEUED:
|
2006-08-11 14:35:16 +08:00
|
|
|
case TC_ACT_STOLEN:
|
2008-08-05 13:31:03 +08:00
|
|
|
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
2005-04-17 06:20:36 +08:00
|
|
|
case TC_ACT_SHOT:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2011-01-20 03:26:56 +08:00
|
|
|
cl = (void *)res.class;
|
|
|
|
if (!cl) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (res.classid == sch->handle)
|
2006-08-11 14:35:16 +08:00
|
|
|
return HTB_DIRECT; /* X:0 (direct flow) */
|
2011-01-20 03:26:56 +08:00
|
|
|
cl = htb_find(res.classid, sch);
|
|
|
|
if (!cl)
|
2006-08-11 14:35:16 +08:00
|
|
|
break; /* filter selected invalid classid */
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (!cl->level)
|
2006-08-11 14:35:16 +08:00
|
|
|
return cl; /* we hit leaf; return it */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* we have got inner class; apply inner filter chain */
|
2014-09-13 11:05:27 +08:00
|
|
|
tcf = rcu_dereference_bh(cl->filter_list);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
/* classification failed; try to use default class */
|
2006-08-11 14:35:16 +08:00
|
|
|
cl = htb_find(TC_H_MAKE(TC_H_MAJ(sch->handle), q->defcls), sch);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cl || cl->level)
|
2006-08-11 14:35:16 +08:00
|
|
|
return HTB_DIRECT; /* bad default .. this is safe bet */
|
2005-04-17 06:20:36 +08:00
|
|
|
return cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_add_to_id_tree - adds class to the round robin list
|
|
|
|
*
|
|
|
|
* Routine adds class to the list (actually tree) sorted by classid.
|
|
|
|
* Make sure that class is not already on such list for given prio.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_add_to_id_tree(struct rb_root *root,
|
|
|
|
struct htb_class *cl, int prio)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct rb_node **p = &root->rb_node, *parent = NULL;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
while (*p) {
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *c;
|
|
|
|
parent = *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
c = rb_entry(parent, struct htb_class, node[prio]);
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
if (cl->common.classid > c->common.classid)
|
2005-04-17 06:20:36 +08:00
|
|
|
p = &parent->rb_right;
|
2006-08-11 14:35:16 +08:00
|
|
|
else
|
2005-04-17 06:20:36 +08:00
|
|
|
p = &parent->rb_left;
|
|
|
|
}
|
|
|
|
rb_link_node(&cl->node[prio], parent, p);
|
|
|
|
rb_insert_color(&cl->node[prio], root);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_add_to_wait_tree - adds class to the event queue with delay
|
|
|
|
*
|
|
|
|
* The class is added to priority event queue to indicate that class will
|
|
|
|
* change its mode in cl->pq_key microseconds. Make sure that class is not
|
|
|
|
* already in the queue.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_add_to_wait_tree(struct htb_sched *q,
|
2012-10-31 14:04:11 +08:00
|
|
|
struct htb_class *cl, s64 delay)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-06-15 18:30:10 +08:00
|
|
|
struct rb_node **p = &q->hlevel[cl->level].wait_pq.rb_node, *parent = NULL;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2007-03-16 16:22:39 +08:00
|
|
|
cl->pq_key = q->now + delay;
|
|
|
|
if (cl->pq_key == q->now)
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->pq_key++;
|
|
|
|
|
|
|
|
/* update the nearest event cache */
|
2007-03-16 16:22:39 +08:00
|
|
|
if (q->near_ev_cache[cl->level] > cl->pq_key)
|
2005-04-17 06:20:36 +08:00
|
|
|
q->near_ev_cache[cl->level] = cl->pq_key;
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
while (*p) {
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *c;
|
|
|
|
parent = *p;
|
2005-04-17 06:20:36 +08:00
|
|
|
c = rb_entry(parent, struct htb_class, pq_node);
|
2007-03-16 16:22:39 +08:00
|
|
|
if (cl->pq_key >= c->pq_key)
|
2005-04-17 06:20:36 +08:00
|
|
|
p = &parent->rb_right;
|
2006-08-11 14:35:16 +08:00
|
|
|
else
|
2005-04-17 06:20:36 +08:00
|
|
|
p = &parent->rb_left;
|
|
|
|
}
|
|
|
|
rb_link_node(&cl->pq_node, parent, p);
|
2013-06-15 18:30:10 +08:00
|
|
|
rb_insert_color(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_next_rb_node - finds next node in binary tree
|
|
|
|
*
|
|
|
|
* When we are past last key we return NULL.
|
|
|
|
* Average complexity is 2 steps per call.
|
|
|
|
*/
|
2006-08-11 14:36:01 +08:00
|
|
|
static inline void htb_next_rb_node(struct rb_node **n)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
*n = rb_next(*n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_add_class_to_row - add class to its row
|
|
|
|
*
|
|
|
|
* The class is added to row at priorities marked in mask.
|
|
|
|
* It does nothing if mask == 0.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline void htb_add_class_to_row(struct htb_sched *q,
|
|
|
|
struct htb_class *cl, int mask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
q->row_mask[cl->level] |= mask;
|
|
|
|
while (mask) {
|
|
|
|
int prio = ffz(~mask);
|
|
|
|
mask &= ~(1 << prio);
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_add_to_id_tree(&q->hlevel[cl->level].hprio[prio].row, cl, prio);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-11 14:36:01 +08:00
|
|
|
/* If this triggers, it is a bug in this code, but it need not be fatal */
|
|
|
|
static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root)
|
|
|
|
{
|
2006-10-04 04:49:10 +08:00
|
|
|
if (RB_EMPTY_NODE(rb)) {
|
2006-08-11 14:36:01 +08:00
|
|
|
WARN_ON(1);
|
|
|
|
} else {
|
|
|
|
rb_erase(rb, root);
|
|
|
|
RB_CLEAR_NODE(rb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* htb_remove_class_from_row - removes class from its row
|
|
|
|
*
|
|
|
|
* The class is removed from row at priorities marked in mask.
|
|
|
|
* It does nothing if mask == 0.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline void htb_remove_class_from_row(struct htb_sched *q,
|
|
|
|
struct htb_class *cl, int mask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int m = 0;
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_level *hlevel = &q->hlevel[cl->level];
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
while (mask) {
|
|
|
|
int prio = ffz(~mask);
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_prio *hprio = &hlevel->hprio[prio];
|
2006-08-11 14:36:01 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
mask &= ~(1 << prio);
|
2013-06-15 18:30:10 +08:00
|
|
|
if (hprio->ptr == cl->node + prio)
|
|
|
|
htb_next_rb_node(&hprio->ptr);
|
2006-08-11 14:36:01 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(cl->node + prio, &hprio->row);
|
|
|
|
if (!hprio->row.rb_node)
|
2005-04-17 06:20:36 +08:00
|
|
|
m |= 1 << prio;
|
|
|
|
}
|
|
|
|
q->row_mask[cl->level] &= ~m;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_activate_prios - creates active classe's feed chain
|
|
|
|
*
|
|
|
|
* The class is connected to ancestors and/or appropriate rows
|
2007-02-09 22:25:16 +08:00
|
|
|
* for priorities it is participating on. cl->cmode must be new
|
2005-04-17 06:20:36 +08:00
|
|
|
* (activated) mode. It does nothing if cl->prio_activity == 0.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_class *p = cl->parent;
|
2006-08-11 14:35:16 +08:00
|
|
|
long m, mask = cl->prio_activity;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
while (cl->cmode == HTB_MAY_BORROW && p && mask) {
|
2006-08-11 14:35:16 +08:00
|
|
|
m = mask;
|
|
|
|
while (m) {
|
2005-04-17 06:20:36 +08:00
|
|
|
int prio = ffz(~m);
|
|
|
|
m &= ~(1 << prio);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
if (p->un.inner.clprio[prio].feed.rb_node)
|
2005-04-17 06:20:36 +08:00
|
|
|
/* parent already has its feed in use so that
|
2011-01-20 03:26:56 +08:00
|
|
|
* reset bit in mask as parent is already ok
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
mask &= ~(1 << prio);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_add_to_id_tree(&p->un.inner.clprio[prio].feed, cl, prio);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
p->prio_activity |= mask;
|
2006-08-11 14:35:16 +08:00
|
|
|
cl = p;
|
|
|
|
p = cl->parent;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (cl->cmode == HTB_CAN_SEND && mask)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_add_class_to_row(q, cl, mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_deactivate_prios - remove class from feed chain
|
|
|
|
*
|
2007-02-09 22:25:16 +08:00
|
|
|
* cl->cmode must represent old mode (before deactivation). It does
|
2005-04-17 06:20:36 +08:00
|
|
|
* nothing if cl->prio_activity == 0. Class is removed from all feed
|
|
|
|
* chains and rows.
|
|
|
|
*/
|
|
|
|
static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl)
|
|
|
|
{
|
|
|
|
struct htb_class *p = cl->parent;
|
2006-08-11 14:35:16 +08:00
|
|
|
long m, mask = cl->prio_activity;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
while (cl->cmode == HTB_MAY_BORROW && p && mask) {
|
2006-08-11 14:35:16 +08:00
|
|
|
m = mask;
|
|
|
|
mask = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
while (m) {
|
|
|
|
int prio = ffz(~m);
|
|
|
|
m &= ~(1 << prio);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
if (p->un.inner.clprio[prio].ptr == cl->node + prio) {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* we are removing child which is pointed to from
|
2011-01-20 03:26:56 +08:00
|
|
|
* parent feed - forget the pointer but remember
|
|
|
|
* classid
|
|
|
|
*/
|
2013-06-15 18:30:10 +08:00
|
|
|
p->un.inner.clprio[prio].last_ptr_id = cl->common.classid;
|
|
|
|
p->un.inner.clprio[prio].ptr = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(cl->node + prio,
|
|
|
|
&p->un.inner.clprio[prio].feed);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
if (!p->un.inner.clprio[prio].feed.rb_node)
|
2005-04-17 06:20:36 +08:00
|
|
|
mask |= 1 << prio;
|
|
|
|
}
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
p->prio_activity &= ~mask;
|
2006-08-11 14:35:16 +08:00
|
|
|
cl = p;
|
|
|
|
p = cl->parent;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
if (cl->cmode == HTB_CAN_SEND && mask)
|
|
|
|
htb_remove_class_from_row(q, cl, mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2012-10-31 14:04:11 +08:00
|
|
|
static inline s64 htb_lowater(const struct htb_class *cl)
|
2006-08-11 14:34:02 +08:00
|
|
|
{
|
2008-06-17 07:39:32 +08:00
|
|
|
if (htb_hysteresis)
|
|
|
|
return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0;
|
|
|
|
else
|
|
|
|
return 0;
|
2006-08-11 14:34:02 +08:00
|
|
|
}
|
2012-10-31 14:04:11 +08:00
|
|
|
static inline s64 htb_hiwater(const struct htb_class *cl)
|
2006-08-11 14:34:02 +08:00
|
|
|
{
|
2008-06-17 07:39:32 +08:00
|
|
|
if (htb_hysteresis)
|
|
|
|
return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0;
|
|
|
|
else
|
|
|
|
return 0;
|
2006-08-11 14:34:02 +08:00
|
|
|
}
|
2008-06-17 07:39:32 +08:00
|
|
|
|
2006-08-11 14:34:02 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* htb_class_mode - computes and returns current class mode
|
|
|
|
*
|
|
|
|
* It computes cl's mode at time cl->t_c+diff and returns it. If mode
|
|
|
|
* is not HTB_CAN_SEND then cl->pq_key is updated to time difference
|
2007-02-09 22:25:16 +08:00
|
|
|
* from now to time when cl will change its state.
|
2005-04-17 06:20:36 +08:00
|
|
|
* Also it is worth to note that class mode doesn't change simply
|
2007-02-09 22:25:16 +08:00
|
|
|
* at cl->{c,}tokens == 0 but there can rather be hysteresis of
|
2005-04-17 06:20:36 +08:00
|
|
|
* 0 .. -cl->{c,}buffer range. It is meant to limit number of
|
|
|
|
* mode transitions per time unit. The speed gain is about 1/6.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline enum htb_cmode
|
2012-10-31 14:04:11 +08:00
|
|
|
htb_class_mode(struct htb_class *cl, s64 *diff)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2012-10-31 14:04:11 +08:00
|
|
|
s64 toks;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
|
|
|
|
*diff = -toks;
|
|
|
|
return HTB_CANT_SEND;
|
|
|
|
}
|
2006-08-11 14:34:02 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
|
|
|
|
return HTB_CAN_SEND;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
*diff = -toks;
|
|
|
|
return HTB_MAY_BORROW;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_change_class_mode - changes classe's mode
|
|
|
|
*
|
|
|
|
* This should be the only way how to change classe's mode under normal
|
|
|
|
* cirsumstances. Routine will update feed lists linkage, change mode
|
|
|
|
* and add class to the wait event queue if appropriate. New mode should
|
|
|
|
* 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).
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static void
|
2012-10-31 14:04:11 +08:00
|
|
|
htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)
|
2006-08-11 14:35:16 +08:00
|
|
|
{
|
|
|
|
enum htb_cmode new_mode = htb_class_mode(cl, diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (new_mode == cl->cmode)
|
2006-08-11 14:35:16 +08:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (cl->prio_activity) { /* not necessary: speed optimization */
|
|
|
|
if (cl->cmode != HTB_CANT_SEND)
|
|
|
|
htb_deactivate_prios(q, cl);
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->cmode = new_mode;
|
2006-08-11 14:35:16 +08:00
|
|
|
if (new_mode != HTB_CANT_SEND)
|
|
|
|
htb_activate_prios(q, cl);
|
|
|
|
} else
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->cmode = new_mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2007-02-09 22:25:16 +08:00
|
|
|
* htb_activate - inserts leaf cl into appropriate active feeds
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Routine learns (new) priority of leaf and activates feed chain
|
|
|
|
* for the prio. It can be called on already active leaf safely.
|
|
|
|
* It also adds leaf into droplist.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cl->prio_activity) {
|
2008-12-04 13:09:45 +08:00
|
|
|
cl->prio_activity = 1 << cl->prio;
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_activate_prios(q, cl);
|
|
|
|
list_add_tail(&cl->un.leaf.drop_list,
|
2008-12-04 13:09:45 +08:00
|
|
|
q->drops + cl->prio);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2007-02-09 22:25:16 +08:00
|
|
|
* htb_deactivate - remove leaf cl from active feeds
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(!cl->prio_activity);
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_deactivate_prios(q, cl);
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->prio_activity = 0;
|
|
|
|
list_del_init(&cl->un.leaf.drop_list);
|
|
|
|
}
|
|
|
|
|
2016-09-18 06:57:34 +08:00
|
|
|
static void htb_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,
|
|
|
|
struct qdisc_skb_head *qh)
|
|
|
|
{
|
|
|
|
struct sk_buff *last = qh->tail;
|
|
|
|
|
|
|
|
if (last) {
|
|
|
|
skb->next = NULL;
|
|
|
|
last->next = skb;
|
|
|
|
qh->tail = skb;
|
|
|
|
} else {
|
|
|
|
qh->tail = skb;
|
|
|
|
qh->head = skb;
|
|
|
|
}
|
|
|
|
qh->qlen++;
|
|
|
|
}
|
|
|
|
|
2016-06-22 14:16:49 +08:00
|
|
|
static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|
|
|
struct sk_buff **to_free)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-11-14 14:56:30 +08:00
|
|
|
int uninitialized_var(ret);
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
|
|
|
struct htb_class *cl = htb_classify(skb, sch, &ret);
|
|
|
|
|
|
|
|
if (cl == HTB_DIRECT) {
|
|
|
|
/* enqueue to helper queue */
|
|
|
|
if (q->direct_queue.qlen < q->direct_qlen) {
|
2016-09-18 06:57:34 +08:00
|
|
|
htb_enqueue_tail(skb, sch, &q->direct_queue);
|
2006-08-11 14:35:16 +08:00
|
|
|
q->direct_pkts++;
|
|
|
|
} else {
|
2016-06-22 14:16:49 +08:00
|
|
|
return qdisc_drop(skb, sch, to_free);
|
2006-08-11 14:35:16 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
2006-08-11 14:35:16 +08:00
|
|
|
} else if (!cl) {
|
2008-08-05 13:39:11 +08:00
|
|
|
if (ret & __NET_XMIT_BYPASS)
|
2014-09-29 02:53:29 +08:00
|
|
|
qdisc_qstats_drop(sch);
|
2016-06-22 14:16:49 +08:00
|
|
|
__qdisc_drop(skb, to_free);
|
2006-08-11 14:35:16 +08:00
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2016-06-22 14:16:49 +08:00
|
|
|
} else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q,
|
|
|
|
to_free)) != NET_XMIT_SUCCESS) {
|
2008-08-05 13:31:03 +08:00
|
|
|
if (net_xmit_drop_count(ret)) {
|
2014-09-29 02:53:29 +08:00
|
|
|
qdisc_qstats_drop(sch);
|
2016-06-22 14:16:51 +08:00
|
|
|
cl->drops++;
|
2008-08-05 13:31:03 +08:00
|
|
|
}
|
2008-08-18 14:55:36 +08:00
|
|
|
return ret;
|
2006-08-11 14:35:16 +08:00
|
|
|
} else {
|
|
|
|
htb_activate(q, cl);
|
|
|
|
}
|
|
|
|
|
2016-02-26 06:55:02 +08:00
|
|
|
qdisc_qstats_backlog_inc(sch, skb);
|
2006-08-11 14:35:16 +08:00
|
|
|
sch->q.qlen++;
|
|
|
|
return NET_XMIT_SUCCESS;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2012-10-31 14:04:11 +08:00
|
|
|
static inline void htb_accnt_tokens(struct htb_class *cl, int bytes, s64 diff)
|
2008-12-04 13:17:27 +08:00
|
|
|
{
|
2012-10-31 14:04:11 +08:00
|
|
|
s64 toks = diff + cl->tokens;
|
2008-12-04 13:17:27 +08:00
|
|
|
|
|
|
|
if (toks > cl->buffer)
|
|
|
|
toks = cl->buffer;
|
2013-02-12 08:12:03 +08:00
|
|
|
toks -= (s64) psched_l2t_ns(&cl->rate, bytes);
|
2008-12-04 13:17:27 +08:00
|
|
|
if (toks <= -cl->mbuffer)
|
|
|
|
toks = 1 - cl->mbuffer;
|
|
|
|
|
|
|
|
cl->tokens = toks;
|
|
|
|
}
|
|
|
|
|
2012-10-31 14:04:11 +08:00
|
|
|
static inline void htb_accnt_ctokens(struct htb_class *cl, int bytes, s64 diff)
|
2008-12-04 13:17:27 +08:00
|
|
|
{
|
2012-10-31 14:04:11 +08:00
|
|
|
s64 toks = diff + cl->ctokens;
|
2008-12-04 13:17:27 +08:00
|
|
|
|
|
|
|
if (toks > cl->cbuffer)
|
|
|
|
toks = cl->cbuffer;
|
2013-02-12 08:12:03 +08:00
|
|
|
toks -= (s64) psched_l2t_ns(&cl->ceil, bytes);
|
2008-12-04 13:17:27 +08:00
|
|
|
if (toks <= -cl->mbuffer)
|
|
|
|
toks = 1 - cl->mbuffer;
|
|
|
|
|
|
|
|
cl->ctokens = toks;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
* htb_charge_class - charges amount "bytes" to leaf and ancestors
|
|
|
|
*
|
|
|
|
* Routine assumes that packet "bytes" long was dequeued from leaf cl
|
|
|
|
* borrowing from "level". It accounts bytes to ceil leaky bucket for
|
|
|
|
* leaf and all ancestors and to rate bucket for ancestors at levels
|
|
|
|
* "level" and higher. It also handles possible change of mode resulting
|
|
|
|
* from the update. Note that mode can also increase here (MAY_BORROW to
|
|
|
|
* CAN_SEND) because we can use more precise clock that event queue here.
|
|
|
|
* In such case we remove class from event queue first.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
|
2007-07-11 13:43:16 +08:00
|
|
|
int level, struct sk_buff *skb)
|
2006-08-11 14:35:16 +08:00
|
|
|
{
|
2008-07-20 15:08:27 +08:00
|
|
|
int bytes = qdisc_pkt_len(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
enum htb_cmode old_mode;
|
2012-10-31 14:04:11 +08:00
|
|
|
s64 diff;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
while (cl) {
|
2012-10-31 14:04:11 +08:00
|
|
|
diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cl->level >= level) {
|
2006-08-11 14:35:16 +08:00
|
|
|
if (cl->level == level)
|
|
|
|
cl->xstats.lends++;
|
2008-12-04 13:17:27 +08:00
|
|
|
htb_accnt_tokens(cl, bytes, diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
cl->xstats.borrows++;
|
2006-08-11 14:35:16 +08:00
|
|
|
cl->tokens += diff; /* we moved t_c; update tokens */
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-12-04 13:17:27 +08:00
|
|
|
htb_accnt_ctokens(cl, bytes, diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->t_c = q->now;
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
old_mode = cl->cmode;
|
|
|
|
diff = 0;
|
|
|
|
htb_change_class_mode(q, cl, &diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (old_mode != cl->cmode) {
|
|
|
|
if (old_mode != HTB_CAN_SEND)
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(&cl->pq_node, &q->hlevel[cl->level].wait_pq);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cl->cmode != HTB_CAN_SEND)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_add_to_wait_tree(q, cl, diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2011-01-09 16:30:54 +08:00
|
|
|
/* update basic stats except for leaves which are already updated */
|
|
|
|
if (cl->level)
|
|
|
|
bstats_update(&cl->bstats, skb);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cl = cl->parent;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_do_events - make mode changes to classes at the level
|
|
|
|
*
|
2007-03-16 16:22:39 +08:00
|
|
|
* Scans event queue for pending events and applies them. Returns time of
|
2009-02-01 17:13:22 +08:00
|
|
|
* next pending event (0 for no event in pq, q->now for too many events).
|
2007-03-16 16:22:39 +08:00
|
|
|
* Note: Applied are events whose have cl->pq_key <= q->now.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2013-06-15 18:30:10 +08:00
|
|
|
static s64 htb_do_events(struct htb_sched *q, const int level,
|
2013-06-04 15:11:48 +08:00
|
|
|
unsigned long start)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-03-24 13:00:38 +08:00
|
|
|
/* don't run for longer than 2 jiffies; 2 is used instead of
|
2011-01-20 03:26:56 +08:00
|
|
|
* 1 to simplify things when jiffy is going to be incremented
|
|
|
|
* too soon
|
|
|
|
*/
|
2009-01-13 13:54:40 +08:00
|
|
|
unsigned long stop_at = start + 2;
|
2013-06-15 18:30:10 +08:00
|
|
|
struct rb_root *wait_pq = &q->hlevel[level].wait_pq;
|
|
|
|
|
2008-03-24 13:00:38 +08:00
|
|
|
while (time_before(jiffies, stop_at)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
struct htb_class *cl;
|
2012-10-31 14:04:11 +08:00
|
|
|
s64 diff;
|
2013-06-15 18:30:10 +08:00
|
|
|
struct rb_node *p = rb_first(wait_pq);
|
2006-10-12 16:52:05 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if (!p)
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
cl = rb_entry(p, struct htb_class, pq_node);
|
2007-03-16 16:22:39 +08:00
|
|
|
if (cl->pq_key > q->now)
|
|
|
|
return cl->pq_key;
|
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(p, wait_pq);
|
2012-10-31 14:04:11 +08:00
|
|
|
diff = min_t(s64, q->now - cl->t_c, cl->mbuffer);
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_change_class_mode(q, cl, &diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cl->cmode != HTB_CAN_SEND)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_add_to_wait_tree(q, cl, diff);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2009-02-01 17:13:22 +08:00
|
|
|
|
|
|
|
/* too much load - let's continue after a break for scheduling */
|
2009-02-01 17:13:05 +08:00
|
|
|
if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) {
|
2013-12-23 17:38:58 +08:00
|
|
|
pr_warn("htb: too many events!\n");
|
2009-02-01 17:13:05 +08:00
|
|
|
q->warned |= HTB_WARN_TOOMANYEVENTS;
|
|
|
|
}
|
2009-02-01 17:13:22 +08:00
|
|
|
|
|
|
|
return q->now;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns class->node+prio from id-tree where classe's id is >= id. NULL
|
2011-01-20 03:26:56 +08:00
|
|
|
* is no such one exists.
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
static struct rb_node *htb_id_find_next_upper(int prio, struct rb_node *n,
|
|
|
|
u32 id)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct rb_node *r = NULL;
|
|
|
|
while (n) {
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl =
|
|
|
|
rb_entry(n, struct htb_class, node[prio]);
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
if (id > cl->common.classid) {
|
2005-04-17 06:20:36 +08:00
|
|
|
n = n->rb_right;
|
2008-12-10 14:34:40 +08:00
|
|
|
} else if (id < cl->common.classid) {
|
2005-04-17 06:20:36 +08:00
|
|
|
r = n;
|
|
|
|
n = n->rb_left;
|
2008-12-10 14:34:40 +08:00
|
|
|
} else {
|
|
|
|
return n;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* htb_lookup_leaf - returns next leaf class in DRR order
|
|
|
|
*
|
|
|
|
* Find leaf where current feed pointers points to.
|
|
|
|
*/
|
2013-06-15 18:30:10 +08:00
|
|
|
static struct htb_class *htb_lookup_leaf(struct htb_prio *hprio, const int prio)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct {
|
|
|
|
struct rb_node *root;
|
|
|
|
struct rb_node **pptr;
|
|
|
|
u32 *pid;
|
2006-08-11 14:35:16 +08:00
|
|
|
} stk[TC_HTB_MAXDEPTH], *sp = stk;
|
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
BUG_ON(!hprio->row.rb_node);
|
|
|
|
sp->root = hprio->row.rb_node;
|
|
|
|
sp->pptr = &hprio->ptr;
|
|
|
|
sp->pid = &hprio->last_ptr_id;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
for (i = 0; i < 65535; i++) {
|
2006-08-11 14:35:16 +08:00
|
|
|
if (!*sp->pptr && *sp->pid) {
|
2007-02-09 22:25:16 +08:00
|
|
|
/* ptr was invalidated but id is valid - try to recover
|
2011-01-20 03:26:56 +08:00
|
|
|
* the original or next ptr
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
*sp->pptr =
|
|
|
|
htb_id_find_next_upper(prio, sp->root, *sp->pid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
*sp->pid = 0; /* ptr is valid now so that remove this hint as it
|
2011-01-20 03:26:56 +08:00
|
|
|
* can become out of date quickly
|
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
if (!*sp->pptr) { /* we are at right end; rewind & go up */
|
2005-04-17 06:20:36 +08:00
|
|
|
*sp->pptr = sp->root;
|
2006-08-11 14:35:16 +08:00
|
|
|
while ((*sp->pptr)->rb_left)
|
2005-04-17 06:20:36 +08:00
|
|
|
*sp->pptr = (*sp->pptr)->rb_left;
|
|
|
|
if (sp > stk) {
|
|
|
|
sp--;
|
2008-12-10 14:35:02 +08:00
|
|
|
if (!*sp->pptr) {
|
|
|
|
WARN_ON(1);
|
2006-08-11 14:35:16 +08:00
|
|
|
return NULL;
|
2008-12-10 14:35:02 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_next_rb_node(sp->pptr);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct htb_class *cl;
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_prio *clp;
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
cl = rb_entry(*sp->pptr, struct htb_class, node[prio]);
|
|
|
|
if (!cl->level)
|
2005-04-17 06:20:36 +08:00
|
|
|
return cl;
|
2013-06-15 18:30:10 +08:00
|
|
|
clp = &cl->un.inner.clprio[prio];
|
|
|
|
(++sp)->root = clp->feed.rb_node;
|
|
|
|
sp->pptr = &clp->ptr;
|
|
|
|
sp->pid = &clp->last_ptr_id;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* dequeues packet at given priority and level; call only if
|
2011-01-20 03:26:56 +08:00
|
|
|
* you are sure that there is active class at prio/level
|
|
|
|
*/
|
2013-06-15 18:30:10 +08:00
|
|
|
static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, const int prio,
|
|
|
|
const int level)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb = NULL;
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl, *start;
|
2013-06-15 18:30:10 +08:00
|
|
|
struct htb_level *hlevel = &q->hlevel[level];
|
|
|
|
struct htb_prio *hprio = &hlevel->hprio[prio];
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* look initial class up in the row */
|
2013-06-15 18:30:10 +08:00
|
|
|
start = cl = htb_lookup_leaf(hprio, prio);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
do {
|
|
|
|
next:
|
2008-12-10 14:35:02 +08:00
|
|
|
if (unlikely(!cl))
|
2006-08-11 14:35:16 +08:00
|
|
|
return NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* class can be empty - it is unlikely but can be true if leaf
|
2011-01-20 03:26:56 +08:00
|
|
|
* qdisc drops packets in enqueue routine or if someone used
|
|
|
|
* graft operation on the leaf since last dequeue;
|
|
|
|
* simply deactivate and skip such class
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (unlikely(cl->un.leaf.q->q.qlen == 0)) {
|
|
|
|
struct htb_class *next;
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_deactivate(q, cl);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* row/level might become empty */
|
|
|
|
if ((q->row_mask[level] & (1 << prio)) == 0)
|
2006-08-11 14:35:16 +08:00
|
|
|
return NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
next = htb_lookup_leaf(hprio, prio);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
|
|
|
if (cl == start) /* fix start if we just deleted it */
|
2005-04-17 06:20:36 +08:00
|
|
|
start = next;
|
|
|
|
cl = next;
|
|
|
|
goto next;
|
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
|
|
|
|
skb = cl->un.leaf.q->dequeue(cl->un.leaf.q);
|
|
|
|
if (likely(skb != NULL))
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2008-12-04 13:09:10 +08:00
|
|
|
|
2009-02-01 17:12:42 +08:00
|
|
|
qdisc_warn_nonwc("htb", cl->un.leaf.q);
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr:
|
|
|
|
&q->hlevel[0].hprio[prio].ptr);
|
|
|
|
cl = htb_lookup_leaf(hprio, prio);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
} while (cl != start);
|
|
|
|
|
|
|
|
if (likely(skb != NULL)) {
|
2012-11-06 00:40:49 +08:00
|
|
|
bstats_update(&cl->bstats, skb);
|
2008-07-20 15:08:27 +08:00
|
|
|
cl->un.leaf.deficit[level] -= qdisc_pkt_len(skb);
|
|
|
|
if (cl->un.leaf.deficit[level] < 0) {
|
2008-12-04 13:09:45 +08:00
|
|
|
cl->un.leaf.deficit[level] += cl->quantum;
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr :
|
|
|
|
&q->hlevel[0].hprio[prio].ptr);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
/* this used to be after charge_class but this constelation
|
2011-01-20 03:26:56 +08:00
|
|
|
* gives us slightly better performance
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cl->un.leaf.q->q.qlen)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_deactivate(q, cl);
|
2007-07-11 13:43:16 +08:00
|
|
|
htb_charge_class(q, cl, level, skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sk_buff *htb_dequeue(struct Qdisc *sch)
|
|
|
|
{
|
2011-01-21 15:31:33 +08:00
|
|
|
struct sk_buff *skb;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
|
|
|
int level;
|
2013-06-04 15:11:48 +08:00
|
|
|
s64 next_event;
|
2009-01-13 13:54:40 +08:00
|
|
|
unsigned long start_at;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* try to dequeue direct packets as high prio (!) to minimize cpu work */
|
2016-09-18 06:57:34 +08:00
|
|
|
skb = __qdisc_dequeue_head(&q->direct_queue);
|
2006-08-11 14:35:16 +08:00
|
|
|
if (skb != NULL) {
|
2011-01-21 15:31:33 +08:00
|
|
|
ok:
|
|
|
|
qdisc_bstats_update(sch, skb);
|
2016-02-26 06:55:02 +08:00
|
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
sch->q.qlen--;
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if (!sch->q.qlen)
|
|
|
|
goto fin;
|
2014-08-23 09:32:09 +08:00
|
|
|
q->now = ktime_get_ns();
|
2009-01-13 13:54:40 +08:00
|
|
|
start_at = jiffies;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-12-21 23:04:59 +08:00
|
|
|
next_event = q->now + 5LLU * NSEC_PER_SEC;
|
2008-12-04 13:09:10 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
|
|
|
|
/* common case optimization - skip event handler quickly */
|
|
|
|
int m;
|
2013-06-15 18:30:10 +08:00
|
|
|
s64 event = q->near_ev_cache[level];
|
2007-03-16 16:22:39 +08:00
|
|
|
|
2013-06-15 18:30:10 +08:00
|
|
|
if (q->now >= event) {
|
2009-01-13 13:54:40 +08:00
|
|
|
event = htb_do_events(q, level, start_at);
|
2007-05-24 14:39:54 +08:00
|
|
|
if (!event)
|
2012-10-31 14:04:11 +08:00
|
|
|
event = q->now + NSEC_PER_SEC;
|
2007-05-24 14:39:54 +08:00
|
|
|
q->near_ev_cache[level] = event;
|
2013-06-15 18:30:10 +08:00
|
|
|
}
|
2007-03-16 16:22:39 +08:00
|
|
|
|
2009-01-13 13:54:16 +08:00
|
|
|
if (next_event > event)
|
2007-03-16 16:22:39 +08:00
|
|
|
next_event = event;
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
m = ~q->row_mask[level];
|
|
|
|
while (m != (int)(-1)) {
|
2006-08-11 14:35:16 +08:00
|
|
|
int prio = ffz(m);
|
2011-01-20 03:26:56 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
m |= 1 << prio;
|
2006-08-11 14:35:16 +08:00
|
|
|
skb = htb_dequeue_tree(q, prio, level);
|
2011-01-21 15:31:33 +08:00
|
|
|
if (likely(skb != NULL))
|
|
|
|
goto ok;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2014-09-29 02:53:29 +08:00
|
|
|
qdisc_qstats_overlimit(sch);
|
2016-05-24 05:24:56 +08:00
|
|
|
if (likely(next_event > q->now))
|
2016-06-11 07:41:39 +08:00
|
|
|
qdisc_watchdog_schedule_ns(&q->watchdog, next_event);
|
2016-05-24 05:24:56 +08:00
|
|
|
else
|
2009-02-01 17:13:22 +08:00
|
|
|
schedule_work(&q->work);
|
2005-04-17 06:20:36 +08:00
|
|
|
fin:
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* reset all classes */
|
|
|
|
/* always caled under BH & queue lock */
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_reset(struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2008-07-06 14:22:35 +08:00
|
|
|
struct htb_class *cl;
|
|
|
|
unsigned int i;
|
2006-08-11 14:35:38 +08:00
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
for (i = 0; i < q->clhash.hashsize; i++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cl->level)
|
2006-08-11 14:35:16 +08:00
|
|
|
memset(&cl->un.inner, 0, sizeof(cl->un.inner));
|
2005-04-17 06:20:36 +08:00
|
|
|
else {
|
2006-08-11 14:35:16 +08:00
|
|
|
if (cl->un.leaf.q)
|
2005-04-17 06:20:36 +08:00
|
|
|
qdisc_reset(cl->un.leaf.q);
|
|
|
|
INIT_LIST_HEAD(&cl->un.leaf.drop_list);
|
|
|
|
}
|
|
|
|
cl->prio_activity = 0;
|
|
|
|
cl->cmode = HTB_CAN_SEND;
|
|
|
|
}
|
|
|
|
}
|
2007-03-16 16:22:39 +08:00
|
|
|
qdisc_watchdog_cancel(&q->watchdog);
|
2016-06-14 11:21:56 +08:00
|
|
|
__qdisc_reset_queue(&q->direct_queue);
|
2005-04-17 06:20:36 +08:00
|
|
|
sch->q.qlen = 0;
|
2016-02-26 06:55:02 +08:00
|
|
|
sch->qstats.backlog = 0;
|
2013-06-15 18:30:10 +08:00
|
|
|
memset(q->hlevel, 0, sizeof(q->hlevel));
|
2006-08-11 14:35:16 +08:00
|
|
|
memset(q->row_mask, 0, sizeof(q->row_mask));
|
2005-04-17 06:20:36 +08:00
|
|
|
for (i = 0; i < TC_HTB_NUMPRIO; i++)
|
2006-08-11 14:35:16 +08:00
|
|
|
INIT_LIST_HEAD(q->drops + i);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-01-24 12:35:39 +08:00
|
|
|
static const struct nla_policy htb_policy[TCA_HTB_MAX + 1] = {
|
|
|
|
[TCA_HTB_PARMS] = { .len = sizeof(struct tc_htb_opt) },
|
|
|
|
[TCA_HTB_INIT] = { .len = sizeof(struct tc_htb_glob) },
|
|
|
|
[TCA_HTB_CTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
|
|
|
|
[TCA_HTB_RTAB] = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
|
2013-03-06 14:49:21 +08:00
|
|
|
[TCA_HTB_DIRECT_QLEN] = { .type = NLA_U32 },
|
2013-09-20 00:10:20 +08:00
|
|
|
[TCA_HTB_RATE64] = { .type = NLA_U64 },
|
|
|
|
[TCA_HTB_CEIL64] = { .type = NLA_U64 },
|
2008-01-24 12:35:39 +08:00
|
|
|
};
|
|
|
|
|
2009-02-01 17:13:22 +08:00
|
|
|
static void htb_work_func(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct htb_sched *q = container_of(work, struct htb_sched, work);
|
|
|
|
struct Qdisc *sch = q->watchdog.qdisc;
|
|
|
|
|
2016-06-14 12:16:27 +08:00
|
|
|
rcu_read_lock();
|
2009-02-01 17:13:22 +08:00
|
|
|
__netif_schedule(qdisc_root(sch));
|
2016-06-14 12:16:27 +08:00
|
|
|
rcu_read_unlock();
|
2009-02-01 17:13:22 +08:00
|
|
|
}
|
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
static int htb_init(struct Qdisc *sch, struct nlattr *opt)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2013-03-06 14:49:21 +08:00
|
|
|
struct nlattr *tb[TCA_HTB_MAX + 1];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_htb_glob *gopt;
|
2008-01-24 12:33:32 +08:00
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
int i;
|
2008-01-24 12:33:32 +08:00
|
|
|
|
|
|
|
if (!opt)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-03-06 14:49:21 +08:00
|
|
|
err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy);
|
2008-01-24 12:33:32 +08:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2013-03-06 14:49:21 +08:00
|
|
|
if (!tb[TCA_HTB_INIT])
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
2013-03-06 14:49:21 +08:00
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
gopt = nla_data(tb[TCA_HTB_INIT]);
|
2013-03-06 14:49:21 +08:00
|
|
|
if (gopt->version != HTB_VER >> 16)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
err = qdisc_class_hash_init(&q->clhash);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-04-17 06:20:36 +08:00
|
|
|
for (i = 0; i < TC_HTB_NUMPRIO; i++)
|
2006-08-11 14:35:16 +08:00
|
|
|
INIT_LIST_HEAD(q->drops + i);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-16 16:22:39 +08:00
|
|
|
qdisc_watchdog_init(&q->watchdog, sch);
|
2009-02-01 17:13:22 +08:00
|
|
|
INIT_WORK(&q->work, htb_work_func);
|
2016-09-18 06:57:34 +08:00
|
|
|
qdisc_skb_head_init(&q->direct_queue);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-03-06 14:49:21 +08:00
|
|
|
if (tb[TCA_HTB_DIRECT_QLEN])
|
|
|
|
q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]);
|
2015-08-18 16:30:49 +08:00
|
|
|
else
|
2013-03-06 14:49:21 +08:00
|
|
|
q->direct_qlen = qdisc_dev(sch)->tx_queue_len;
|
2015-08-18 16:30:49 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((q->rate2quantum = gopt->rate2quantum) < 1)
|
|
|
|
q->rate2quantum = 1;
|
|
|
|
q->defcls = gopt->defcls;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2008-01-24 12:34:11 +08:00
|
|
|
struct nlattr *nest;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_htb_glob gopt;
|
2008-01-24 12:34:11 +08:00
|
|
|
|
2014-03-06 02:14:34 +08:00
|
|
|
/* Its safe to not acquire qdisc lock. As we hold RTNL,
|
|
|
|
* no change can happen on the qdisc parameters.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-24 12:34:11 +08:00
|
|
|
gopt.direct_pkts = q->direct_pkts;
|
2005-04-17 06:20:36 +08:00
|
|
|
gopt.version = HTB_VER;
|
|
|
|
gopt.rate2quantum = q->rate2quantum;
|
|
|
|
gopt.defcls = q->defcls;
|
2006-08-11 14:31:08 +08:00
|
|
|
gopt.debug = 0;
|
2008-01-24 12:34:11 +08:00
|
|
|
|
|
|
|
nest = nla_nest_start(skb, TCA_OPTIONS);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2013-03-06 14:49:21 +08:00
|
|
|
if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
|
|
|
|
nla_put_u32(skb, TCA_HTB_DIRECT_QLEN, q->direct_qlen))
|
2012-03-29 17:11:39 +08:00
|
|
|
goto nla_put_failure;
|
2008-01-24 12:34:11 +08:00
|
|
|
|
2014-03-06 02:14:34 +08:00
|
|
|
return nla_nest_end(skb, nest);
|
2008-01-24 12:34:11 +08:00
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
nla_put_failure:
|
2008-01-24 12:34:11 +08:00
|
|
|
nla_nest_cancel(skb, nest);
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
|
2006-08-11 14:35:16 +08:00
|
|
|
struct sk_buff *skb, struct tcmsg *tcm)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2008-01-24 12:34:11 +08:00
|
|
|
struct nlattr *nest;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_htb_opt opt;
|
|
|
|
|
2014-03-06 02:14:34 +08:00
|
|
|
/* Its safe to not acquire qdisc lock. As we hold RTNL,
|
|
|
|
* no change can happen on the class parameters.
|
|
|
|
*/
|
2008-07-06 14:22:35 +08:00
|
|
|
tcm->tcm_parent = cl->parent ? cl->parent->common.classid : TC_H_ROOT;
|
|
|
|
tcm->tcm_handle = cl->common.classid;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cl->level && cl->un.leaf.q)
|
|
|
|
tcm->tcm_info = cl->un.leaf.q->handle;
|
|
|
|
|
2008-01-24 12:34:11 +08:00
|
|
|
nest = nla_nest_start(skb, TCA_OPTIONS);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-06-02 21:55:05 +08:00
|
|
|
psched_ratecfg_getrate(&opt.rate, &cl->rate);
|
2013-02-12 08:12:00 +08:00
|
|
|
opt.buffer = PSCHED_NS2TICKS(cl->buffer);
|
2013-06-02 21:55:05 +08:00
|
|
|
psched_ratecfg_getrate(&opt.ceil, &cl->ceil);
|
2013-02-12 08:12:00 +08:00
|
|
|
opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer);
|
2008-12-04 13:09:45 +08:00
|
|
|
opt.quantum = cl->quantum;
|
|
|
|
opt.prio = cl->prio;
|
2006-08-11 14:35:16 +08:00
|
|
|
opt.level = cl->level;
|
2012-03-29 17:11:39 +08:00
|
|
|
if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt))
|
|
|
|
goto nla_put_failure;
|
2013-09-20 00:10:20 +08:00
|
|
|
if ((cl->rate.rate_bytes_ps >= (1ULL << 32)) &&
|
2016-04-25 16:25:15 +08:00
|
|
|
nla_put_u64_64bit(skb, TCA_HTB_RATE64, cl->rate.rate_bytes_ps,
|
|
|
|
TCA_HTB_PAD))
|
2013-09-20 00:10:20 +08:00
|
|
|
goto nla_put_failure;
|
|
|
|
if ((cl->ceil.rate_bytes_ps >= (1ULL << 32)) &&
|
2016-04-25 16:25:15 +08:00
|
|
|
nla_put_u64_64bit(skb, TCA_HTB_CEIL64, cl->ceil.rate_bytes_ps,
|
|
|
|
TCA_HTB_PAD))
|
2013-09-20 00:10:20 +08:00
|
|
|
goto nla_put_failure;
|
2008-01-24 12:34:11 +08:00
|
|
|
|
2014-03-06 02:14:34 +08:00
|
|
|
return nla_nest_end(skb, nest);
|
2008-01-24 12:34:11 +08:00
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
nla_put_failure:
|
2008-01-24 12:34:11 +08:00
|
|
|
nla_nest_cancel(skb, nest);
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2016-06-22 14:16:51 +08:00
|
|
|
struct gnet_stats_queue qs = {
|
|
|
|
.drops = cl->drops,
|
|
|
|
};
|
2014-09-29 02:53:57 +08:00
|
|
|
__u32 qlen = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-06-22 14:16:51 +08:00
|
|
|
if (!cl->level && cl->un.leaf.q) {
|
2014-09-29 02:53:57 +08:00
|
|
|
qlen = cl->un.leaf.q->q.qlen;
|
2016-06-22 14:16:51 +08:00
|
|
|
qs.backlog = cl->un.leaf.q->qstats.backlog;
|
|
|
|
}
|
2016-07-16 22:08:56 +08:00
|
|
|
cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
|
|
|
|
INT_MIN, INT_MAX);
|
|
|
|
cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
|
|
|
|
INT_MIN, INT_MAX);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-06-07 00:37:16 +08:00
|
|
|
if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
|
|
|
|
d, NULL, &cl->bstats) < 0 ||
|
pkt_sched: gen_estimator: Dont report fake rate estimators
Jarek Poplawski a écrit :
>
>
> Hmm... So you made me to do some "real" work here, and guess what?:
> there is one serious checkpatch warning! ;-) Plus, this new parameter
> should be added to the function description. Otherwise:
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
>
> Thanks,
> Jarek P.
>
> PS: I guess full "Don't" would show we really mean it...
Okay :) Here is the last round, before the night !
Thanks again
[RFC] pkt_sched: gen_estimator: Don't report fake rate estimators
We currently send TCA_STATS_RATE_EST elements to netlink users, even if no estimator
is running.
# tc -s -d qdisc
qdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
Sent 112833764978 bytes 1495081739 pkt (dropped 0, overlimits 0 requeues 0)
rate 0bit 0pps backlog 0b 0p requeues 0
User has no way to tell if the "rate 0bit 0pps" is a real estimation, or a fake
one (because no estimator is active)
After this patch, tc command output is :
$ tc -s -d qdisc
qdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
Sent 561075 bytes 1196 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0
We add a parameter to gnet_stats_copy_rate_est() function so that
it can use gen_estimator_active(bstats, r), as suggested by Jarek.
This parameter can be NULL if check is not necessary, (htb for
example has a mandatory rate estimator)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-10-02 18:32:18 +08:00
|
|
|
gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 ||
|
2016-06-22 14:16:51 +08:00
|
|
|
gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
|
2006-08-11 14:35:16 +08:00
|
|
|
struct Qdisc **old)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-09-04 14:41:17 +08:00
|
|
|
if (cl->level)
|
|
|
|
return -EINVAL;
|
|
|
|
if (new == NULL &&
|
2010-10-16 21:04:08 +08:00
|
|
|
(new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
|
2009-09-04 14:41:17 +08:00
|
|
|
cl->common.classid)) == NULL)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
2016-02-26 06:55:00 +08:00
|
|
|
*old = qdisc_replace(sch, new, &cl->un.leaf.q);
|
2009-09-04 14:41:17 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
static struct Qdisc *htb_leaf(struct Qdisc *sch, unsigned long arg)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2009-09-04 14:41:17 +08:00
|
|
|
return !cl->level ? cl->un.leaf.q : NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-11-30 09:37:05 +08:00
|
|
|
static void htb_qlen_notify(struct Qdisc *sch, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
|
|
|
|
|
|
|
if (cl->un.leaf.q->q.qlen == 0)
|
|
|
|
htb_deactivate(qdisc_priv(sch), cl);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static unsigned long htb_get(struct Qdisc *sch, u32 classid)
|
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = htb_find(classid, sch);
|
|
|
|
if (cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->refcnt++;
|
|
|
|
return (unsigned long)cl;
|
|
|
|
}
|
|
|
|
|
2006-12-08 16:26:56 +08:00
|
|
|
static inline int htb_parent_last_child(struct htb_class *cl)
|
|
|
|
{
|
|
|
|
if (!cl->parent)
|
|
|
|
/* the root class */
|
|
|
|
return 0;
|
2008-07-06 14:22:53 +08:00
|
|
|
if (cl->parent->children > 1)
|
2006-12-08 16:26:56 +08:00
|
|
|
/* not the last child */
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-05-04 11:46:29 +08:00
|
|
|
static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl,
|
|
|
|
struct Qdisc *new_q)
|
2006-12-08 16:26:56 +08:00
|
|
|
{
|
|
|
|
struct htb_class *parent = cl->parent;
|
|
|
|
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(cl->level || !cl->un.leaf.q || cl->prio_activity);
|
2006-12-08 16:26:56 +08:00
|
|
|
|
2008-05-04 11:46:29 +08:00
|
|
|
if (parent->cmode != HTB_CAN_SEND)
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(&parent->pq_node,
|
|
|
|
&q->hlevel[parent->level].wait_pq);
|
2008-05-04 11:46:29 +08:00
|
|
|
|
2006-12-08 16:26:56 +08:00
|
|
|
parent->level = 0;
|
|
|
|
memset(&parent->un.inner, 0, sizeof(parent->un.inner));
|
|
|
|
INIT_LIST_HEAD(&parent->un.leaf.drop_list);
|
|
|
|
parent->un.leaf.q = new_q ? new_q : &noop_qdisc;
|
|
|
|
parent->tokens = parent->buffer;
|
|
|
|
parent->ctokens = parent->cbuffer;
|
2014-08-23 09:32:09 +08:00
|
|
|
parent->t_c = ktime_get_ns();
|
2006-12-08 16:26:56 +08:00
|
|
|
parent->cmode = HTB_CAN_SEND;
|
|
|
|
}
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
if (!cl->level) {
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(!cl->un.leaf.q);
|
2005-04-17 06:20:36 +08:00
|
|
|
qdisc_destroy(cl->un.leaf.q);
|
|
|
|
}
|
2007-07-03 13:48:13 +08:00
|
|
|
gen_kill_estimator(&cl->bstats, &cl->rate_est);
|
2008-07-02 10:52:38 +08:00
|
|
|
tcf_destroy_chain(&cl->filter_list);
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(cl);
|
|
|
|
}
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
static void htb_destroy(struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
struct hlist_node *next;
|
2008-07-06 14:22:19 +08:00
|
|
|
struct htb_class *cl;
|
|
|
|
unsigned int i;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-02-01 17:13:22 +08:00
|
|
|
cancel_work_sync(&q->work);
|
2007-03-16 16:22:39 +08:00
|
|
|
qdisc_watchdog_cancel(&q->watchdog);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* This line used to be after htb_destroy_class call below
|
2011-01-20 03:26:56 +08:00
|
|
|
* and surprisingly it worked in 2.4. But it must precede it
|
|
|
|
* because filter need its target class alive to be able to call
|
|
|
|
* unbind_filter on it (without Oops).
|
|
|
|
*/
|
2008-07-02 10:52:38 +08:00
|
|
|
tcf_destroy_chain(&q->filter_list);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
for (i = 0; i < q->clhash.hashsize; i++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode)
|
2008-07-06 14:22:19 +08:00
|
|
|
tcf_destroy_chain(&cl->filter_list);
|
|
|
|
}
|
2008-07-06 14:22:35 +08:00
|
|
|
for (i = 0; i < q->clhash.hashsize; i++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_safe(cl, next, &q->clhash.hash[i],
|
2008-07-06 14:22:35 +08:00
|
|
|
common.hnode)
|
2008-07-06 14:22:19 +08:00
|
|
|
htb_destroy_class(sch, cl);
|
|
|
|
}
|
2008-07-06 14:22:35 +08:00
|
|
|
qdisc_class_hash_destroy(&q->clhash);
|
2016-06-14 11:21:56 +08:00
|
|
|
__qdisc_reset_queue(&q->direct_queue);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int htb_delete(struct Qdisc *sch, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2006-12-08 16:26:56 +08:00
|
|
|
struct Qdisc *new_q = NULL;
|
|
|
|
int last_child = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-12-23 17:38:59 +08:00
|
|
|
/* TODO: why don't allow to delete subtree ? references ? does
|
|
|
|
* tc subsys guarantee us that in htb_destroy it holds no class
|
|
|
|
* refs so that we can remove children safely there ?
|
|
|
|
*/
|
2008-07-06 14:22:53 +08:00
|
|
|
if (cl->children || cl->filter_cnt)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EBUSY;
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2006-12-08 16:26:56 +08:00
|
|
|
if (!cl->level && htb_parent_last_child(cl)) {
|
2010-10-16 21:04:08 +08:00
|
|
|
new_q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
|
2008-07-09 07:55:56 +08:00
|
|
|
cl->parent->common.classid);
|
2006-12-08 16:26:56 +08:00
|
|
|
last_child = 1;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
sch_tree_lock(sch);
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2006-11-30 09:34:50 +08:00
|
|
|
if (!cl->level) {
|
2016-02-26 06:55:01 +08:00
|
|
|
unsigned int qlen = cl->un.leaf.q->q.qlen;
|
|
|
|
unsigned int backlog = cl->un.leaf.q->qstats.backlog;
|
|
|
|
|
2006-11-30 09:34:50 +08:00
|
|
|
qdisc_reset(cl->un.leaf.q);
|
2016-02-26 06:55:01 +08:00
|
|
|
qdisc_tree_reduce_backlog(cl->un.leaf.q, qlen, backlog);
|
2006-11-30 09:34:50 +08:00
|
|
|
}
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
/* delete from hash and active; remainder in destroy_class */
|
|
|
|
qdisc_class_hash_remove(&q->clhash, &cl->common);
|
2008-08-14 06:16:43 +08:00
|
|
|
if (cl->parent)
|
|
|
|
cl->parent->children--;
|
2007-03-28 05:04:24 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cl->prio_activity)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_deactivate(q, cl);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-06 14:22:19 +08:00
|
|
|
if (cl->cmode != HTB_CAN_SEND)
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(&cl->pq_node,
|
|
|
|
&q->hlevel[cl->level].wait_pq);
|
2008-07-06 14:22:19 +08:00
|
|
|
|
2006-12-08 16:26:56 +08:00
|
|
|
if (last_child)
|
2008-05-04 11:46:29 +08:00
|
|
|
htb_parent_to_leaf(q, cl, new_q);
|
2006-12-08 16:26:56 +08:00
|
|
|
|
2009-03-16 11:00:19 +08:00
|
|
|
BUG_ON(--cl->refcnt == 0);
|
|
|
|
/*
|
|
|
|
* This shouldn't happen: we "hold" one cops->get() when called
|
|
|
|
* from tc_ctl_tclass; the destroy method is done from cops->put().
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
sch_tree_unlock(sch);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void htb_put(struct Qdisc *sch, unsigned long arg)
|
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (--cl->refcnt == 0)
|
2006-08-11 14:35:16 +08:00
|
|
|
htb_destroy_class(sch, cl);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
static int htb_change_class(struct Qdisc *sch, u32 classid,
|
2008-01-23 14:11:17 +08:00
|
|
|
u32 parentid, struct nlattr **tca,
|
2006-08-11 14:35:16 +08:00
|
|
|
unsigned long *arg)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int err = -EINVAL;
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = (struct htb_class *)*arg, *parent;
|
2008-01-23 14:11:17 +08:00
|
|
|
struct nlattr *opt = tca[TCA_OPTIONS];
|
2013-03-06 14:49:21 +08:00
|
|
|
struct nlattr *tb[TCA_HTB_MAX + 1];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_htb_opt *hopt;
|
2013-09-20 00:10:20 +08:00
|
|
|
u64 rate64, ceil64;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* extract all subattrs from opt attr */
|
2008-01-24 12:33:32 +08:00
|
|
|
if (!opt)
|
|
|
|
goto failure;
|
|
|
|
|
2010-09-30 14:17:44 +08:00
|
|
|
err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy);
|
2008-01-24 12:33:32 +08:00
|
|
|
if (err < 0)
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
err = -EINVAL;
|
2008-01-24 12:35:39 +08:00
|
|
|
if (tb[TCA_HTB_PARMS] == NULL)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto failure;
|
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
parent = parentid == TC_H_ROOT ? NULL : htb_find(parentid, sch);
|
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
hopt = nla_data(tb[TCA_HTB_PARMS]);
|
2012-11-06 00:40:49 +08:00
|
|
|
if (!hopt->rate.rate || !hopt->ceil.rate)
|
2006-08-11 14:35:16 +08:00
|
|
|
goto failure;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-08-15 05:47:11 +08:00
|
|
|
/* Keeping backward compatible with rate_table based iproute2 tc */
|
2013-12-11 15:48:37 +08:00
|
|
|
if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE)
|
|
|
|
qdisc_put_rtab(qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]));
|
|
|
|
|
|
|
|
if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE)
|
|
|
|
qdisc_put_rtab(qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]));
|
2013-08-15 05:47:11 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if (!cl) { /* new class */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct Qdisc *new_q;
|
2006-08-11 14:36:01 +08:00
|
|
|
int prio;
|
2007-07-03 13:48:13 +08:00
|
|
|
struct {
|
2008-01-23 14:11:17 +08:00
|
|
|
struct nlattr nla;
|
2007-07-03 13:48:13 +08:00
|
|
|
struct gnet_estimator opt;
|
|
|
|
} est = {
|
2008-01-23 14:11:17 +08:00
|
|
|
.nla = {
|
|
|
|
.nla_len = nla_attr_size(sizeof(est.opt)),
|
|
|
|
.nla_type = TCA_RATE,
|
2007-07-03 13:48:13 +08:00
|
|
|
},
|
|
|
|
.opt = {
|
|
|
|
/* 4s interval, 16s averaging constant */
|
|
|
|
.interval = 2,
|
|
|
|
.ewma_log = 2,
|
|
|
|
},
|
|
|
|
};
|
2006-08-11 14:36:01 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* check for valid classid */
|
2009-11-30 08:55:45 +08:00
|
|
|
if (!classid || TC_H_MAJ(classid ^ sch->handle) ||
|
|
|
|
htb_find(classid, sch))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto failure;
|
|
|
|
|
|
|
|
/* check maximal depth */
|
|
|
|
if (parent && parent->parent && parent->parent->level < 2) {
|
2011-01-20 03:26:56 +08:00
|
|
|
pr_err("htb: tree is too deep\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
goto failure;
|
|
|
|
}
|
|
|
|
err = -ENOBUFS;
|
2011-01-20 03:26:56 +08:00
|
|
|
cl = kzalloc(sizeof(*cl), GFP_KERNEL);
|
|
|
|
if (!cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto failure;
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2013-06-07 05:53:16 +08:00
|
|
|
if (htb_rate_est || tca[TCA_RATE]) {
|
2014-09-29 02:52:56 +08:00
|
|
|
err = gen_new_estimator(&cl->bstats, NULL,
|
|
|
|
&cl->rate_est,
|
2016-06-07 00:37:16 +08:00
|
|
|
NULL,
|
|
|
|
qdisc_root_sleeping_running(sch),
|
2013-06-07 05:53:16 +08:00
|
|
|
tca[TCA_RATE] ? : &est.nla);
|
|
|
|
if (err) {
|
|
|
|
kfree(cl);
|
|
|
|
goto failure;
|
|
|
|
}
|
2008-11-26 13:13:31 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->refcnt = 1;
|
2008-07-06 14:22:53 +08:00
|
|
|
cl->children = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
INIT_LIST_HEAD(&cl->un.leaf.drop_list);
|
2006-08-11 14:36:01 +08:00
|
|
|
RB_CLEAR_NODE(&cl->pq_node);
|
|
|
|
|
|
|
|
for (prio = 0; prio < TC_HTB_NUMPRIO; prio++)
|
|
|
|
RB_CLEAR_NODE(&cl->node[prio]);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* create leaf qdisc early because it uses kmalloc(GFP_KERNEL)
|
2011-01-20 03:26:56 +08:00
|
|
|
* so that can't be used inside of sch_tree_lock
|
|
|
|
* -- thanks to Karlis Peisenieks
|
|
|
|
*/
|
2010-10-16 21:04:08 +08:00
|
|
|
new_q = qdisc_create_dflt(sch->dev_queue,
|
2008-07-09 07:55:56 +08:00
|
|
|
&pfifo_qdisc_ops, classid);
|
2005-04-17 06:20:36 +08:00
|
|
|
sch_tree_lock(sch);
|
|
|
|
if (parent && !parent->level) {
|
2006-11-30 09:37:05 +08:00
|
|
|
unsigned int qlen = parent->un.leaf.q->q.qlen;
|
2016-02-26 06:55:01 +08:00
|
|
|
unsigned int backlog = parent->un.leaf.q->qstats.backlog;
|
2006-11-30 09:37:05 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* turn parent into inner node */
|
2006-11-30 09:37:05 +08:00
|
|
|
qdisc_reset(parent->un.leaf.q);
|
2016-02-26 06:55:01 +08:00
|
|
|
qdisc_tree_reduce_backlog(parent->un.leaf.q, qlen, backlog);
|
2006-08-11 14:35:16 +08:00
|
|
|
qdisc_destroy(parent->un.leaf.q);
|
|
|
|
if (parent->prio_activity)
|
|
|
|
htb_deactivate(q, parent);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* remove from evt list because of level change */
|
|
|
|
if (parent->cmode != HTB_CAN_SEND) {
|
2013-06-15 18:30:10 +08:00
|
|
|
htb_safe_rb_erase(&parent->pq_node, &q->hlevel[0].wait_pq);
|
2005-04-17 06:20:36 +08:00
|
|
|
parent->cmode = HTB_CAN_SEND;
|
|
|
|
}
|
|
|
|
parent->level = (parent->parent ? parent->parent->level
|
2006-08-11 14:35:16 +08:00
|
|
|
: TC_HTB_MAXDEPTH) - 1;
|
|
|
|
memset(&parent->un.inner, 0, sizeof(parent->un.inner));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
/* leaf (we) needs elementary qdisc */
|
|
|
|
cl->un.leaf.q = new_q ? new_q : &noop_qdisc;
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
cl->common.classid = classid;
|
2006-08-11 14:35:16 +08:00
|
|
|
cl->parent = parent;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* set class to be in HTB_CAN_SEND state */
|
2013-02-12 08:12:02 +08:00
|
|
|
cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
|
|
|
|
cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
|
2013-06-04 15:11:48 +08:00
|
|
|
cl->mbuffer = 60ULL * NSEC_PER_SEC; /* 1min */
|
2014-08-23 09:32:09 +08:00
|
|
|
cl->t_c = ktime_get_ns();
|
2005-04-17 06:20:36 +08:00
|
|
|
cl->cmode = HTB_CAN_SEND;
|
|
|
|
|
|
|
|
/* attach to the hash list and parent's family */
|
2008-07-06 14:22:35 +08:00
|
|
|
qdisc_class_hash_insert(&q->clhash, &cl->common);
|
2008-07-06 14:22:53 +08:00
|
|
|
if (parent)
|
|
|
|
parent->children++;
|
2007-07-03 13:48:13 +08:00
|
|
|
} else {
|
2008-11-26 13:13:31 +08:00
|
|
|
if (tca[TCA_RATE]) {
|
2014-09-29 02:52:56 +08:00
|
|
|
err = gen_replace_estimator(&cl->bstats, NULL,
|
|
|
|
&cl->rate_est,
|
2016-06-07 00:37:16 +08:00
|
|
|
NULL,
|
|
|
|
qdisc_root_sleeping_running(sch),
|
2008-11-26 13:13:31 +08:00
|
|
|
tca[TCA_RATE]);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
sch_tree_lock(sch);
|
2007-07-03 13:48:13 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-12-10 14:59:28 +08:00
|
|
|
rate64 = tb[TCA_HTB_RATE64] ? nla_get_u64(tb[TCA_HTB_RATE64]) : 0;
|
|
|
|
|
|
|
|
ceil64 = tb[TCA_HTB_CEIL64] ? nla_get_u64(tb[TCA_HTB_CEIL64]) : 0;
|
|
|
|
|
|
|
|
psched_ratecfg_precompute(&cl->rate, &hopt->rate, rate64);
|
|
|
|
psched_ratecfg_precompute(&cl->ceil, &hopt->ceil, ceil64);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* it used to be a nasty bug here, we have to check that node
|
2011-01-20 03:26:56 +08:00
|
|
|
* is really leaf before changing cl->un.leaf !
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cl->level) {
|
2013-12-10 14:59:28 +08:00
|
|
|
u64 quantum = cl->rate.rate_bytes_ps;
|
|
|
|
|
|
|
|
do_div(quantum, q->rate2quantum);
|
|
|
|
cl->quantum = min_t(u64, quantum, INT_MAX);
|
|
|
|
|
2008-12-04 13:09:45 +08:00
|
|
|
if (!hopt->quantum && cl->quantum < 1000) {
|
2013-12-23 17:38:58 +08:00
|
|
|
pr_warn("HTB: quantum of class %X is small. Consider r2q change.\n",
|
|
|
|
cl->common.classid);
|
2008-12-04 13:09:45 +08:00
|
|
|
cl->quantum = 1000;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-12-04 13:09:45 +08:00
|
|
|
if (!hopt->quantum && cl->quantum > 200000) {
|
2013-12-23 17:38:58 +08:00
|
|
|
pr_warn("HTB: quantum of class %X is big. Consider r2q change.\n",
|
|
|
|
cl->common.classid);
|
2008-12-04 13:09:45 +08:00
|
|
|
cl->quantum = 200000;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (hopt->quantum)
|
2008-12-04 13:09:45 +08:00
|
|
|
cl->quantum = hopt->quantum;
|
|
|
|
if ((cl->prio = hopt->prio) >= TC_HTB_NUMPRIO)
|
|
|
|
cl->prio = TC_HTB_NUMPRIO - 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-02-12 08:11:59 +08:00
|
|
|
cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
|
2013-09-11 08:36:37 +08:00
|
|
|
cl->cbuffer = PSCHED_TICKS2NS(hopt->cbuffer);
|
2012-10-31 14:04:11 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
sch_tree_unlock(sch);
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
qdisc_class_hash_grow(sch, &q->clhash);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
*arg = (unsigned long)cl;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
failure:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-09-13 11:05:27 +08:00
|
|
|
static struct tcf_proto __rcu **htb_find_tcf(struct Qdisc *sch,
|
|
|
|
unsigned long arg)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2014-09-13 11:05:27 +08:00
|
|
|
struct tcf_proto __rcu **fl = cl ? &cl->filter_list : &q->filter_list;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return fl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long htb_bind_filter(struct Qdisc *sch, unsigned long parent,
|
2006-08-11 14:35:16 +08:00
|
|
|
u32 classid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
struct htb_class *cl = htb_find(classid, sch);
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*if (cl && !cl->level) return 0;
|
2011-01-20 03:26:56 +08:00
|
|
|
* 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
|
|
|
|
* for other reasons so that we have to allow for it.
|
|
|
|
* ----
|
|
|
|
* 19.6.2002 As Werner explained it is ok - bind filter is just
|
|
|
|
* another way to "lock" the class - unlike "get" this lock can
|
|
|
|
* be broken by class during destroy IIUC.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2006-08-11 14:35:16 +08:00
|
|
|
if (cl)
|
|
|
|
cl->filter_cnt++;
|
2005-04-17 06:20:36 +08:00
|
|
|
return (unsigned long)cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void htb_unbind_filter(struct Qdisc *sch, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct htb_class *cl = (struct htb_class *)arg;
|
2006-08-11 14:31:08 +08:00
|
|
|
|
2006-08-11 14:35:16 +08:00
|
|
|
if (cl)
|
|
|
|
cl->filter_cnt--;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)
|
|
|
|
{
|
|
|
|
struct htb_sched *q = qdisc_priv(sch);
|
2008-07-06 14:22:35 +08:00
|
|
|
struct htb_class *cl;
|
|
|
|
unsigned int i;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (arg->stop)
|
|
|
|
return;
|
|
|
|
|
2008-07-06 14:22:35 +08:00
|
|
|
for (i = 0; i < q->clhash.hashsize; i++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (arg->count < arg->skip) {
|
|
|
|
arg->count++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
|
|
|
|
arg->stop = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
arg->count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-14 17:44:41 +08:00
|
|
|
static const struct Qdisc_class_ops htb_class_ops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.graft = htb_graft,
|
|
|
|
.leaf = htb_leaf,
|
2006-11-30 09:37:05 +08:00
|
|
|
.qlen_notify = htb_qlen_notify,
|
2005-04-17 06:20:36 +08:00
|
|
|
.get = htb_get,
|
|
|
|
.put = htb_put,
|
|
|
|
.change = htb_change_class,
|
|
|
|
.delete = htb_delete,
|
|
|
|
.walk = htb_walk,
|
|
|
|
.tcf_chain = htb_find_tcf,
|
|
|
|
.bind_tcf = htb_bind_filter,
|
|
|
|
.unbind_tcf = htb_unbind_filter,
|
|
|
|
.dump = htb_dump_class,
|
|
|
|
.dump_stats = htb_dump_class_stats,
|
|
|
|
};
|
|
|
|
|
2007-11-14 17:44:41 +08:00
|
|
|
static struct Qdisc_ops htb_qdisc_ops __read_mostly = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.cl_ops = &htb_class_ops,
|
|
|
|
.id = "htb",
|
|
|
|
.priv_size = sizeof(struct htb_sched),
|
|
|
|
.enqueue = htb_enqueue,
|
|
|
|
.dequeue = htb_dequeue,
|
2008-10-31 15:47:01 +08:00
|
|
|
.peek = qdisc_peek_dequeued,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init = htb_init,
|
|
|
|
.reset = htb_reset,
|
|
|
|
.destroy = htb_destroy,
|
|
|
|
.dump = htb_dump,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init htb_module_init(void)
|
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
return register_qdisc(&htb_qdisc_ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
static void __exit htb_module_exit(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-08-11 14:35:16 +08:00
|
|
|
unregister_qdisc(&htb_qdisc_ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-08-11 14:35:16 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
module_init(htb_module_init)
|
|
|
|
module_exit(htb_module_exit)
|
|
|
|
MODULE_LICENSE("GPL");
|