* [PATCH net-next 01/18] net/sched: sch_api: add helper for tc qdisc walker stats dump
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 02/18] net/sched: use tc_qdisc_stats_dump() in qdisc Zhengchao Shao
` (16 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
The walk implementation of most qdisc class modules is basically the
same. That is, the values of count and skip are checked first. If
count is greater than or equal to skip, the registered fn function is
executed. Otherwise, increase the value of count. So we can reconstruct
them.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
include/net/pkt_sched.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 29f65632ebc5..243e8b0cb7ea 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -222,4 +222,17 @@ static inline struct tc_skb_cb *tc_skb_cb(const struct sk_buff *skb)
return cb;
}
+static inline bool tc_qdisc_stats_dump(struct Qdisc *sch,
+ struct qdisc_walker *arg,
+ unsigned long cl)
+{
+ if (arg->count >= arg->skip && arg->fn(sch, cl, arg) < 0) {
+ arg->stop = 1;
+ return false;
+ }
+
+ arg->count++;
+ return true;
+}
+
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 02/18] net/sched: use tc_qdisc_stats_dump() in qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 01/18] net/sched: sch_api: add helper for tc qdisc walker stats dump Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc Zhengchao Shao
` (15 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
use tc_qdisc_stats_dump() in qdisc.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
net/sched/sch_atm.c | 6 +-----
net/sched/sch_cake.c | 9 +++------
net/sched/sch_cbq.c | 9 +--------
net/sched/sch_cbs.c | 8 +-------
net/sched/sch_drr.c | 9 +--------
net/sched/sch_dsmark.c | 14 +++++---------
net/sched/sch_ets.c | 9 +--------
net/sched/sch_fq_codel.c | 8 ++------
net/sched/sch_hfsc.c | 9 +--------
net/sched/sch_htb.c | 9 +--------
net/sched/sch_mq.c | 5 +----
net/sched/sch_mqprio.c | 5 +----
net/sched/sch_multiq.c | 9 +--------
net/sched/sch_netem.c | 8 ++------
net/sched/sch_prio.c | 9 +--------
net/sched/sch_qfq.c | 9 +--------
net/sched/sch_red.c | 7 +------
net/sched/sch_sfb.c | 7 +------
net/sched/sch_sfq.c | 8 ++------
net/sched/sch_skbprio.c | 9 +--------
net/sched/sch_taprio.c | 5 +----
net/sched/sch_tbf.c | 7 +------
22 files changed, 31 insertions(+), 147 deletions(-)
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 816fd0d7ba38..b6c45ca60e78 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -354,12 +354,8 @@ 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, walker, (unsigned long)flow))
break;
- }
- walker->count++;
}
}
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 36acc95d611e..cab9ff213d92 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -3061,16 +3061,13 @@ 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, arg,
+ i * CAKE_QUEUES + j + 1))
break;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index ba99ce05cd52..4897329f9412 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1676,15 +1676,8 @@ 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, arg, (unsigned long)cl))
return;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index 459cc240eda9..270d517e492d 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -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, walker, 1);
}
}
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 4e5b1cf11b85..d75ea3e35fcc 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -284,15 +284,8 @@ 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, arg, (unsigned long)cl))
return;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 7da6dc38a382..5cf944ab20b6 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -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;
- }
+ if (p->mv[i].mask == 0xff && !p->mv[i].value) {
+ walker->count++;
+ continue;
}
-ignore:
- walker->count++;
+ if (!tc_qdisc_stats_dump(sch, walker, i + 1))
+ break;
}
}
diff --git a/net/sched/sch_ets.c b/net/sched/sch_ets.c
index a3aea22ef09d..7e3b16c342d2 100644
--- a/net/sched/sch_ets.c
+++ b/net/sched/sch_ets.c
@@ -341,15 +341,8 @@ 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, arg, i + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index eeea8c6d54e2..59a60ce5b7ef 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -673,16 +673,12 @@ 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, arg, i + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index c8bef923c79c..815599f94ad9 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1349,15 +1349,8 @@ 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, arg, (unsigned long)cl))
return;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 78d0c7549c74..e9fee0b5706f 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -2119,15 +2119,8 @@ 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, arg, (unsigned long)cl))
return;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index 83d2e54bf303..c544e9d8e79e 100644
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
@@ -247,11 +247,8 @@ 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, arg, ntx + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index b29f3453c6ea..55b965dbf3bc 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -558,11 +558,8 @@ 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, arg, ntx + TC_H_MIN_PRIORITY))
return;
- }
- arg->count++;
}
/* Pad the values and skip over unused traffic classes */
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index f28050c7f12d..c8a649a24696 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -353,15 +353,8 @@ 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, arg, band + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index b70ac04110dd..5a7f41a61fe2 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -1251,12 +1251,8 @@ 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;
- return;
- }
- walker->count++;
+ if (!tc_qdisc_stats_dump(sch, walker, 1))
+ return;
}
}
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 298794c04836..6bfabc4ba4b5 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -376,15 +376,8 @@ 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, arg, prio + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 13246a9dc5c1..35bb772abbee 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -659,15 +659,8 @@ 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, arg, (unsigned long)cl))
return;
- }
- arg->count++;
}
}
}
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 4952406f70b9..99c30542823c 100644
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -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, walker, 1);
}
}
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index 1be8d04d69dc..001927b31eab 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -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, walker, 1);
}
}
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index f8e569f79f13..a82d844b02d0 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -888,16 +888,12 @@ 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, arg, i + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_skbprio.c b/net/sched/sch_skbprio.c
index df72fb83d9c7..3b2cdd0fa66a 100644
--- a/net/sched/sch_skbprio.c
+++ b/net/sched/sch_skbprio.c
@@ -265,15 +265,8 @@ 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, arg, i + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index db88a692ef81..d98d6a8b271a 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2000,11 +2000,8 @@ 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, arg, ntx + 1))
break;
- }
- arg->count++;
}
}
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index e031c1a41ea6..e852db4079c4 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -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, walker, 1);
}
}
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 01/18] net/sched: sch_api: add helper for tc qdisc walker stats dump Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 02/18] net/sched: use tc_qdisc_stats_dump() in qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 20:32 ` Victor Nogueira
2022-09-16 3:05 ` [PATCH net-next 04/18] selftests/tc-testings: add selftests for cbq qdisc Zhengchao Shao
` (14 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 1212: Create CAKE with default setting
Test 3241: Create CAKE with bandwidth limit
Test c940: Create CAKE with autorate-ingress flag
Test 2310: Create CAKE with rtt time
Test 2385: Create CAKE with besteffort flag
Test a032: Create CAKE with diffserv8 flag
Test 2349: Create CAKE with diffserv4 flag
Test 8472: Create CAKE with flowblind flag
Test 2341: Create CAKE with dsthost and nat flag
Test 5134: Create CAKE with wash flag
Test 2302: Create CAKE with flowblind and no-split-gso flag
Test 0768: Create CAKE with dual-srchost and ack-filter flag
Test 0238: Create CAKE with dual-dsthost and ack-filter-aggressive flag
Test 6573: Create CAKE with memlimit and ptm flag
Test 2436: Create CAKE with fwmark and atm flag
Test 3984: Create CAKE with overhead and mpu
Test 2342: Create CAKE with conservative and ingress flag
Test 2313: Change CAKE with mpu
Test 4365: Show CAKE class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/cake.json | 488 ++++++++++++++++++
1 file changed, 488 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
new file mode 100644
index 000000000000..11ca18bab721
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
@@ -0,0 +1,488 @@
+[
+ {
+ "id": "1212",
+ "name": "Create CAKE with default setting",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3241",
+ "name": "Create CAKE with bandwidth limit",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake bandwidth 1000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth 1Kbit diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "c940",
+ "name": "Create CAKE with autorate-ingress flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake autorate-ingress",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited autorate-ingress diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2310",
+ "name": "Create CAKE with rtt time",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake rtt 200",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 200us raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2385",
+ "name": "Create CAKE with besteffort flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake besteffort",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited besteffort triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a032",
+ "name": "Create CAKE with diffserv8 flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv8",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv8 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2349",
+ "name": "Create CAKE with diffserv4 flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv4",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv4 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "8472",
+ "name": "Create CAKE with flowblind flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2341",
+ "name": "Create CAKE with dsthost and nat flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dsthost nat",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dsthost nat nowash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5134",
+ "name": "Create CAKE with wash flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake hosts wash",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 hosts nonat wash no-ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2302",
+ "name": "Create CAKE with flowblind and no-split-gso flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind no-split-gso",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter no-split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0768",
+ "name": "Create CAKE with dual-srchost and ack-filter flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-srchost ack-filter",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-srchost nonat nowash ack-filter split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0238",
+ "name": "Create CAKE with dual-dsthost and ack-filter-aggressive flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-dsthost ack-filter-aggressive",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-dsthost nonat nowash ack-filter-aggressive split-gso rtt 100ms raw overhead",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "6573",
+ "name": "Create CAKE with memlimit and ptm flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake memlimit 10000 ptm",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw ptm overhead 0 memlimit 10000b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2436",
+ "name": "Create CAKE with fwmark and atm flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake fwmark 8 atm",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw atm overhead 0 fwmark 0x8",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3984",
+ "name": "Create CAKE with overhead and mpu",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 256",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2342",
+ "name": "Create CAKE with conservative and ingress flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2342",
+ "name": "Delete CAKE with conservative and ingress flag",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2342",
+ "name": "Replace CAKE with mpu",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
+ ],
+ "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root cake mpu 128",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2313",
+ "name": "Change CAKE with mpu",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
+ ],
+ "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root cake mpu 128",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4365",
+ "name": "Show CAKE class",
+ "category": [
+ "qdisc",
+ "cake"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class cake",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc
2022-09-16 3:05 ` [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc Zhengchao Shao
@ 2022-09-16 20:32 ` Victor Nogueira
2022-09-17 1:48 ` shaozhengchao
0 siblings, 1 reply; 25+ messages in thread
From: Victor Nogueira @ 2022-09-16 20:32 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
<shaozhengchao@huawei.com> wrote:
>
> Test 1212: Create CAKE with default setting
> Test 3241: Create CAKE with bandwidth limit
> Test c940: Create CAKE with autorate-ingress flag
> Test 2310: Create CAKE with rtt time
> Test 2385: Create CAKE with besteffort flag
> Test a032: Create CAKE with diffserv8 flag
> Test 2349: Create CAKE with diffserv4 flag
> Test 8472: Create CAKE with flowblind flag
> Test 2341: Create CAKE with dsthost and nat flag
> Test 5134: Create CAKE with wash flag
> Test 2302: Create CAKE with flowblind and no-split-gso flag
> Test 0768: Create CAKE with dual-srchost and ack-filter flag
> Test 0238: Create CAKE with dual-dsthost and ack-filter-aggressive flag
> Test 6573: Create CAKE with memlimit and ptm flag
> Test 2436: Create CAKE with fwmark and atm flag
> Test 3984: Create CAKE with overhead and mpu
> Test 2342: Create CAKE with conservative and ingress flag
> Test 2313: Change CAKE with mpu
> Test 4365: Show CAKE class
>
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> .../tc-testing/tc-tests/qdiscs/cake.json | 488 ++++++++++++++++++
> 1 file changed, 488 insertions(+)
> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
>
> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
> new file mode 100644
> index 000000000000..11ca18bab721
> --- /dev/null
> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
> @@ -0,0 +1,488 @@
> +[
> + {
> + "id": "1212",
> + "name": "Create CAKE with default setting",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3241",
> + "name": "Create CAKE with bandwidth limit",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake bandwidth 1000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth 1Kbit diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "c940",
> + "name": "Create CAKE with autorate-ingress flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake autorate-ingress",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited autorate-ingress diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2310",
> + "name": "Create CAKE with rtt time",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake rtt 200",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 200us raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2385",
> + "name": "Create CAKE with besteffort flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake besteffort",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited besteffort triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "a032",
> + "name": "Create CAKE with diffserv8 flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv8",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv8 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2349",
> + "name": "Create CAKE with diffserv4 flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv4",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv4 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "8472",
> + "name": "Create CAKE with flowblind flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2341",
> + "name": "Create CAKE with dsthost and nat flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dsthost nat",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dsthost nat nowash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "5134",
> + "name": "Create CAKE with wash flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake hosts wash",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 hosts nonat wash no-ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2302",
> + "name": "Create CAKE with flowblind and no-split-gso flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind no-split-gso",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter no-split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0768",
> + "name": "Create CAKE with dual-srchost and ack-filter flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-srchost ack-filter",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-srchost nonat nowash ack-filter split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0238",
> + "name": "Create CAKE with dual-dsthost and ack-filter-aggressive flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-dsthost ack-filter-aggressive",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-dsthost nonat nowash ack-filter-aggressive split-gso rtt 100ms raw overhead",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "6573",
> + "name": "Create CAKE with memlimit and ptm flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake memlimit 10000 ptm",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw ptm overhead 0 memlimit 10000b",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2436",
> + "name": "Create CAKE with fwmark and atm flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake fwmark 8 atm",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw atm overhead 0 fwmark 0x8",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3984",
> + "name": "Create CAKE with overhead and mpu",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 256",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2342",
> + "name": "Create CAKE with conservative and ingress flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2342",
Be careful, you are using ID 2342 for 3 test cases in this file.
Each test case must have a unique ID.
> + "name": "Delete CAKE with conservative and ingress flag",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
> + "matchCount": "0",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2342",
> + "name": "Replace CAKE with mpu",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
> + ],
> + "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root cake mpu 128",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2313",
> + "name": "Change CAKE with mpu",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
> + ],
> + "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root cake mpu 128",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "4365",
> + "name": "Show CAKE class",
> + "category": [
> + "qdisc",
> + "cake"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
> + "expExitCode": "0",
> + "verifyCmd": "$TC class show dev $DUMMY",
> + "matchPattern": "class cake",
> + "matchCount": "0",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + }
> +]
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc
2022-09-16 20:32 ` Victor Nogueira
@ 2022-09-17 1:48 ` shaozhengchao
0 siblings, 0 replies; 25+ messages in thread
From: shaozhengchao @ 2022-09-17 1:48 UTC (permalink / raw)
To: Victor Nogueira
Cc: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On 2022/9/17 4:32, Victor Nogueira wrote:
> On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
> <shaozhengchao@huawei.com> wrote:
>>
>> Test 1212: Create CAKE with default setting
>> Test 3241: Create CAKE with bandwidth limit
>> Test c940: Create CAKE with autorate-ingress flag
>> Test 2310: Create CAKE with rtt time
>> Test 2385: Create CAKE with besteffort flag
>> Test a032: Create CAKE with diffserv8 flag
>> Test 2349: Create CAKE with diffserv4 flag
>> Test 8472: Create CAKE with flowblind flag
>> Test 2341: Create CAKE with dsthost and nat flag
>> Test 5134: Create CAKE with wash flag
>> Test 2302: Create CAKE with flowblind and no-split-gso flag
>> Test 0768: Create CAKE with dual-srchost and ack-filter flag
>> Test 0238: Create CAKE with dual-dsthost and ack-filter-aggressive flag
>> Test 6573: Create CAKE with memlimit and ptm flag
>> Test 2436: Create CAKE with fwmark and atm flag
>> Test 3984: Create CAKE with overhead and mpu
>> Test 2342: Create CAKE with conservative and ingress flag
>> Test 2313: Change CAKE with mpu
>> Test 4365: Show CAKE class
>>
>> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>> ---
>> .../tc-testing/tc-tests/qdiscs/cake.json | 488 ++++++++++++++++++
>> 1 file changed, 488 insertions(+)
>> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
>>
>> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
>> new file mode 100644
>> index 000000000000..11ca18bab721
>> --- /dev/null
>> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
>> @@ -0,0 +1,488 @@
>> +[
>> + {
>> + "id": "1212",
>> + "name": "Create CAKE with default setting",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "3241",
>> + "name": "Create CAKE with bandwidth limit",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake bandwidth 1000",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth 1Kbit diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "c940",
>> + "name": "Create CAKE with autorate-ingress flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake autorate-ingress",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited autorate-ingress diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2310",
>> + "name": "Create CAKE with rtt time",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake rtt 200",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 200us raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2385",
>> + "name": "Create CAKE with besteffort flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake besteffort",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited besteffort triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "a032",
>> + "name": "Create CAKE with diffserv8 flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv8",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv8 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2349",
>> + "name": "Create CAKE with diffserv4 flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake diffserv4",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv4 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "8472",
>> + "name": "Create CAKE with flowblind flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2341",
>> + "name": "Create CAKE with dsthost and nat flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dsthost nat",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dsthost nat nowash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "5134",
>> + "name": "Create CAKE with wash flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake hosts wash",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 hosts nonat wash no-ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2302",
>> + "name": "Create CAKE with flowblind and no-split-gso flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake flowblind no-split-gso",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 flowblind nonat nowash no-ack-filter no-split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "0768",
>> + "name": "Create CAKE with dual-srchost and ack-filter flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-srchost ack-filter",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-srchost nonat nowash ack-filter split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "0238",
>> + "name": "Create CAKE with dual-dsthost and ack-filter-aggressive flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake dual-dsthost ack-filter-aggressive",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 dual-dsthost nonat nowash ack-filter-aggressive split-gso rtt 100ms raw overhead",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "6573",
>> + "name": "Create CAKE with memlimit and ptm flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake memlimit 10000 ptm",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw ptm overhead 0 memlimit 10000b",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2436",
>> + "name": "Create CAKE with fwmark and atm flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake fwmark 8 atm",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms raw atm overhead 0 fwmark 0x8",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "3984",
>> + "name": "Create CAKE with overhead and mpu",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 256",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2342",
>> + "name": "Create CAKE with conservative and ingress flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2342",
>
> Be careful, you are using ID 2342 for 3 test cases in this file.
> Each test case must have a unique ID.
>
>
>
Hi Victor:
Thank you for your review. My mistake. I will check more
carefully, and test again. Then send V2.
Zhengchao Shao
>> + "name": "Delete CAKE with conservative and ingress flag",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true",
>> + "$TC qdisc add dev $DUMMY handle 1: root cake conservative ingress"
>> + ],
>> + "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash ingress no-ack-filter split-gso rtt 100ms atm overhead 48",
>> + "matchCount": "0",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2342",
>> + "name": "Replace CAKE with mpu",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true",
>> + "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
>> + ],
>> + "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root cake mpu 128",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "2313",
>> + "name": "Change CAKE with mpu",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true",
>> + "$TC qdisc add dev $DUMMY handle 1: root cake overhead 128 mpu 256"
>> + ],
>> + "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root cake mpu 128",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC qdisc show dev $DUMMY",
>> + "matchPattern": "qdisc cake 1: root refcnt [0-9]+ bandwidth unlimited diffserv3 triple-isolate nonat nowash no-ack-filter split-gso rtt 100ms noatm overhead 128 mpu 128",
>> + "matchCount": "1",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + },
>> + {
>> + "id": "4365",
>> + "name": "Show CAKE class",
>> + "category": [
>> + "qdisc",
>> + "cake"
>> + ],
>> + "plugins": {
>> + "requires": "nsPlugin"
>> + },
>> + "setup": [
>> + "$IP link add dev $DUMMY type dummy || /bin/true"
>> + ],
>> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cake",
>> + "expExitCode": "0",
>> + "verifyCmd": "$TC class show dev $DUMMY",
>> + "matchPattern": "class cake",
>> + "matchCount": "0",
>> + "teardown": [
>> + "$TC qdisc del dev $DUMMY handle 1: root",
>> + "$IP link del dev $DUMMY type dummy"
>> + ]
>> + }
>> +]
>> --
>> 2.17.1
>>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH net-next 04/18] selftests/tc-testings: add selftests for cbq qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (2 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 03/18] selftests/tc-testings: add selftests for cake qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 05/18] selftests/tc-testings: add selftests for cbs qdisc Zhengchao Shao
` (13 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 3460: Create CBQ with default setting
Test 0592: Create CBQ with mpu
Test 4684: Create CBQ with valid cell num
Test 4345: Create CBQ with invalid cell num
Test 4525: Create CBQ with valid ewma
Test 6784: Create CBQ with invalid ewma
Test 5468: Delete CBQ with handle
Test 492a: Show CBQ class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/cbq.json | 184 ++++++++++++++++++
1 file changed, 184 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json
new file mode 100644
index 000000000000..1ab21c83a122
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json
@@ -0,0 +1,184 @@
+[
+ {
+ "id": "3460",
+ "name": "Create CBQ with default setting",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0592",
+ "name": "Create CBQ with mpu",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000 mpu 1000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4684",
+ "name": "Create CBQ with valid cell num",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000 cell 128",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4345",
+ "name": "Create CBQ with invalid cell num",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000 cell 100",
+ "expExitCode": "1",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4525",
+ "name": "Create CBQ with valid ewma",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000 ewma 16",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "6784",
+ "name": "Create CBQ with invalid ewma",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000 ewma 128",
+ "expExitCode": "1",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5468",
+ "name": "Delete CBQ with handle",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbq 1: root refcnt [0-9]+ rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "492a",
+ "name": "Show CBQ class",
+ "category": [
+ "qdisc",
+ "cbq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbq bandwidth 10000 avpkt 9000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class cbq 1: root rate 10Kbit \\(bounded,isolated\\) prio no-transmit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 05/18] selftests/tc-testings: add selftests for cbs qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (3 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 04/18] selftests/tc-testings: add selftests for cbq qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 20:36 ` Victor Nogueira
2022-09-16 3:05 ` [PATCH net-next 06/18] selftests/tc-testings: add selftests for drr qdisc Zhengchao Shao
` (12 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 1820: Create CBS with default setting
Test 1532: Create CBS with hicredit setting
Test 2078: Create CBS with locredit setting
Test 0482: Create CBS with sendslope setting
Test e8f3: Create CBS with multiple setting
Test 23c9: Replace CBS with sendslope setting
Test a07a: Change CBS with idleslope setting
Test 43b3: Delete CBS with handle
Test 9472: Show CBS class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/cbs.json | 234 ++++++++++++++++++
1 file changed, 234 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
new file mode 100644
index 000000000000..06618d2c3700
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
@@ -0,0 +1,234 @@
+[
+ {
+ "id": "1820",
+ "name": "Create CBS with default setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "1532",
+ "name": "Create CBS with hicredit setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs hicredit 64",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 64 locredit 0 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2078",
+ "name": "Create CBS with locredit setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs locredit 10",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 10 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0482",
+ "name": "Create CBS with sendslope setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs sendslope 888",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 888 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0482",
+ "name": "Create CBS with idleslope setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 666 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "e8f3",
+ "name": "Create CBS with multiple setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs hicredit 10 locredit 75 sendslope 2 idleslope 666",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 10 locredit 75 sendslope 2 idleslope 666 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "23c9",
+ "name": "Replace CBS with sendslope setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
+ ],
+ "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root cbs sendslope 10",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 10 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a07a",
+ "name": "Change CBS with idleslope setting",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
+ ],
+ "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root cbs idleslope 1",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 1 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "43b3",
+ "name": "Delete CBS with handle",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 1 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9472",
+ "name": "Show CBS class",
+ "category": [
+ "qdisc",
+ "cbs"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class cbs 1:[0-9]+ parent 1:",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH net-next 05/18] selftests/tc-testings: add selftests for cbs qdisc
2022-09-16 3:05 ` [PATCH net-next 05/18] selftests/tc-testings: add selftests for cbs qdisc Zhengchao Shao
@ 2022-09-16 20:36 ` Victor Nogueira
0 siblings, 0 replies; 25+ messages in thread
From: Victor Nogueira @ 2022-09-16 20:36 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
<shaozhengchao@huawei.com> wrote:
>
> Test 1820: Create CBS with default setting
> Test 1532: Create CBS with hicredit setting
> Test 2078: Create CBS with locredit setting
> Test 0482: Create CBS with sendslope setting
> Test e8f3: Create CBS with multiple setting
> Test 23c9: Replace CBS with sendslope setting
> Test a07a: Change CBS with idleslope setting
> Test 43b3: Delete CBS with handle
> Test 9472: Show CBS class
>
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> .../tc-testing/tc-tests/qdiscs/cbs.json | 234 ++++++++++++++++++
> 1 file changed, 234 insertions(+)
> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
>
> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
> new file mode 100644
> index 000000000000..06618d2c3700
> --- /dev/null
> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
> @@ -0,0 +1,234 @@
> +[
> + {
> + "id": "1820",
> + "name": "Create CBS with default setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "1532",
> + "name": "Create CBS with hicredit setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs hicredit 64",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 64 locredit 0 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "2078",
> + "name": "Create CBS with locredit setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs locredit 10",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 10 sendslope 0 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0482",
> + "name": "Create CBS with sendslope setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs sendslope 888",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 888 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0482",
Be careful, you are using ID 0482 in the previous test case.
> + "name": "Create CBS with idleslope setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 666 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "e8f3",
> + "name": "Create CBS with multiple setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs hicredit 10 locredit 75 sendslope 2 idleslope 666",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 10 locredit 75 sendslope 2 idleslope 666 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "23c9",
> + "name": "Replace CBS with sendslope setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
> + ],
> + "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root cbs sendslope 10",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 10 idleslope 0 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "a07a",
> + "name": "Change CBS with idleslope setting",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
> + ],
> + "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root cbs idleslope 1",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 1 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "43b3",
> + "name": "Delete CBS with handle",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root cbs idleslope 666"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc cbs 1: root refcnt [0-9]+ hicredit 0 locredit 0 sendslope 0 idleslope 1 offload 0.*qdisc pfifo 0: parent 1: limit 1000p",
> + "matchCount": "0",
> + "teardown": [
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "9472",
> + "name": "Show CBS class",
> + "category": [
> + "qdisc",
> + "cbs"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root cbs",
> + "expExitCode": "0",
> + "verifyCmd": "$TC class show dev $DUMMY",
> + "matchPattern": "class cbs 1:[0-9]+ parent 1:",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + }
> +]
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH net-next 06/18] selftests/tc-testings: add selftests for drr qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (4 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 05/18] selftests/tc-testings: add selftests for cbs qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 07/18] selftests/tc-testings: add selftests for dsmark qdisc Zhengchao Shao
` (11 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 0385: Create DRR with default setting
Test 2375: Delete DRR with handle
Test 3092: Show DRR class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/drr.json | 71 +++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json
new file mode 100644
index 000000000000..486a425b3c1c
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json
@@ -0,0 +1,71 @@
+[
+ {
+ "id": "0385",
+ "name": "Create DRR with default setting",
+ "category": [
+ "qdisc",
+ "drr"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root drr",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc drr 1: root refcnt [0-9]+",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "2375",
+ "name": "Delete DRR with handle",
+ "category": [
+ "qdisc",
+ "drr"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root drr"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc drr 1: root refcnt [0-9]+",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3092",
+ "name": "Show DRR class",
+ "category": [
+ "qdisc",
+ "drr"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root drr",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class drr 1:",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 07/18] selftests/tc-testings: add selftests for dsmark qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (5 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 06/18] selftests/tc-testings: add selftests for drr qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 08/18] selftests/tc-testings: add selftests for fq_codel qdisc Zhengchao Shao
` (10 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 6345: Create DSMARK with default setting
Test 3462: Create DSMARK with default_index setting
Test ca95: Create DSMARK with set_tc_index flag
Test a950: Create DSMARK with multiple setting
Test 4092: Delete DSMARK with handle
Test 5930: Show DSMARK class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/dsmark.json | 140 ++++++++++++++++++
1 file changed, 140 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json
new file mode 100644
index 000000000000..c030795f9c37
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json
@@ -0,0 +1,140 @@
+[
+ {
+ "id": "6345",
+ "name": "Create DSMARK with default setting",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc dsmark 1: root refcnt [0-9]+ indices 0x0400",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3462",
+ "name": "Create DSMARK with default_index setting",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024 default_index 512",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc dsmark 1: root refcnt [0-9]+ indices 0x0400 default_index 0x0200",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "ca95",
+ "name": "Create DSMARK with set_tc_index flag",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024 set_tc_index",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc dsmark 1: root refcnt [0-9]+ indices 0x0400 set_tc_index",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a950",
+ "name": "Create DSMARK with multiple setting",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024 default_index 1024 set_tc_index",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc dsmark 1: root refcnt [0-9]+ indices 0x0400 default_index 0x0400 set_tc_index",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4092",
+ "name": "Delete DSMARK with handle",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024 default_index 1024"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc dsmark 1: root refcnt [0-9]+ indices 0x0400",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5930",
+ "name": "Show DSMARK class",
+ "category": [
+ "qdisc",
+ "dsmark"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root dsmark indices 1024",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class dsmark 1:",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 08/18] selftests/tc-testings: add selftests for fq_codel qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (6 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 07/18] selftests/tc-testings: add selftests for dsmark qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 20:38 ` Victor Nogueira
2022-09-16 3:05 ` [PATCH net-next 09/18] selftests/tc-testings: add selftests for hfsc qdisc Zhengchao Shao
` (9 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 4957: Create FQ_CODEL with default setting
Test 7621: Create FQ_CODEL with limit setting
Test 6872: Create FQ_CODEL with memory_limit setting
Test 5636: Create FQ_CODEL with target setting
Test 630a: Create FQ_CODEL with interval setting
Test 4324: Create FQ_CODEL with quantum setting
Test b190: Create FQ_CODEL with noecn flag
Test c9d2: Create FQ_CODEL with ce_threshold setting
Test 523b: Create FQ_CODEL with multiple setting
Test 9283: Replace FQ_CODEL with noecn setting
Test 3459: Change FQ_CODEL with limit setting
Test 0128: Delete FQ_CODEL with handle
Test 0435: Show FQ_CODEL class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/fq_codel.json | 326 ++++++++++++++++++
1 file changed, 326 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
new file mode 100644
index 000000000000..09608677cfee
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
@@ -0,0 +1,326 @@
+[
+ {
+ "id": "4957",
+ "name": "Create FQ_CODEL with default setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "7621",
+ "name": "Create FQ_CODEL with limit setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "6872",
+ "name": "Create FQ_CODEL with memory_limit setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel memory_limit 100000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 100000b ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5636",
+ "name": "Create FQ_CODEL with target setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel target 2000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 2ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "630a",
+ "name": "Create FQ_CODEL with interval setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel interval 5000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 5ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4324",
+ "name": "Create FQ_CODEL with quantum setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel quantum 9000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum 9000 target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "b190",
+ "name": "Create FQ_CODEL with noecn flag",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel noecn",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "c9d2",
+ "name": "Create FQ_CODEL with ce_threshold setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel ce_threshold 1024000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms ce_threshold 1.02s interval 100ms memory_limit 32Mb ecn drop_batch 64",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "c9d2",
+ "name": "Create FQ_CODEL with drop_batch setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel drop_batch 100",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "523b",
+ "name": "Create FQ_CODEL with multiple setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9283",
+ "name": "Replace FQ_CODEL with noecn setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
+ ],
+ "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root fq_codel noecn",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb drop_batch 100",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3459",
+ "name": "Change FQ_CODEL with limit setting",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
+ ],
+ "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root fq_codel limit 2000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 2000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0128",
+ "name": "Delete FQ_CODEL with handle",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb noecn drop_batch 100",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0435",
+ "name": "Show FQ_CODEL class",
+ "category": [
+ "qdisc",
+ "fq_codel"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class fq_codel 1:",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH net-next 08/18] selftests/tc-testings: add selftests for fq_codel qdisc
2022-09-16 3:05 ` [PATCH net-next 08/18] selftests/tc-testings: add selftests for fq_codel qdisc Zhengchao Shao
@ 2022-09-16 20:38 ` Victor Nogueira
0 siblings, 0 replies; 25+ messages in thread
From: Victor Nogueira @ 2022-09-16 20:38 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
<shaozhengchao@huawei.com> wrote:
>
> Test 4957: Create FQ_CODEL with default setting
> Test 7621: Create FQ_CODEL with limit setting
> Test 6872: Create FQ_CODEL with memory_limit setting
> Test 5636: Create FQ_CODEL with target setting
> Test 630a: Create FQ_CODEL with interval setting
> Test 4324: Create FQ_CODEL with quantum setting
> Test b190: Create FQ_CODEL with noecn flag
> Test c9d2: Create FQ_CODEL with ce_threshold setting
> Test 523b: Create FQ_CODEL with multiple setting
> Test 9283: Replace FQ_CODEL with noecn setting
> Test 3459: Change FQ_CODEL with limit setting
> Test 0128: Delete FQ_CODEL with handle
> Test 0435: Show FQ_CODEL class
>
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> .../tc-testing/tc-tests/qdiscs/fq_codel.json | 326 ++++++++++++++++++
> 1 file changed, 326 insertions(+)
> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
>
> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
> new file mode 100644
> index 000000000000..09608677cfee
> --- /dev/null
> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
> @@ -0,0 +1,326 @@
> +[
> + {
> + "id": "4957",
> + "name": "Create FQ_CODEL with default setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "7621",
> + "name": "Create FQ_CODEL with limit setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "6872",
> + "name": "Create FQ_CODEL with memory_limit setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel memory_limit 100000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 100000b ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "5636",
> + "name": "Create FQ_CODEL with target setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel target 2000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 2ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "630a",
> + "name": "Create FQ_CODEL with interval setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel interval 5000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 5ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "4324",
> + "name": "Create FQ_CODEL with quantum setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel quantum 9000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum 9000 target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "b190",
> + "name": "Create FQ_CODEL with noecn flag",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel noecn",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "c9d2",
> + "name": "Create FQ_CODEL with ce_threshold setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel ce_threshold 1024000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms ce_threshold 1.02s interval 100ms memory_limit 32Mb ecn drop_batch 64",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "c9d2",
Be careful, you are using ID c9d2 in the previous test case.
> + "name": "Create FQ_CODEL with drop_batch setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel drop_batch 100",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 10240p flows 1024 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "523b",
> + "name": "Create FQ_CODEL with multiple setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "9283",
> + "name": "Replace FQ_CODEL with noecn setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
> + ],
> + "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root fq_codel noecn",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb drop_batch 100",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3459",
> + "name": "Change FQ_CODEL with limit setting",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
> + ],
> + "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root fq_codel limit 2000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 2000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 100",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0128",
> + "name": "Delete FQ_CODEL with handle",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root fq_codel limit 1000 flows 256 drop_batch 100"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc fq_codel 1: root refcnt [0-9]+ limit 1000p flows 256 quantum.*target 5ms interval 100ms memory_limit 32Mb noecn drop_batch 100",
> + "matchCount": "0",
> + "teardown": [
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0435",
> + "name": "Show FQ_CODEL class",
> + "category": [
> + "qdisc",
> + "fq_codel"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_codel",
> + "expExitCode": "0",
> + "verifyCmd": "$TC class show dev $DUMMY",
> + "matchPattern": "class fq_codel 1:",
> + "matchCount": "0",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + }
> +]
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH net-next 09/18] selftests/tc-testings: add selftests for hfsc qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (7 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 08/18] selftests/tc-testings: add selftests for fq_codel qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 10/18] selftests/tc-testings: add selftests for htb qdisc Zhengchao Shao
` (8 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 3254: Create HFSC with default setting
Test 0289: Create HFSC with class sc and ul rate setting
Test 846a: Create HFSC with class sc umax and dmax setting
Test 5413: Create HFSC with class rt and ls rate setting
Test 9312: Create HFSC with class rt umax and dmax setting
Test 6931: Delete HFSC with handle
Test 8436: Show HFSC class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/hfsc.json | 167 ++++++++++++++++++
1 file changed, 167 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json
new file mode 100644
index 000000000000..af27b2c20e17
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json
@@ -0,0 +1,167 @@
+[
+ {
+ "id": "3254",
+ "name": "Create HFSC with default setting",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root hfsc",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc hfsc 1: root refcnt [0-9]+",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0289",
+ "name": "Create HFSC with class sc and ul rate setting",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root hfsc default 11"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 hfsc sc rate 20000 ul rate 10000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class hfsc 1:1 parent 1: sc m1 0bit d 0us m2 20Kbit ul m1 0bit d 0us m2 10Kbit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "846a",
+ "name": "Create HFSC with class sc umax and dmax setting",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root hfsc default 11"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 hfsc sc umax 1540 dmax 5ms rate 10000 ul rate 10000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class hfsc 1:1 parent 1: sc m1 2464Kbit d 5ms m2 10Kbit ul m1 0bit d 0us m2 10Kbit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5413",
+ "name": "Create HFSC with class rt and ls rate setting",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root hfsc default 11"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 hfsc rt rate 20000 ls rate 10000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class hfsc 1:1 parent 1: rt m1 0bit d 0us m2 20Kbit ls m1 0bit d 0us m2 10Kbit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9312",
+ "name": "Create HFSC with class rt umax and dmax setting",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root hfsc default 11"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 hfsc rt umax 1540 dmax 5ms rate 10000 ls rate 10000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class hfsc 1:1 parent 1: rt m1 2464Kbit d 5ms m2 10Kbit ls m1 0bit d 0us m2 10Kbit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "6931",
+ "name": "Delete HFSC with handle",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root hfsc default 11"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc hfsc 1: root refcnt [0-9]+",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "8436",
+ "name": "Show HFSC class",
+ "category": [
+ "qdisc",
+ "hfsc"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root hfsc",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class hfsc 1: root",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 10/18] selftests/tc-testings: add selftests for htb qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (8 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 09/18] selftests/tc-testings: add selftests for hfsc qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 11/18] selftests/tc-testings: add selftests for mqprio qdisc Zhengchao Shao
` (7 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 0904: Create HTB with default setting
Test 3906: Create HTB with default-N setting
Test 8492: Create HTB with r2q setting
Test 9502: Create HTB with direct_qlen setting
Test b924: Create HTB with class rate and burst setting
Test 4359: Create HTB with class mpu setting
Test 9048: Create HTB with class prio setting
Test 4994: Create HTB with class ceil setting
Test 9523: Create HTB with class cburst setting
Test 5353: Create HTB with class mtu setting
Test 346a: Create HTB with class quantum setting
Test 303a: Delete HTB with handle
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/htb.json | 285 ++++++++++++++++++
1 file changed, 285 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json
new file mode 100644
index 000000000000..9529899482e0
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json
@@ -0,0 +1,285 @@
+[
+ {
+ "id": "0904",
+ "name": "Create HTB with default setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root htb",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc htb 1: root refcnt [0-9]+ r2q 10 default 0 direct_packets_stat.*direct_qlen",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3906",
+ "name": "Create HTB with default-N setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root htb default 10",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc htb 1: root refcnt [0-9]+ r2q 10 default 0x10 direct_packets_stat.* direct_qlen",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "8492",
+ "name": "Create HTB with r2q setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root htb r2q 5",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc htb 1: root refcnt [0-9]+ r2q 5 default 0 direct_packets_stat.*direct_qlen",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9502",
+ "name": "Create HTB with direct_qlen setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root htb direct_qlen 1024",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc htb 1: root refcnt [0-9]+ r2q 10 default 0 direct_packets_stat.*direct_qlen 1024",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "b924",
+ "name": "Create HTB with class rate and burst setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20kbit burst 1000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 20Kbit burst 1000b cburst 1600b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4359",
+ "name": "Create HTB with class mpu setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit mpu 64",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 20Kbit burst 1600b cburst 1600b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9048",
+ "name": "Create HTB with class prio setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit prio 1",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 1 rate 20Kbit ceil 20Kbit burst 1600b cburst 1600b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4994",
+ "name": "Create HTB with class ceil setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit ceil 10Kbit",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 10Kbit burst 1600b cburst 1600b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "9523",
+ "name": "Create HTB with class cburst setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit cburst 2000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 20Kbit burst 1600b cburst 2000b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5353",
+ "name": "Create HTB with class mtu setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit mtu 2048",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 20Kbit burst 2Kb cburst 2Kb",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "346a",
+ "name": "Create HTB with class quantum setting",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 htb rate 20Kbit quantum 2048",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class htb 1:1 root prio 0 rate 20Kbit ceil 20Kbit burst 1600b cburst 1600b",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "303a",
+ "name": "Delete HTB with handle",
+ "category": [
+ "qdisc",
+ "htb"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root htb r2q 5"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc htb 1: root refcnt [0-9]+",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 11/18] selftests/tc-testings: add selftests for mqprio qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (9 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 10/18] selftests/tc-testings: add selftests for htb qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 12/18] selftests/tc-testings: add selftests for multiq qdisc Zhengchao Shao
` (6 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 9903: Add mqprio Qdisc to multi-queue device (8 queues)
Test 453a: Delete nonexistent mqprio Qdisc
Test 5294: Delete mqprio Qdisc twice
Test 45a9: Add mqprio Qdisc to single-queue device
Test 2ba9: Show mqprio class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/mqprio.json | 114 ++++++++++++++++++
1 file changed, 114 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json
new file mode 100644
index 000000000000..eb598658161c
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json
@@ -0,0 +1,114 @@
+[
+ {
+ "id": "9903",
+ "name": "Add mqprio Qdisc to multi-queue device (8 queues)",
+ "category": [
+ "qdisc",
+ "mqprio"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mqprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc mqprio 1: root tc 8 map 0 1 2 3 4 5 6 7 0 0 0 0 0 0 0 0.*queues:\\(0:0\\) \\(1:1\\) \\(2:2\\) \\(3:3\\) \\(4:4\\) \\(5:5\\) \\(6:6\\) \\(7:7\\)",
+ "matchCount": "1",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "453a",
+ "name": "Delete nonexistent mqprio Qdisc",
+ "category": [
+ "qdisc",
+ "mqprio"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 4\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mqprio",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc mqprio 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "5294",
+ "name": "Delete mqprio Qdisc twice",
+ "category": [
+ "qdisc",
+ "mqprio"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
+ "$TC qdisc add dev $ETH root handle 1: mqprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0",
+ "$TC qdisc del dev $ETH root handle 1:"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1:",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc mqprio 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "45a9",
+ "name": "Add mqprio Qdisc to single-queue device",
+ "category": [
+ "qdisc",
+ "mqprio"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mqprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc mqprio 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "2ba9",
+ "name": "Show mqprio class",
+ "category": [
+ "qdisc",
+ "mqprio"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mqprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $ETH",
+ "matchPattern": "class mqprio 1:",
+ "matchCount": "16",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 12/18] selftests/tc-testings: add selftests for multiq qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (10 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 11/18] selftests/tc-testings: add selftests for mqprio qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 20:40 ` Victor Nogueira
2022-09-16 3:05 ` [PATCH net-next 13/18] selftests/tc-testings: add selftests for netem qdisc Zhengchao Shao
` (5 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 20ba: Add multiq Qdisc to multi-queue device (8 queues)
Test 9903: List multiq Class
Test 7832: Delete nonexistent multiq Qdisc
Test 2891: Delete multiq Qdisc twice
Test 1329: Add multiq Qdisc to single-queue device
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/multiq.json | 114 ++++++++++++++++++
1 file changed, 114 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
new file mode 100644
index 000000000000..2ae813f676a5
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
@@ -0,0 +1,114 @@
+[
+ {
+ "id": "20ba",
+ "name": "Add multiq Qdisc to multi-queue device (8 queues)",
+ "category": [
+ "qdisc",
+ "multiq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc multiq 1: root refcnt [0-9]+ bands 8",
+ "matchCount": "1",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "9903",
+ "name": "List multiq Class",
+ "category": [
+ "qdisc",
+ "multiq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $ETH",
+ "matchPattern": "class multiq 1:[0-9]+ parent 1:",
+ "matchCount": "8",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "7832",
+ "name": "Delete nonexistent multiq Qdisc",
+ "category": [
+ "qdisc",
+ "multiq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 4\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: multiq",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc multiq 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "2891",
+ "name": "Delete multiq Qdisc twice",
+ "category": [
+ "qdisc",
+ "multiq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
+ "$TC qdisc add dev $ETH root handle 1: multiq",
+ "$TC qdisc del dev $ETH root handle 1:"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1:",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc mqprio 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ },
+ {
+ "id": "1329",
+ "name": "Add multiq Qdisc to single-queue device",
+ "category": [
+ "qdisc",
+ "multiq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
+ "expExitCode": "2",
+ "verifyCmd": "$TC qdisc show dev $ETH",
+ "matchPattern": "qdisc multiq 1: root",
+ "matchCount": "0",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH net-next 12/18] selftests/tc-testings: add selftests for multiq qdisc
2022-09-16 3:05 ` [PATCH net-next 12/18] selftests/tc-testings: add selftests for multiq qdisc Zhengchao Shao
@ 2022-09-16 20:40 ` Victor Nogueira
0 siblings, 0 replies; 25+ messages in thread
From: Victor Nogueira @ 2022-09-16 20:40 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
<shaozhengchao@huawei.com> wrote:
>
> Test 20ba: Add multiq Qdisc to multi-queue device (8 queues)
> Test 9903: List multiq Class
> Test 7832: Delete nonexistent multiq Qdisc
> Test 2891: Delete multiq Qdisc twice
> Test 1329: Add multiq Qdisc to single-queue device
>
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> .../tc-testing/tc-tests/qdiscs/multiq.json | 114 ++++++++++++++++++
> 1 file changed, 114 insertions(+)
> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
>
> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
> new file mode 100644
> index 000000000000..2ae813f676a5
> --- /dev/null
> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
> @@ -0,0 +1,114 @@
> +[
> + {
> + "id": "20ba",
> + "name": "Add multiq Qdisc to multi-queue device (8 queues)",
> + "category": [
> + "qdisc",
> + "multiq"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $ETH",
> + "matchPattern": "qdisc multiq 1: root refcnt [0-9]+ bands 8",
> + "matchCount": "1",
> + "teardown": [
> + "echo \"1\" > /sys/bus/netdevsim/del_device"
> + ]
> + },
> + {
> + "id": "9903",
Be careful, you are using ID 9903 in the mqprio test patch.
> + "name": "List multiq Class",
> + "category": [
> + "qdisc",
> + "multiq"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "echo \"1 1 8\" > /sys/bus/netdevsim/new_device"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
> + "expExitCode": "0",
> + "verifyCmd": "$TC class show dev $ETH",
> + "matchPattern": "class multiq 1:[0-9]+ parent 1:",
> + "matchCount": "8",
> + "teardown": [
> + "echo \"1\" > /sys/bus/netdevsim/del_device"
> + ]
> + },
> + {
> + "id": "7832",
> + "name": "Delete nonexistent multiq Qdisc",
> + "category": [
> + "qdisc",
> + "multiq"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "echo \"1 1 4\" > /sys/bus/netdevsim/new_device"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: multiq",
> + "expExitCode": "2",
> + "verifyCmd": "$TC qdisc show dev $ETH",
> + "matchPattern": "qdisc multiq 1: root",
> + "matchCount": "0",
> + "teardown": [
> + "echo \"1\" > /sys/bus/netdevsim/del_device"
> + ]
> + },
> + {
> + "id": "2891",
> + "name": "Delete multiq Qdisc twice",
> + "category": [
> + "qdisc",
> + "multiq"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
> + "$TC qdisc add dev $ETH root handle 1: multiq",
> + "$TC qdisc del dev $ETH root handle 1:"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1:",
> + "expExitCode": "2",
> + "verifyCmd": "$TC qdisc show dev $ETH",
> + "matchPattern": "qdisc mqprio 1: root",
> + "matchCount": "0",
> + "teardown": [
> + "echo \"1\" > /sys/bus/netdevsim/del_device"
> + ]
> + },
> + {
> + "id": "1329",
> + "name": "Add multiq Qdisc to single-queue device",
> + "category": [
> + "qdisc",
> + "multiq"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "echo \"1 1\" > /sys/bus/netdevsim/new_device"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: multiq",
> + "expExitCode": "2",
> + "verifyCmd": "$TC qdisc show dev $ETH",
> + "matchPattern": "qdisc multiq 1: root",
> + "matchCount": "0",
> + "teardown": [
> + "echo \"1\" > /sys/bus/netdevsim/del_device"
> + ]
> + }
> +]
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH net-next 13/18] selftests/tc-testings: add selftests for netem qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (11 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 12/18] selftests/tc-testings: add selftests for multiq qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 20:44 ` Victor Nogueira
2022-09-16 3:05 ` [PATCH net-next 14/18] selftests/tc-testings: add selftests for qfq qdisc Zhengchao Shao
` (4 subsequent siblings)
17 siblings, 1 reply; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test cb28: Create NETEM with default setting
Test a089: Create NETEM with limit flag
Test 3449: Create NETEM with delay time
Test 3782: Create NETEM with distribution and corrupt flag
Test a932: Create NETEM with distribution and duplicate flag
Test e01a: Create NETEM with distribution and loss state flag
Test ba29: Create NETEM with loss gemodel flag
Test 0492: Create NETEM with reorder flag
Test 7862: Create NETEM with rate limit
Test 7235: Create NETEM with multiple slot rate
Test 5439: Create NETEM with multiple slot setting
Test 5029: Change NETEM with loss state
Test 3785: Replace NETEM with delay time
Test 4502: Delete NETEM with handle
Test 0785: Show NETEM class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/netem.json | 372 ++++++++++++++++++
1 file changed, 372 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
new file mode 100644
index 000000000000..c8ce7883bd9f
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
@@ -0,0 +1,372 @@
+[
+ {
+ "id": "cb28",
+ "name": "Create NETEM with default setting",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ limit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a089",
+ "name": "Create NETEM with limit flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem limit 200",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ limit 200",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3449",
+ "name": "Create NETEM with delay time",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3782",
+ "name": "Create NETEM with distribution and corrupt flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal corrupt 1%",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms corrupt 1%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a932",
+ "name": "Create NETEM with distribution and duplicate flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal duplicate 1%",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms duplicate 1%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "a932",
+ "name": "Create NETEM with distribution and loss flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution pareto loss 1%",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms loss 1%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "e01a",
+ "name": "Create NETEM with distribution and loss state flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution paretonormal loss state 1",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms loss state p13 1% p31 99% p32 0% p23 100% p14 0%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "ba29",
+ "name": "Create NETEM with loss gemodel flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem loss gemodel 1%",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*loss gemodel p 1%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0492",
+ "name": "Create NETEM with reorder flag",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms reorder 2% gap 100",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*reorder 2%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "7862",
+ "name": "Create NETEM with rate limit",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem rate 20000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*rate 20Kbit",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "7235",
+ "name": "Create NETEM with multiple slot rate",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem slot 10 200 packets 2000 bytes 9000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*slot 10ns 200ns packets 2000 bytes 9000",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5439",
+ "name": "Create NETEM with multiple slot setting",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem slot distribution pareto 1ms 0.1ms",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*slot distribution 1ms 100us",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5029",
+ "name": "Change NETEM with loss state",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 1%"
+ ],
+ "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 2%",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*loss 2%",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "3785",
+ "name": "Replace NETEM with delay time",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 1%"
+ ],
+ "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root netem delay 200ms 10ms",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 200ms 10ms",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "4502",
+ "name": "Delete NETEM with handle",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0785",
+ "name": "Show NETEM class",
+ "category": [
+ "qdisc",
+ "netem"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class netem 1:",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH net-next 13/18] selftests/tc-testings: add selftests for netem qdisc
2022-09-16 3:05 ` [PATCH net-next 13/18] selftests/tc-testings: add selftests for netem qdisc Zhengchao Shao
@ 2022-09-16 20:44 ` Victor Nogueira
0 siblings, 0 replies; 25+ messages in thread
From: Victor Nogueira @ 2022-09-16 20:44 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
zhijianx.li, weiyongjun1, yuehaibing
On Fri, Sep 16, 2022 at 12:04 AM Zhengchao Shao
<shaozhengchao@huawei.com> wrote:
>
> Test cb28: Create NETEM with default setting
> Test a089: Create NETEM with limit flag
> Test 3449: Create NETEM with delay time
> Test 3782: Create NETEM with distribution and corrupt flag
> Test a932: Create NETEM with distribution and duplicate flag
> Test e01a: Create NETEM with distribution and loss state flag
> Test ba29: Create NETEM with loss gemodel flag
> Test 0492: Create NETEM with reorder flag
> Test 7862: Create NETEM with rate limit
> Test 7235: Create NETEM with multiple slot rate
> Test 5439: Create NETEM with multiple slot setting
> Test 5029: Change NETEM with loss state
> Test 3785: Replace NETEM with delay time
> Test 4502: Delete NETEM with handle
> Test 0785: Show NETEM class
>
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> .../tc-testing/tc-tests/qdiscs/netem.json | 372 ++++++++++++++++++
> 1 file changed, 372 insertions(+)
> create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
>
> diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
> new file mode 100644
> index 000000000000..c8ce7883bd9f
> --- /dev/null
> +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
> @@ -0,0 +1,372 @@
> +[
> + {
> + "id": "cb28",
> + "name": "Create NETEM with default setting",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ limit",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "a089",
> + "name": "Create NETEM with limit flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem limit 200",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ limit 200",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3449",
> + "name": "Create NETEM with delay time",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3782",
> + "name": "Create NETEM with distribution and corrupt flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal corrupt 1%",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms corrupt 1%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "a932",
> + "name": "Create NETEM with distribution and duplicate flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal duplicate 1%",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms duplicate 1%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "a932",
Be careful, you are using ID a932 in the previous test case.
> + "name": "Create NETEM with distribution and loss flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution pareto loss 1%",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms loss 1%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "e01a",
> + "name": "Create NETEM with distribution and loss state flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution paretonormal loss state 1",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms loss state p13 1% p31 99% p32 0% p23 100% p14 0%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "ba29",
> + "name": "Create NETEM with loss gemodel flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem loss gemodel 1%",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*loss gemodel p 1%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0492",
> + "name": "Create NETEM with reorder flag",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms reorder 2% gap 100",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*reorder 2%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "7862",
> + "name": "Create NETEM with rate limit",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem rate 20000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*rate 20Kbit",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "7235",
> + "name": "Create NETEM with multiple slot rate",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem slot 10 200 packets 2000 bytes 9000",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*slot 10ns 200ns packets 2000 bytes 9000",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "5439",
> + "name": "Create NETEM with multiple slot setting",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem slot distribution pareto 1ms 0.1ms",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*slot distribution 1ms 100us",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "5029",
> + "name": "Change NETEM with loss state",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 1%"
> + ],
> + "cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 2%",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*loss 2%",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "3785",
> + "name": "Replace NETEM with delay time",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal loss 1%"
> + ],
> + "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root netem delay 200ms 10ms",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 200ms 10ms",
> + "matchCount": "1",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "4502",
> + "name": "Delete NETEM with handle",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true",
> + "$TC qdisc add dev $DUMMY handle 1: root netem delay 100ms 10ms distribution normal"
> + ],
> + "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
> + "expExitCode": "0",
> + "verifyCmd": "$TC qdisc show dev $DUMMY",
> + "matchPattern": "qdisc netem 1: root refcnt [0-9]+ .*delay 100ms 10ms",
> + "matchCount": "0",
> + "teardown": [
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + },
> + {
> + "id": "0785",
> + "name": "Show NETEM class",
> + "category": [
> + "qdisc",
> + "netem"
> + ],
> + "plugins": {
> + "requires": "nsPlugin"
> + },
> + "setup": [
> + "$IP link add dev $DUMMY type dummy || /bin/true"
> + ],
> + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root netem",
> + "expExitCode": "0",
> + "verifyCmd": "$TC class show dev $DUMMY",
> + "matchPattern": "class netem 1:",
> + "matchCount": "0",
> + "teardown": [
> + "$TC qdisc del dev $DUMMY handle 1: root",
> + "$IP link del dev $DUMMY type dummy"
> + ]
> + }
> +]
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH net-next 14/18] selftests/tc-testings: add selftests for qfq qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (12 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 13/18] selftests/tc-testings: add selftests for netem qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 15/18] selftests/tc-testings: add show class case for ingress qdisc Zhengchao Shao
` (3 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 0582: Create QFQ with default setting
Test c9a3: Create QFQ with class weight setting
Test 8452: Create QFQ with class maxpkt setting
Test d920: Create QFQ with multiple class setting
Test 0548: Delete QFQ with handle
Test 5901: Show QFQ class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/qfq.json | 145 ++++++++++++++++++
1 file changed, 145 insertions(+)
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json
new file mode 100644
index 000000000000..330f1a25e0ab
--- /dev/null
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json
@@ -0,0 +1,145 @@
+[
+ {
+ "id": "0582",
+ "name": "Create QFQ with default setting",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root qfq",
+ "expExitCode": "0",
+ "verifyCmd": "$TC qdisc show dev $DUMMY",
+ "matchPattern": "qdisc qfq 1: root refcnt [0-9]+",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "c9a3",
+ "name": "Create QFQ with class weight setting",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root qfq"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 qfq weight 100",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class qfq 1:1 root weight 100 maxpkt",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "8452",
+ "name": "Create QFQ with class maxpkt setting",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root qfq"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:1 qfq maxpkt 2000",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class qfq 1:1 root weight 1 maxpkt 2000",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "d920",
+ "name": "Create QFQ with multiple class setting",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root qfq",
+ "$TC class add dev $DUMMY parent 1: classid 1:1 qfq weight 100"
+ ],
+ "cmdUnderTest": "$TC class add dev $DUMMY parent 1: classid 1:2 qfq weight 200",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class qfq 1:[0-9]+ root weight [0-9]+00 maxpkt",
+ "matchCount": "2",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "0548",
+ "name": "Delete QFQ with handle",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true",
+ "$TC qdisc add dev $DUMMY handle 1: root qfq",
+ "$TC class add dev $DUMMY parent 1: classid 1:1 qfq weight 100"
+ ],
+ "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "qdisc qfq 1: root refcnt [0-9]+",
+ "matchCount": "0",
+ "teardown": [
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ },
+ {
+ "id": "5901",
+ "name": "Show QFQ class",
+ "category": [
+ "qdisc",
+ "qfq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root qfq",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class qfq 1:",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
+ }
+]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 15/18] selftests/tc-testings: add show class case for ingress qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (13 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 14/18] selftests/tc-testings: add selftests for qfq qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 16/18] selftests/tc-testings: add show class case for mq qdisc Zhengchao Shao
` (2 subsequent siblings)
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 0521: Show ingress class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/ingress.json | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json
index d99dba6e2b1a..11d33362408c 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json
@@ -98,5 +98,25 @@
"teardown": [
"$IP link del dev $DUMMY type dummy"
]
+ },
+ {
+ "id": "0521",
+ "name": "Show ingress class",
+ "category": [
+ "qdisc",
+ "ingress"
+ ],
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY ingress",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class ingress",
+ "matchCount": "0",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY ingress",
+ "$IP link del dev $DUMMY type dummy"
+ ]
}
]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 16/18] selftests/tc-testings: add show class case for mq qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (14 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 15/18] selftests/tc-testings: add show class case for ingress qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 17/18] selftests/tc-testings: add show class case for prio qdisc Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 18/18] selftests/tc-testings: add show class case for red qdisc Zhengchao Shao
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 1023: Show mq class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/mq.json | 24 ++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json
index c6046096d9db..44fbfc6caec7 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json
@@ -133,5 +133,27 @@
"teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device"
]
- }
+ },
+ {
+ "id": "1023",
+ "name": "Show mq class",
+ "category": [
+ "qdisc",
+ "mq"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "echo \"1 1 4\" > /sys/bus/netdevsim/new_device"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $ETH",
+ "matchPattern": "class mq 1:[0-9]+ root",
+ "matchCount": "4",
+ "teardown": [
+ "echo \"1\" > /sys/bus/netdevsim/del_device"
+ ]
+ }
]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 17/18] selftests/tc-testings: add show class case for prio qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (15 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 16/18] selftests/tc-testings: add show class case for mq qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
2022-09-16 3:05 ` [PATCH net-next 18/18] selftests/tc-testings: add show class case for red qdisc Zhengchao Shao
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 2410: Show prio class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/prio.json | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json
index 3076c02d08d6..8186de2f0dcf 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json
@@ -272,5 +272,25 @@
"teardown": [
"$IP link del dev $DUMMY type dummy"
]
+ },
+ {
+ "id": "2410",
+ "name": "Show prio class",
+ "category": [
+ "qdisc",
+ "prio"
+ ],
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root prio",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class prio 1:[0-9]+ parent 1:",
+ "matchCount": "3",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root prio",
+ "$IP link del dev $DUMMY type dummy"
+ ]
}
]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH net-next 18/18] selftests/tc-testings: add show class case for red qdisc
2022-09-16 3:05 [PATCH net-next 00/18] refactor duplicate codes in the qdisc class walk function Zhengchao Shao
` (16 preceding siblings ...)
2022-09-16 3:05 ` [PATCH net-next 17/18] selftests/tc-testings: add show class case for prio qdisc Zhengchao Shao
@ 2022-09-16 3:05 ` Zhengchao Shao
17 siblings, 0 replies; 25+ messages in thread
From: Zhengchao Shao @ 2022-09-16 3:05 UTC (permalink / raw)
To: netdev, cake, linux-kselftest, jhs, xiyou.wangcong, jiri, davem,
edumazet, kuba, pabeni, toke, vinicius.gomes, stephen, shuah,
victor
Cc: zhijianx.li, weiyongjun1, yuehaibing, shaozhengchao
Test 290a: Show RED class
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
.../tc-testing/tc-tests/qdiscs/red.json | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json
index 0703a2a255eb..4b3e449857f2 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json
@@ -181,5 +181,28 @@
"$TC qdisc del dev $DUMMY handle 1: root",
"$IP link del dev $DUMMY type dummy"
]
+ },
+ {
+ "id": "290a",
+ "name": "Show RED class",
+ "category": [
+ "qdisc",
+ "red"
+ ],
+ "plugins": {
+ "requires": "nsPlugin"
+ },
+ "setup": [
+ "$IP link add dev $DUMMY type dummy || /bin/true"
+ ],
+ "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root red limit 1M avpkt 1500 min 100K max 300K",
+ "expExitCode": "0",
+ "verifyCmd": "$TC class show dev $DUMMY",
+ "matchPattern": "class red 1:[0-9]+ parent 1:",
+ "matchCount": "1",
+ "teardown": [
+ "$TC qdisc del dev $DUMMY handle 1: root",
+ "$IP link del dev $DUMMY type dummy"
+ ]
}
]
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread