2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* net/sched/sch_prio.c Simple 3-band priority "scheduler".
|
|
|
|
*
|
|
|
|
* 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: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
2007-02-09 22:25:16 +08:00
|
|
|
* Fixes: 19990609: J Hadi Salim <hadi@nortelnetworks.com>:
|
2005-04-17 06:20:36 +08:00
|
|
|
* Init -- EINVAL when opt undefined
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.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>
|
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>
|
2007-03-26 14:06:12 +08:00
|
|
|
#include <net/netlink.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <net/pkt_sched.h>
|
2017-02-09 21:38:56 +08:00
|
|
|
#include <net/pkt_cls.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-01-20 03:26:56 +08:00
|
|
|
struct prio_sched_data {
|
2005-04-17 06:20:36 +08:00
|
|
|
int bands;
|
2014-09-13 11:05:27 +08:00
|
|
|
struct tcf_proto __rcu *filter_list;
|
2017-05-17 17:07:55 +08:00
|
|
|
struct tcf_block *block;
|
2005-04-17 06:20:36 +08:00
|
|
|
u8 prio2band[TC_PRIO_MAX+1];
|
|
|
|
struct Qdisc *queues[TCQ_PRIO_BANDS];
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static struct Qdisc *
|
|
|
|
prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
u32 band = skb->priority;
|
|
|
|
struct tcf_result res;
|
2014-09-13 11:05:27 +08:00
|
|
|
struct tcf_proto *fl;
|
2007-07-31 08:07:14 +08:00
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-08-05 13:39:11 +08:00
|
|
|
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (TC_H_MAJ(skb->priority) != sch->handle) {
|
2014-09-13 11:05:27 +08:00
|
|
|
fl = rcu_dereference_bh(q->filter_list);
|
2017-05-17 17:07:54 +08:00
|
|
|
err = tcf_classify(skb, fl, &res, false);
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
2007-08-31 13:35:46 +08:00
|
|
|
switch (err) {
|
2005-04-17 06:20:36 +08:00
|
|
|
case TC_ACT_STOLEN:
|
|
|
|
case TC_ACT_QUEUED:
|
2017-06-06 20:12:02 +08:00
|
|
|
case TC_ACT_TRAP:
|
2008-08-05 13:31:03 +08:00
|
|
|
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
2017-10-20 05:28:24 +08:00
|
|
|
/* fall through */
|
2005-04-17 06:20:36 +08:00
|
|
|
case TC_ACT_SHOT:
|
|
|
|
return NULL;
|
2007-04-21 08:09:22 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2014-09-13 11:05:27 +08:00
|
|
|
if (!fl || err < 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (TC_H_MAJ(band))
|
|
|
|
band = 0;
|
2011-01-20 03:26:56 +08:00
|
|
|
return q->queues[q->prio2band[band & TC_PRIO_MAX]];
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
band = res.classid;
|
|
|
|
}
|
|
|
|
band = TC_H_MIN(band) - 1;
|
2007-05-14 17:57:19 +08:00
|
|
|
if (band >= q->bands)
|
2008-07-15 17:52:19 +08:00
|
|
|
return q->queues[q->prio2band[0]];
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return q->queues[band];
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2016-06-22 14:16:49 +08:00
|
|
|
prio_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2019-01-10 00:09:42 +08:00
|
|
|
unsigned int len = qdisc_pkt_len(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct Qdisc *qdisc;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
qdisc = prio_classify(skb, sch, &ret);
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
if (qdisc == NULL) {
|
2006-01-09 14:35:55 +08:00
|
|
|
|
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);
|
2017-09-04 14:21:12 +08:00
|
|
|
__qdisc_drop(skb, to_free);
|
2005-04-17 06:20:36 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-06-22 14:16:49 +08:00
|
|
|
ret = qdisc_enqueue(skb, qdisc, to_free);
|
2008-07-20 15:08:04 +08:00
|
|
|
if (ret == NET_XMIT_SUCCESS) {
|
2019-01-10 00:09:42 +08:00
|
|
|
sch->qstats.backlog += len;
|
2005-04-17 06:20:36 +08:00
|
|
|
sch->q.qlen++;
|
|
|
|
return 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);
|
2007-02-09 22:25:16 +08:00
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-10-31 15:44:18 +08:00
|
|
|
static struct sk_buff *prio_peek(struct Qdisc *sch)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
int prio;
|
|
|
|
|
|
|
|
for (prio = 0; prio < q->bands; prio++) {
|
|
|
|
struct Qdisc *qdisc = q->queues[prio];
|
|
|
|
struct sk_buff *skb = qdisc->ops->peek(qdisc);
|
|
|
|
if (skb)
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-01-20 03:26:56 +08:00
|
|
|
static struct sk_buff *prio_dequeue(struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
int prio;
|
|
|
|
|
|
|
|
for (prio = 0; prio < q->bands; prio++) {
|
2008-07-15 17:52:19 +08:00
|
|
|
struct Qdisc *qdisc = q->queues[prio];
|
2011-08-09 10:04:43 +08:00
|
|
|
struct sk_buff *skb = qdisc_dequeue_peeked(qdisc);
|
2008-07-15 17:52:19 +08:00
|
|
|
if (skb) {
|
2011-01-21 15:31:33 +08:00
|
|
|
qdisc_bstats_update(sch, skb);
|
2016-06-02 07:15:16 +08:00
|
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
2008-07-15 17:52:19 +08:00
|
|
|
sch->q.qlen--;
|
|
|
|
return skb;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2011-01-20 03:26:56 +08:00
|
|
|
prio_reset(struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int prio;
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
|
2011-01-20 03:26:56 +08:00
|
|
|
for (prio = 0; prio < q->bands; prio++)
|
2005-04-17 06:20:36 +08:00
|
|
|
qdisc_reset(q->queues[prio]);
|
2016-06-02 07:15:16 +08:00
|
|
|
sch->qstats.backlog = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
sch->q.qlen = 0;
|
|
|
|
}
|
|
|
|
|
2018-02-28 17:45:05 +08:00
|
|
|
static int prio_offload(struct Qdisc *sch, struct tc_prio_qopt *qopt)
|
2018-01-14 19:33:15 +08:00
|
|
|
{
|
|
|
|
struct net_device *dev = qdisc_dev(sch);
|
|
|
|
struct tc_prio_qopt_offload opt = {
|
|
|
|
.handle = sch->handle,
|
|
|
|
.parent = sch->parent,
|
|
|
|
};
|
|
|
|
|
|
|
|
if (!tc_can_offload(dev) || !dev->netdev_ops->ndo_setup_tc)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2018-02-28 17:45:05 +08:00
|
|
|
if (qopt) {
|
2018-01-14 19:33:15 +08:00
|
|
|
opt.command = TC_PRIO_REPLACE;
|
2018-02-28 17:45:05 +08:00
|
|
|
opt.replace_params.bands = qopt->bands;
|
|
|
|
memcpy(&opt.replace_params.priomap, qopt->priomap,
|
2018-01-14 19:33:15 +08:00
|
|
|
TC_PRIO_MAX + 1);
|
|
|
|
opt.replace_params.qstats = &sch->qstats;
|
|
|
|
} else {
|
|
|
|
opt.command = TC_PRIO_DESTROY;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_QDISC_PRIO, &opt);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static void
|
2011-01-20 03:26:56 +08:00
|
|
|
prio_destroy(struct Qdisc *sch)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int prio;
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
|
2017-05-17 17:07:55 +08:00
|
|
|
tcf_block_put(q->block);
|
2018-02-28 17:45:05 +08:00
|
|
|
prio_offload(sch, NULL);
|
2011-01-20 03:26:56 +08:00
|
|
|
for (prio = 0; prio < q->bands; prio++)
|
2018-09-25 00:22:50 +08:00
|
|
|
qdisc_put(q->queues[prio]);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-12-21 01:35:14 +08:00
|
|
|
static int prio_tune(struct Qdisc *sch, struct nlattr *opt,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
2016-06-14 02:33:32 +08:00
|
|
|
struct Qdisc *queues[TCQ_PRIO_BANDS];
|
|
|
|
int oldbands = q->bands, i;
|
2007-06-29 12:04:31 +08:00
|
|
|
struct tc_prio_qopt *qopt;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-15 17:52:19 +08:00
|
|
|
if (nla_len(opt) < sizeof(*qopt))
|
|
|
|
return -EINVAL;
|
|
|
|
qopt = nla_data(opt);
|
2007-06-29 12:04:31 +08:00
|
|
|
|
2008-07-15 17:52:19 +08:00
|
|
|
if (qopt->bands > TCQ_PRIO_BANDS || qopt->bands < 2)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2011-01-20 03:26:56 +08:00
|
|
|
for (i = 0; i <= TC_PRIO_MAX; i++) {
|
2008-07-15 17:52:19 +08:00
|
|
|
if (qopt->priomap[i] >= qopt->bands)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2016-06-14 02:33:32 +08:00
|
|
|
/* Before commit, make sure we can allocate all new qdiscs */
|
|
|
|
for (i = oldbands; i < qopt->bands; i++) {
|
|
|
|
queues[i] = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
|
2017-12-21 01:35:21 +08:00
|
|
|
TC_H_MAKE(sch->handle, i + 1),
|
|
|
|
extack);
|
2016-06-14 02:33:32 +08:00
|
|
|
if (!queues[i]) {
|
|
|
|
while (i > oldbands)
|
2018-09-25 00:22:50 +08:00
|
|
|
qdisc_put(queues[--i]);
|
2016-06-14 02:33:32 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-28 17:45:05 +08:00
|
|
|
prio_offload(sch, qopt);
|
2005-04-17 06:20:36 +08:00
|
|
|
sch_tree_lock(sch);
|
2008-07-15 17:52:19 +08:00
|
|
|
q->bands = qopt->bands;
|
2005-04-17 06:20:36 +08:00
|
|
|
memcpy(q->prio2band, qopt->priomap, TC_PRIO_MAX+1);
|
|
|
|
|
2016-06-14 02:33:32 +08:00
|
|
|
for (i = q->bands; i < oldbands; i++) {
|
2008-11-20 20:11:36 +08:00
|
|
|
struct Qdisc *child = q->queues[i];
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-06-14 02:33:32 +08:00
|
|
|
qdisc_tree_reduce_backlog(child, child->q.qlen,
|
|
|
|
child->qstats.backlog);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2016-06-13 07:21:47 +08:00
|
|
|
|
2017-03-08 23:03:32 +08:00
|
|
|
for (i = oldbands; i < q->bands; i++) {
|
2016-06-14 02:33:32 +08:00
|
|
|
q->queues[i] = queues[i];
|
2017-03-08 23:03:32 +08:00
|
|
|
if (q->queues[i] != &noop_qdisc)
|
|
|
|
qdisc_hash_add(q->queues[i], true);
|
|
|
|
}
|
2016-06-13 07:21:47 +08:00
|
|
|
|
2016-06-14 02:33:32 +08:00
|
|
|
sch_tree_unlock(sch);
|
2018-11-08 09:33:40 +08:00
|
|
|
|
|
|
|
for (i = q->bands; i < oldbands; i++)
|
|
|
|
qdisc_put(q->queues[i]);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-12-21 01:35:13 +08:00
|
|
|
static int prio_init(struct Qdisc *sch, struct nlattr *opt,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2017-05-17 17:07:55 +08:00
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
int err;
|
|
|
|
|
2016-06-14 02:33:32 +08:00
|
|
|
if (!opt)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2017-12-21 01:35:19 +08:00
|
|
|
err = tcf_block_get(&q->block, &q->filter_list, sch, extack);
|
2017-05-17 17:07:55 +08:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-12-21 01:35:14 +08:00
|
|
|
return prio_tune(sch, opt, extack);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2018-01-14 19:33:15 +08:00
|
|
|
static int prio_dump_offload(struct Qdisc *sch)
|
|
|
|
{
|
|
|
|
struct tc_prio_qopt_offload hw_stats = {
|
2018-01-19 08:30:49 +08:00
|
|
|
.command = TC_PRIO_STATS,
|
2018-01-14 19:33:15 +08:00
|
|
|
.handle = sch->handle,
|
|
|
|
.parent = sch->parent,
|
2018-01-19 08:30:49 +08:00
|
|
|
{
|
|
|
|
.stats = {
|
|
|
|
.bstats = &sch->bstats,
|
|
|
|
.qstats = &sch->qstats,
|
|
|
|
},
|
|
|
|
},
|
2018-01-14 19:33:15 +08:00
|
|
|
};
|
|
|
|
|
2018-11-08 09:33:34 +08:00
|
|
|
return qdisc_offload_dump_helper(sch, TC_SETUP_QDISC_PRIO, &hw_stats);
|
2018-01-14 19:33:15 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int prio_dump(struct Qdisc *sch, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
2007-04-20 11:29:13 +08:00
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tc_prio_qopt opt;
|
2018-01-14 19:33:15 +08:00
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
opt.bands = q->bands;
|
2011-01-20 03:26:56 +08:00
|
|
|
memcpy(&opt.priomap, q->prio2band, TC_PRIO_MAX + 1);
|
2007-06-29 12:04:31 +08:00
|
|
|
|
2018-01-14 19:33:15 +08:00
|
|
|
err = prio_dump_offload(sch);
|
|
|
|
if (err)
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
2012-03-29 17:11:39 +08:00
|
|
|
if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
|
|
|
|
goto nla_put_failure;
|
2007-06-29 12:04:31 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return skb->len;
|
|
|
|
|
2008-01-23 14:11:17 +08:00
|
|
|
nla_put_failure:
|
2007-03-26 14:06:12 +08:00
|
|
|
nlmsg_trim(skb, b);
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int prio_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
|
2017-12-21 01:35:17 +08:00
|
|
|
struct Qdisc **old, struct netlink_ext_ack *extack)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
2018-02-28 17:45:06 +08:00
|
|
|
struct tc_prio_qopt_offload graft_offload;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long band = arg - 1;
|
|
|
|
|
|
|
|
if (new == NULL)
|
|
|
|
new = &noop_qdisc;
|
|
|
|
|
2016-02-26 06:55:00 +08:00
|
|
|
*old = qdisc_replace(sch, new, &q->queues[band]);
|
2018-02-28 17:45:06 +08:00
|
|
|
|
|
|
|
graft_offload.handle = sch->handle;
|
|
|
|
graft_offload.parent = sch->parent;
|
|
|
|
graft_offload.graft_params.band = band;
|
|
|
|
graft_offload.graft_params.child_handle = new->handle;
|
|
|
|
graft_offload.command = TC_PRIO_GRAFT;
|
|
|
|
|
2018-11-08 09:33:37 +08:00
|
|
|
qdisc_offload_graft_helper(qdisc_dev(sch), sch, new, *old,
|
|
|
|
TC_SETUP_QDISC_PRIO, &graft_offload,
|
|
|
|
extack);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct Qdisc *
|
|
|
|
prio_leaf(struct Qdisc *sch, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
unsigned long band = arg - 1;
|
|
|
|
|
|
|
|
return q->queues[band];
|
|
|
|
}
|
|
|
|
|
net_sched: remove tc class reference counting
For TC classes, their ->get() and ->put() are always paired, and the
reference counting is completely useless, because:
1) For class modification and dumping paths, we already hold RTNL lock,
so all of these ->get(),->change(),->put() are atomic.
2) For filter bindiing/unbinding, we use other reference counter than
this one, and they should have RTNL lock too.
3) For ->qlen_notify(), it is special because it is called on ->enqueue()
path, but we already hold qdisc tree lock there, and we hold this
tree lock when graft or delete the class too, so it should not be gone
or changed until we release the tree lock.
Therefore, this patch removes ->get() and ->put(), but:
1) Adds a new ->find() to find the pointer to a class by classid, no
refcnt.
2) Move the original class destroy upon the last refcnt into ->delete(),
right after releasing tree lock. This is fine because the class is
already removed from hash when holding the lock.
For those who also use ->put() as ->unbind(), just rename them to reflect
this change.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-25 07:51:29 +08:00
|
|
|
static unsigned long prio_find(struct Qdisc *sch, u32 classid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
unsigned long band = TC_H_MIN(classid);
|
|
|
|
|
|
|
|
if (band - 1 >= q->bands)
|
|
|
|
return 0;
|
|
|
|
return band;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long prio_bind(struct Qdisc *sch, unsigned long parent, u32 classid)
|
|
|
|
{
|
net_sched: remove tc class reference counting
For TC classes, their ->get() and ->put() are always paired, and the
reference counting is completely useless, because:
1) For class modification and dumping paths, we already hold RTNL lock,
so all of these ->get(),->change(),->put() are atomic.
2) For filter bindiing/unbinding, we use other reference counter than
this one, and they should have RTNL lock too.
3) For ->qlen_notify(), it is special because it is called on ->enqueue()
path, but we already hold qdisc tree lock there, and we hold this
tree lock when graft or delete the class too, so it should not be gone
or changed until we release the tree lock.
Therefore, this patch removes ->get() and ->put(), but:
1) Adds a new ->find() to find the pointer to a class by classid, no
refcnt.
2) Move the original class destroy upon the last refcnt into ->delete(),
right after releasing tree lock. This is fine because the class is
already removed from hash when holding the lock.
For those who also use ->put() as ->unbind(), just rename them to reflect
this change.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-25 07:51:29 +08:00
|
|
|
return prio_find(sch, classid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
net_sched: remove tc class reference counting
For TC classes, their ->get() and ->put() are always paired, and the
reference counting is completely useless, because:
1) For class modification and dumping paths, we already hold RTNL lock,
so all of these ->get(),->change(),->put() are atomic.
2) For filter bindiing/unbinding, we use other reference counter than
this one, and they should have RTNL lock too.
3) For ->qlen_notify(), it is special because it is called on ->enqueue()
path, but we already hold qdisc tree lock there, and we hold this
tree lock when graft or delete the class too, so it should not be gone
or changed until we release the tree lock.
Therefore, this patch removes ->get() and ->put(), but:
1) Adds a new ->find() to find the pointer to a class by classid, no
refcnt.
2) Move the original class destroy upon the last refcnt into ->delete(),
right after releasing tree lock. This is fine because the class is
already removed from hash when holding the lock.
For those who also use ->put() as ->unbind(), just rename them to reflect
this change.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-25 07:51:29 +08:00
|
|
|
static void prio_unbind(struct Qdisc *q, unsigned long cl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static int prio_dump_class(struct Qdisc *sch, unsigned long cl, struct sk_buff *skb,
|
|
|
|
struct tcmsg *tcm)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
|
|
|
|
tcm->tcm_handle |= TC_H_MIN(cl);
|
2009-09-04 14:41:17 +08:00
|
|
|
tcm->tcm_info = q->queues[cl-1]->handle;
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-01 04:21:24 +08:00
|
|
|
static int prio_dump_class_stats(struct Qdisc *sch, unsigned long cl,
|
|
|
|
struct gnet_dump *d)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
struct Qdisc *cl_q;
|
|
|
|
|
|
|
|
cl_q = q->queues[cl - 1];
|
2016-06-07 00:37:16 +08:00
|
|
|
if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
|
|
|
|
d, NULL, &cl_q->bstats) < 0 ||
|
2019-03-28 23:53:12 +08:00
|
|
|
qdisc_qstats_copy(d, cl_q) < 0)
|
2007-02-01 04:21:24 +08:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static void prio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
|
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
int prio;
|
|
|
|
|
|
|
|
if (arg->stop)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (prio = 0; prio < q->bands; prio++) {
|
|
|
|
if (arg->count < arg->skip) {
|
|
|
|
arg->count++;
|
|
|
|
continue;
|
|
|
|
}
|
2011-01-20 03:26:56 +08:00
|
|
|
if (arg->fn(sch, prio + 1, arg) < 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
arg->stop = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
arg->count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-21 01:35:16 +08:00
|
|
|
static struct tcf_block *prio_tcf_block(struct Qdisc *sch, unsigned long cl,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct prio_sched_data *q = qdisc_priv(sch);
|
|
|
|
|
|
|
|
if (cl)
|
|
|
|
return NULL;
|
2017-05-17 17:07:55 +08:00
|
|
|
return q->block;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-11-14 17:44:41 +08:00
|
|
|
static const struct Qdisc_class_ops prio_class_ops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.graft = prio_graft,
|
|
|
|
.leaf = prio_leaf,
|
net_sched: remove tc class reference counting
For TC classes, their ->get() and ->put() are always paired, and the
reference counting is completely useless, because:
1) For class modification and dumping paths, we already hold RTNL lock,
so all of these ->get(),->change(),->put() are atomic.
2) For filter bindiing/unbinding, we use other reference counter than
this one, and they should have RTNL lock too.
3) For ->qlen_notify(), it is special because it is called on ->enqueue()
path, but we already hold qdisc tree lock there, and we hold this
tree lock when graft or delete the class too, so it should not be gone
or changed until we release the tree lock.
Therefore, this patch removes ->get() and ->put(), but:
1) Adds a new ->find() to find the pointer to a class by classid, no
refcnt.
2) Move the original class destroy upon the last refcnt into ->delete(),
right after releasing tree lock. This is fine because the class is
already removed from hash when holding the lock.
For those who also use ->put() as ->unbind(), just rename them to reflect
this change.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-25 07:51:29 +08:00
|
|
|
.find = prio_find,
|
2005-04-17 06:20:36 +08:00
|
|
|
.walk = prio_walk,
|
2017-05-17 17:07:55 +08:00
|
|
|
.tcf_block = prio_tcf_block,
|
2005-04-17 06:20:36 +08:00
|
|
|
.bind_tcf = prio_bind,
|
net_sched: remove tc class reference counting
For TC classes, their ->get() and ->put() are always paired, and the
reference counting is completely useless, because:
1) For class modification and dumping paths, we already hold RTNL lock,
so all of these ->get(),->change(),->put() are atomic.
2) For filter bindiing/unbinding, we use other reference counter than
this one, and they should have RTNL lock too.
3) For ->qlen_notify(), it is special because it is called on ->enqueue()
path, but we already hold qdisc tree lock there, and we hold this
tree lock when graft or delete the class too, so it should not be gone
or changed until we release the tree lock.
Therefore, this patch removes ->get() and ->put(), but:
1) Adds a new ->find() to find the pointer to a class by classid, no
refcnt.
2) Move the original class destroy upon the last refcnt into ->delete(),
right after releasing tree lock. This is fine because the class is
already removed from hash when holding the lock.
For those who also use ->put() as ->unbind(), just rename them to reflect
this change.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-25 07:51:29 +08:00
|
|
|
.unbind_tcf = prio_unbind,
|
2005-04-17 06:20:36 +08:00
|
|
|
.dump = prio_dump_class,
|
2007-02-01 04:21:24 +08:00
|
|
|
.dump_stats = prio_dump_class_stats,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2007-11-14 17:44:41 +08:00
|
|
|
static struct Qdisc_ops prio_qdisc_ops __read_mostly = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.next = NULL,
|
|
|
|
.cl_ops = &prio_class_ops,
|
|
|
|
.id = "prio",
|
|
|
|
.priv_size = sizeof(struct prio_sched_data),
|
|
|
|
.enqueue = prio_enqueue,
|
|
|
|
.dequeue = prio_dequeue,
|
2008-10-31 15:44:18 +08:00
|
|
|
.peek = prio_peek,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init = prio_init,
|
|
|
|
.reset = prio_reset,
|
|
|
|
.destroy = prio_destroy,
|
|
|
|
.change = prio_tune,
|
|
|
|
.dump = prio_dump,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init prio_module_init(void)
|
|
|
|
{
|
2008-07-15 17:52:19 +08:00
|
|
|
return register_qdisc(&prio_qdisc_ops);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-02-09 22:25:16 +08:00
|
|
|
static void __exit prio_module_exit(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unregister_qdisc(&prio_qdisc_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(prio_module_init)
|
|
|
|
module_exit(prio_module_exit)
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|