leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/sched: use tc_qdisc_stats_dump() in qdisc

Browse Source 
use tc_qdisc_stats_dump() in qdisc.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Tested-by: Victor Nogueira <victor@mojatatu.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Zhengchao Shao 2022-09-21 10:41:18 +08:00 committed by Jakub Kicinski
parent d7a68e564e
commit e046fa895c
22 changed files with 31 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/sched/sch_atm.c
View File

@ -354,13 +354,9 @@ static void atm_tc_walk(struct Qdisc *sch, struct qdisc_walker *walker)
if (walker->stop)
return;
list_for_each_entry(flow, &p->flows, list) {
if (walker->count >= walker->skip &&
walker->fn(sch, (unsigned long)flow, walker) < 0) {
walker->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)flow, walker))
break;
}
walker->count++;
}
}
static struct tcf_block *atm_tc_tcf_block(struct Qdisc *sch, unsigned long cl,

9
net/sched/sch_cake.c
View File

@ -3061,17 +3061,14 @@ static void cake_walk(struct Qdisc *sch, struct qdisc_walker *arg)
struct cake_tin_data *b = &q->tins[q->tin_order[i]];
for (j = 0; j < CAKE_QUEUES; j++) {
if (list_empty(&b->flows[j].flowchain) ||
arg->count < arg->skip) {
if (list_empty(&b->flows[j].flowchain)) {
arg->count++;
continue;
}
if (arg->fn(sch, i * CAKE_QUEUES + j + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, i * CAKE_QUEUES + j + 1,
arg))
break;
}
arg->count++;
}
}
}

9
net/sched/sch_cbq.c
View File

@ -1676,16 +1676,9 @@ static void cbq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (h = 0; h < q->clhash.hashsize; h++) {
hlist_for_each_entry(cl, &q->clhash.hash[h], common.hnode) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)cl, arg))
return;
}
arg->count++;
}
}
}

8
net/sched/sch_cbs.c
View File

@ -520,13 +520,7 @@ static unsigned long cbs_find(struct Qdisc *sch, u32 classid)
static void cbs_walk(struct Qdisc *sch, struct qdisc_walker *walker)
{
if (!walker->stop) {
if (walker->count >= walker->skip) {
if (walker->fn(sch, 1, walker) < 0) {
walker->stop = 1;
return;
}
}
walker->count++;
tc_qdisc_stats_dump(sch, 1, walker);
}
}

9
net/sched/sch_drr.c
View File

@ -284,16 +284,9 @@ static void drr_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (i = 0; i < q->clhash.hashsize; i++) {
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)cl, arg))
return;
}
arg->count++;
}
}
}

14
net/sched/sch_dsmark.c
View File

@ -176,16 +176,12 @@ static void dsmark_walk(struct Qdisc *sch, struct qdisc_walker *walker)
return;
for (i = 0; i < p->indices; i++) {
if (p->mv[i].mask == 0xff && !p->mv[i].value)
goto ignore;
if (walker->count >= walker->skip) {
if (walker->fn(sch, i + 1, walker) < 0) {
walker->stop = 1;
break;
}
}
ignore:
if (p->mv[i].mask == 0xff && !p->mv[i].value) {
walker->count++;
continue;
}
if (!tc_qdisc_stats_dump(sch, i + 1, walker))
break;
}
}

9
net/sched/sch_ets.c
View File

@ -341,16 +341,9 @@ static void ets_qdisc_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (i = 0; i < q->nbands; i++) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, i + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, i + 1, arg))
break;
}
arg->count++;
}
}
static struct tcf_block *

8
net/sched/sch_fq_codel.c
View File

@ -673,17 +673,13 @@ static void fq_codel_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (i = 0; i < q->flows_cnt; i++) {
if (list_empty(&q->flows[i].flowchain) ||
arg->count < arg->skip) {
if (list_empty(&q->flows[i].flowchain)) {
arg->count++;
continue;
}
if (arg->fn(sch, i + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, i + 1, arg))
break;
}
arg->count++;
}
}
static const struct Qdisc_class_ops fq_codel_class_ops = {

9
net/sched/sch_hfsc.c
View File

@ -1349,16 +1349,9 @@ hfsc_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (i = 0; i < q->clhash.hashsize; i++) {
hlist_for_each_entry(cl, &q->clhash.hash[i],
cl_common.hnode) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)cl, arg))
return;
}
arg->count++;
}
}
}

9
net/sched/sch_htb.c
View File

@ -2119,16 +2119,9 @@ static void htb_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (i = 0; i < q->clhash.hashsize; i++) {
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)cl, arg))
return;
}
arg->count++;
}
}
}

5
net/sched/sch_mq.c
View File

@ -247,12 +247,9 @@ static void mq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
arg->count = arg->skip;
for (ntx = arg->skip; ntx < dev->num_tx_queues; ntx++) {
if (arg->fn(sch, ntx + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, ntx + 1, arg))
break;
}
arg->count++;
}
}
static const struct Qdisc_class_ops mq_class_ops = {

5
net/sched/sch_mqprio.c
View File

@ -558,12 +558,9 @@ static void mqprio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
/* Walk hierarchy with a virtual class per tc */
arg->count = arg->skip;
for (ntx = arg->skip; ntx < netdev_get_num_tc(dev); ntx++) {
if (arg->fn(sch, ntx + TC_H_MIN_PRIORITY, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, ntx + TC_H_MIN_PRIORITY, arg))
return;
}
arg->count++;
}
/* Pad the values and skip over unused traffic classes */
if (ntx < TC_MAX_QUEUE) {

9
net/sched/sch_multiq.c
View File

@ -353,16 +353,9 @@ static void multiq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (band = 0; band < q->bands; band++) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, band + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, band + 1, arg))
break;
}
arg->count++;
}
}
static struct tcf_block *multiq_tcf_block(struct Qdisc *sch, unsigned long cl,

6
net/sched/sch_netem.c
View File

@ -1251,13 +1251,9 @@ static unsigned long netem_find(struct Qdisc *sch, u32 classid)
static void netem_walk(struct Qdisc *sch, struct qdisc_walker *walker)
{
if (!walker->stop) {
if (walker->count >= walker->skip)
if (walker->fn(sch, 1, walker) < 0) {
walker->stop = 1;
if (!tc_qdisc_stats_dump(sch, 1, walker))
return;
}
walker->count++;
}
}
static const struct Qdisc_class_ops netem_class_ops = {

9
net/sched/sch_prio.c
View File

@ -376,16 +376,9 @@ static void prio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (prio = 0; prio < q->bands; prio++) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, prio + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, prio + 1, arg))
break;
}
arg->count++;
}
}
static struct tcf_block *prio_tcf_block(struct Qdisc *sch, unsigned long cl,

9
net/sched/sch_qfq.c
View File

@ -659,16 +659,9 @@ static void qfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
for (i = 0; i < q->clhash.hashsize; i++) {
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, (unsigned long)cl, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, (unsigned long)cl, arg))
return;
}
arg->count++;
}
}
}

7
net/sched/sch_red.c
View File

@ -516,12 +516,7 @@ static unsigned long red_find(struct Qdisc *sch, u32 classid)
static void red_walk(struct Qdisc *sch, struct qdisc_walker *walker)
{
if (!walker->stop) {
if (walker->count >= walker->skip)
if (walker->fn(sch, 1, walker) < 0) {
walker->stop = 1;
return;
}
walker->count++;
tc_qdisc_stats_dump(sch, 1, walker);
}
}

7
net/sched/sch_sfb.c
View File

@ -659,12 +659,7 @@ static int sfb_delete(struct Qdisc *sch, unsigned long cl,
static void sfb_walk(struct Qdisc *sch, struct qdisc_walker *walker)
{
if (!walker->stop) {
if (walker->count >= walker->skip)
if (walker->fn(sch, 1, walker) < 0) {
walker->stop = 1;
return;
}
walker->count++;
tc_qdisc_stats_dump(sch, 1, walker);
}
}

8
net/sched/sch_sfq.c
View File

@ -888,17 +888,13 @@ static void sfq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (i = 0; i < q->divisor; i++) {
if (q->ht[i] == SFQ_EMPTY_SLOT ||
arg->count < arg->skip) {
if (q->ht[i] == SFQ_EMPTY_SLOT) {
arg->count++;
continue;
}
if (arg->fn(sch, i + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, i + 1, arg))
break;
}
arg->count++;
}
}
static const struct Qdisc_class_ops sfq_class_ops = {

9
net/sched/sch_skbprio.c
View File

@ -265,16 +265,9 @@ static void skbprio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
return;
for (i = 0; i < SKBPRIO_MAX_PRIORITY; i++) {
if (arg->count < arg->skip) {
arg->count++;
continue;
}
if (arg->fn(sch, i + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, i + 1, arg))
break;
}
arg->count++;
}
}
static const struct Qdisc_class_ops skbprio_class_ops = {

5
net/sched/sch_taprio.c
View File

@ -1953,12 +1953,9 @@ static void taprio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
arg->count = arg->skip;
for (ntx = arg->skip; ntx < dev->num_tx_queues; ntx++) {
if (arg->fn(sch, ntx + 1, arg) < 0) {
arg->stop = 1;
if (!tc_qdisc_stats_dump(sch, ntx + 1, arg))
break;
}
arg->count++;
}
}
static struct netdev_queue *taprio_select_queue(struct Qdisc *sch,

7
net/sched/sch_tbf.c
View File

@ -580,12 +580,7 @@ static unsigned long tbf_find(struct Qdisc *sch, u32 classid)
static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker)
{
if (!walker->stop) {
if (walker->count >= walker->skip)
if (walker->fn(sch, 1, walker) < 0) {
walker->stop = 1;
return;
}
walker->count++;
tc_qdisc_stats_dump(sch, 1, walker);
}
}