test: drop the mqprio branches from the QoS tests

No port renders mqprio any more.  The traffic class test expects the
offload capability to follow the ets qdisc's offloaded flag, and the
scheduling tests skip a switch port whose driver did not take the
scheduler, since the fabric forwards past a software one.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Author: troglobit

test/case/interfaces/qos_factory_default/test.py

@@ -84,8 +84,6 @@ def default_table():
             if not qdisc:
                 return False
             opts = qdisc.get("options", {})
-            if qdisc["kind"] == "mqprio":
-                return opts.get("map", [])[:8] == TABLE_8_5[num_tc]
             if qdisc["kind"] == "ets":
                 return (opts.get("bands") == num_tc and opts.get("strict") == num_tc and
                         opts.get("priomap", [])[:8] == [num_tc - 1 - tc for tc in TABLE_8_5[num_tc]])

test/case/interfaces/qos_mixed_selection/test.py

@@ -51,8 +51,8 @@ def prio_map(num_tc):
 
         uevent = tgtssh.runsh(f"cat /sys/class/net/{td1}/uevent").stdout
         if "DEVTYPE=dsa" in uevent.split() and \
-           (qos.root_qdisc(tgtssh, td1) or {}).get("kind") == "mqprio":
-            print("switch fabric queues by the class map but keeps its own scheduler, skipping")
+           "transmission-selection" not in qos.offload(target, td1):
+            print("switch fabric forwards past a scheduler its driver does not offload, skipping")
             test.skip()
 
     with test.step("Bridge the two ports, trust DSCP on ingress, EF strict above AF21 and CS1 at 2:1"):

test/case/interfaces/qos_strict_priority/test.py

@@ -60,8 +60,8 @@ def prio_map(num_tc, entries):
 
         uevent = tgtssh.runsh(f"cat /sys/class/net/{td1}/uevent").stdout
         if "DEVTYPE=dsa" in uevent.split() and \
-           (qos.root_qdisc(tgtssh, td1) or {}).get("kind") == "mqprio":
-            print("switch fabric queues by the class map but keeps its own scheduler, skipping")
+           "transmission-selection" not in qos.offload(target, td1):
+            print("switch fabric forwards past a scheduler its driver does not offload, skipping")
             test.skip()
 
     with test.step("Bridge the two ports, trust DSCP on ingress, priority 0 on the top class"):

test/case/interfaces/qos_traffic_class/test.adoc

@@ -6,10 +6,10 @@ ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/qos_traffic_class]
 
 Configure a custom priority to traffic class map on a port with the two
 lowest classes sharing 67:33 and the rest strict priority, and verify the
-root qdisc reflects it.  A driver with mqprio offload shows an offloaded
-mqprio with the same map; otherwise the kernel runs an ets qdisc with the
-strict bands first, the shares as quanta of one frame per percent, and
-the priomap inverted as 802.1Q numbering requires.
+root qdisc reflects it: an ets qdisc with the strict bands first, the
+shares as quanta of one frame per percent, and the priomap inverted as
+802.1Q numbering requires.  A driver that offloads it marks the qdisc
+offloaded.
 
 The port's class count comes from its transmit queues, or eight for a
 single-queue port.  Switching the table to the ieee-sr preset must put

test/case/interfaces/qos_traffic_class/test.py

@@ -4,10 +4,10 @@
 
 Configure a custom priority to traffic class map on a port with the two
 lowest classes sharing 67:33 and the rest strict priority, and verify the
-root qdisc reflects it.  A driver with mqprio offload shows an offloaded
-mqprio with the same map; otherwise the kernel runs an ets qdisc with the
-strict bands first, the shares as quanta of one frame per percent, and
-the priomap inverted as 802.1Q numbering requires.
+root qdisc reflects it: an ets qdisc with the strict bands first, the
+shares as quanta of one frame per percent, and the priomap inverted as
+802.1Q numbering requires.  A driver that offloads it marks the qdisc
+offloaded.
 
 The port's class count comes from its transmit queues, or eight for a
 single-queue port.  Switching the table to the ieee-sr preset must put
@@ -69,8 +69,6 @@ def qdisc_matches(qdisc, num_tc, prio_map, strict, quanta):
     if not qdisc:
         return False
     opts = qdisc.get("options", {})
-    if qdisc["kind"] == "mqprio":
-        return opts.get("map", [])[:8] == prio_map
     if qdisc["kind"] == "ets":
         return (opts.get("bands") == num_tc and opts.get("strict") == strict
                 and opts.get("quanta", []) == quanta
@@ -122,9 +120,9 @@ def qdisc_matches(qdisc, num_tc, prio_map, strict, quanta):
         print(json.dumps(root_qdisc(tgtssh, port)))
 
     with test.step("Verify the offload capability matches the qdisc"):
-        kind = root_qdisc(tgtssh, port)["kind"]
+        taken = root_qdisc(tgtssh, port).get("offloaded", False)
         until(lambda: ("transmission-selection" in capabilities(target, port).get("offload", []))
-              == (kind == "mqprio"))
+              == taken)
 
     with test.step("Switch to the ieee-sr preset and verify SR classes on top"):
         target.delete_xpath(qos_xpath(port, "/egress"))

test/case/interfaces/qos_weighted_sharing/test.py

@@ -56,8 +56,8 @@ def prio_map(num_tc):
 
         uevent = tgtssh.runsh(f"cat /sys/class/net/{td1}/uevent").stdout
         if "DEVTYPE=dsa" in uevent.split() and \
-           (qos.root_qdisc(tgtssh, td1) or {}).get("kind") == "mqprio":
-            print("switch fabric queues by the class map but keeps its own scheduler, skipping")
+           "transmission-selection" not in qos.offload(target, td1):
+            print("switch fabric forwards past a scheduler its driver does not offload, skipping")
             test.skip()
 
     with test.step("Bridge the two ports, trust DSCP on ingress, EF and CS1 in two weighted classes"):

test/infamy/qos.py

@@ -3,8 +3,8 @@
 and traffic marked the way the tests need it.
 
 Traffic class numbering follows IEEE 802.1Q: class 0 is the lowest.  The
-tc ets qdisc numbers its bands the other way and mqprio has classes of
-its own, so everything here talks in traffic classes and hides both.
+tc ets qdisc numbers its bands the other way, so everything here talks
+in traffic classes and hides that.
 """
 import json
 import re
@@ -35,8 +35,6 @@
 STRICT = "ieee802-dot1q-types:strict-priority"
 ETS = "ieee802-dot1q-types:enhanced-transmission-selection"
 
-# mqprio addresses its traffic classes from this minor number upwards
-MQPRIO_TC_BASE = 0xffe0
 ETS_QUANTUM_UNIT = 1514        # one frame per percent of bandwidth, as rendered
 
 
@@ -86,7 +84,7 @@ def root_qdisc(ssh, port):
 
 
 def scheduler(ssh, port):
-    """The ets or mqprio qdisc: the root, or the child of a tbf root"""
+    """The ets qdisc: the root, or the child of a tbf root"""
     root = root_qdisc(ssh, port)
     if root and root["kind"] == "tbf":
         for qdisc in qdiscs(ssh, port):
@@ -105,8 +103,6 @@ def scheduler_matches(qdisc, num_tc, prio_map, strict=None, quanta=None):
     if not qdisc:
         return False
     opts = qdisc.get("options", {})
-    if qdisc["kind"] == "mqprio":
-        return opts.get("map", [])[:8] == list(prio_map)
     if qdisc["kind"] == "ets":
         if opts.get("bands") != num_tc:
             return False
@@ -134,8 +130,6 @@ def tc_of(kind, handle):
         minor = int(handle.split(":")[1], 16)
         if kind == "ets":
             return num_tc - minor         # band 0, minor 1, is the top class
-        if kind == "mqprio" and minor >= MQPRIO_TC_BASE:
-            return minor - MQPRIO_TC_BASE
         return None
 
     if out.startswith("["):