OSDN Git Service

selftests/bpf/test_offload.py: Reset ethtool features after failed setting
authorToke Høiland-Jørgensen <toke@redhat.com>
Wed, 9 Dec 2020 13:57:42 +0000 (14:57 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 9 Dec 2020 15:27:42 +0000 (16:27 +0100)
When setting the ethtool feature flag fails (as expected for the test), the
kernel now tracks that the feature was requested to be 'off' and refuses to
subsequently disable it again. So reset it back to 'on' so a subsequent
disable (that's not supposed to fail) can succeed.

Fixes: 417ec26477a5 ("selftests/bpf: add offload test based on netdevsim")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/bpf/160752226280.110217.10696241563705667871.stgit@toke.dk
tools/testing/selftests/bpf/test_offload.py

index 51a5e4d..2128fbd 100755 (executable)
@@ -946,6 +946,7 @@ try:
     start_test("Test disabling TC offloads is rejected while filters installed...")
     ret, _ = sim.set_ethtool_tc_offloads(False, fail=False)
     fail(ret == 0, "Driver should refuse to disable TC offloads with filters installed...")
+    sim.set_ethtool_tc_offloads(True)
 
     start_test("Test qdisc removal frees things...")
     sim.tc_flush_filters()