Skip to content

Commit 1e21086

Browse files
committed
DEBUG: probe DCB tables on the Marvell rigs, drop before merge
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent c47108c commit 1e21086

4 files changed

Lines changed: 40 additions & 2 deletions

File tree

Binary file not shown.

‎test/case/interfaces/qos_bridge_classify/test.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,11 @@ def parse(packets):
143143

144144
if dcb:
145145
with test.step("Verify classification and remarking are offloaded"):
146-
until(lambda: "classification" in capabilities(target, td0).get("offload", []))
147-
until(lambda: "remarking" in capabilities(target, td1).get("offload", []))
146+
# DEBUG: report instead of failing, to get wire data while dcb app add is broken
147+
print(f"DEBUG offload {td0}: {capabilities(target, td0).get('offload', [])}")
148+
print(f"DEBUG offload {td1}: {capabilities(target, td1).get('offload', [])}")
149+
print(tgtssh.runsh(f"sudo dcb app show dev {td0}; sudo dcb rewr show dev {td1}; "
150+
f"sudo ethtool -d {td1}").stdout)
148151
remark_hw = "remarking" in capabilities(target, td1).get("offload", [])
149152

150153
def expect(seen, ident, vid, pcp, dscp, what):
Binary file not shown.

‎test/case/interfaces/qos_ingress_classify/test.py‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,41 @@ def flower_rules(ssh, port):
9999
}})
100100

101101
if dcb:
102+
with test.step("DEBUG: probe the DCB tables and the log"):
103+
pcp16 = " ".join(f"{p}{d}:{p}" for p in range(8) for d in ("nd", "de"))
104+
dscp64 = " ".join(f"{d}:{d >> 3}" for d in range(64))
105+
print(tgtssh.runsh(f"""
106+
set -x
107+
sudo dcb app show dev {port}
108+
sudo dcb rewr show dev {port}
109+
sudo grep -i -e qos -e dcb -e confd /var/log/messages | tail -20
110+
sudo dmesg | grep -i -e dcb -e dsa -e 'p[0-9]*:' | tail -10
111+
sudo dcb app flush dev {port} default-prio pcp-prio dscp-prio; echo flush=$?
112+
sudo dcb app add dev {port} default-prio 2; echo default=$?
113+
sudo dcb app add dev {port} pcp-prio 0nd:0; echo pcp_nd=$?
114+
sudo dcb app add dev {port} pcp-prio 1de:1; echo pcp_de=$?
115+
sudo dcb app add dev {port} dscp-prio 46:5; echo dscp=$?
116+
sudo dcb rewr flush dev {port} prio-pcp prio-dscp; echo rewr_flush=$?
117+
sudo dcb rewr add dev {port} prio-dscp 5:40; echo rewr_dscp=$?
118+
sudo dcb rewr add dev {port} prio-pcp 5:5nd; echo rewr_pcp=$?
119+
sudo dcb app show dev {port}
120+
sudo dcb rewr show dev {port}
121+
sudo ethtool -d {port}
122+
sudo dmesg | tail -5
123+
for f in $(sudo find /run -name '*qos*' 2>/dev/null | grep {port}); do echo "== $f"; sudo cat $f; done
124+
sudo dcb app flush dev {port} default-prio pcp-prio dscp-prio; echo flush=$?
125+
sudo dcb app add dev {port} pcp-prio {pcp16}; echo pcp16=$?
126+
sudo dcb app show dev {port} | grep -c prio
127+
sudo dcb app add dev {port} dscp-prio {dscp64}; echo dscp64=$?
128+
sudo dcb app show dev {port} | grep -c prio
129+
sudo dcb app flush dev {port} default-prio pcp-prio dscp-prio; echo flush=$?
130+
sudo dcb app add dev {port} default-prio 2 pcp-prio {pcp16} dscp-prio {dscp64}; echo all=$?
131+
sudo dcb app show dev {port}
132+
sudo dcb app flush dev {port} default-prio pcp-prio dscp-prio; echo flush=$?
133+
sudo dcb app add dev {port} default-prio 2 pcp-prio {pcp16} dscp-prio {dscp64} 2>&1; echo again=$?
134+
sudo dmesg | tail -3
135+
""").stdout)
136+
102137
with test.step("Verify dcb apptrust order is dscp pcp"):
103138
until(lambda: dcb_tokens(tgtssh, "apptrust", port).get("order") == ["dscp", "pcp"])
104139

0 commit comments

Comments
 (0)