Commit fb38306c authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by Paolo Abeni
Browse files

net/sched: Retire ATM qdisc 



The ATM qdisc has served us well over the years but has not been getting much
TLC due to lack of known users. Most recently it has become a shooting target
for syzkaller. For this reason, we are retiring it.

Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 051d4420

net/sched/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -68,20 +68,6 @@ config NET_SCH_HFSC 
	  To compile this code as a module, choose M here: the

	  module will be called sch_hfsc.



config NET_SCH_ATM

	tristate "ATM Virtual Circuits (ATM)"

	depends on ATM

	help

	  Say Y here if you want to use the ATM pseudo-scheduler.  This

	  provides a framework for invoking classifiers, which in turn

	  select classes of this queuing discipline.  Each class maps

	  the flow(s) it is handling to a given virtual circuit.



	  See the top of <file:net/sched/sch_atm.c> for more details.



	  To compile this code as a module, choose M here: the

	  module will be called sch_atm.



config NET_SCH_PRIO

	tristate "Multi Band Priority Queueing (PRIO)"

	help

net/sched/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o 
obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o

obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o

obj-$(CONFIG_NET_SCH_MULTIQ)	+= sch_multiq.o

obj-$(CONFIG_NET_SCH_ATM)	+= sch_atm.o

obj-$(CONFIG_NET_SCH_NETEM)	+= sch_netem.o

obj-$(CONFIG_NET_SCH_DRR)	+= sch_drr.o

obj-$(CONFIG_NET_SCH_PLUG)	+= sch_plug.o

net/sched/sch_atm.c

deleted100644 → 0
+0 −706

File deleted.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/tc-testing/tc-tests/qdiscs/atm.json

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
[

    {

        "id": "7628",

        "name": "Create ATM with default setting",

        "category": [

            "qdisc",

            "atm"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root atm",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc atm 1: root refcnt",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1: root",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {

        "id": "390a",

        "name": "Delete ATM with valid handle",

        "category": [

            "qdisc",

            "atm"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$IP link add dev $DUMMY type dummy || /bin/true",

            "$TC qdisc add dev $DUMMY handle 1: root atm"

        ],

        "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc atm 1: root refcnt",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {

        "id": "32a0",

        "name": "Show ATM class",

        "category": [

            "qdisc",

            "atm"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root atm",

        "expExitCode": "0",

        "verifyCmd": "$TC class show dev $DUMMY",

        "matchPattern": "class atm 1: parent 1:",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1: root",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {

        "id": "6310",

        "name": "Dump ATM stats",

        "category": [

            "qdisc",

            "atm"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root atm",

        "expExitCode": "0",

        "verifyCmd": "$TC -s qdisc show dev $DUMMY",

        "matchPattern": "qdisc atm 1: root refcnt",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1: root",

            "$IP link del dev $DUMMY type dummy"

        ]

    }

]