mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
net/sched: Retire CBQ qdisc
While this amazing qdisc has served us well over the years it has not been getting any tender love and care and has bitrotted over time. It has become mostly a shooting target for syzkaller lately. For this reason, we are retiring it. Goodbye CBQ - we loved you. Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Acked-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Jamal Hadi Salim
Paolo Abeni
parent
8fdf665997
commit
051d442098
@ -45,23 +45,6 @@ if NET_SCHED
|
|||||||
|
|
||||||
comment "Queueing/Scheduling"
|
comment "Queueing/Scheduling"
|
||||||
|
|
||||||
config NET_SCH_CBQ
|
|
||||||
tristate "Class Based Queueing (CBQ)"
|
|
||||||
help
|
|
||||||
Say Y here if you want to use the Class-Based Queueing (CBQ) packet
|
|
||||||
scheduling algorithm. This algorithm classifies the waiting packets
|
|
||||||
into a tree-like hierarchy of classes; the leaves of this tree are
|
|
||||||
in turn scheduled by separate algorithms.
|
|
||||||
|
|
||||||
See the top of <file:net/sched/sch_cbq.c> for more details.
|
|
||||||
|
|
||||||
CBQ is a commonly used scheduler, so if you're unsure, you should
|
|
||||||
say Y here. Then say Y to all the queueing algorithms below that you
|
|
||||||
want to use as leaf disciplines.
|
|
||||||
|
|
||||||
To compile this code as a module, choose M here: the
|
|
||||||
module will be called sch_cbq.
|
|
||||||
|
|
||||||
config NET_SCH_HTB
|
config NET_SCH_HTB
|
||||||
tristate "Hierarchical Token Bucket (HTB)"
|
tristate "Hierarchical Token Bucket (HTB)"
|
||||||
help
|
help
|
||||||
|
|||||||
@ -33,7 +33,6 @@ obj-$(CONFIG_NET_ACT_TUNNEL_KEY)+= act_tunnel_key.o
|
|||||||
obj-$(CONFIG_NET_ACT_CT) += act_ct.o
|
obj-$(CONFIG_NET_ACT_CT) += act_ct.o
|
||||||
obj-$(CONFIG_NET_ACT_GATE) += act_gate.o
|
obj-$(CONFIG_NET_ACT_GATE) += act_gate.o
|
||||||
obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
|
obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
|
||||||
obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o
|
|
||||||
obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
|
obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
|
||||||
obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o
|
obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o
|
||||||
obj-$(CONFIG_NET_SCH_RED) += sch_red.o
|
obj-$(CONFIG_NET_SCH_RED) += sch_red.o
|
||||||
|
|||||||
1727
net/sched/sch_cbq.c
1727
net/sched/sch_cbq.c
File diff suppressed because it is too large
Load Diff
@ -1,184 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"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"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
Loading…
Reference in New Issue
Block a user