* [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc
@ 2023-11-24 15:42 Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin Pedro Tammela
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela
Address the recommendations from the previous series and cleanup some
leftovers.
Pedro Tammela (5):
selftests: tc-testing: remove buildebpf plugin
selftests: tc-testing: remove unnecessary time.sleep
selftests: tc-testing: prefix iproute2 functions with "ipr2"
selftests: tc-testing: cleanup on Ctrl-C
selftests: tc-testing: remove unused import
tools/testing/selftests/tc-testing/Makefile | 29 +-------
tools/testing/selftests/tc-testing/README | 2 -
.../testing/selftests/tc-testing/action-ebpf | Bin 0 -> 856 bytes
.../tc-testing/plugin-lib/buildebpfPlugin.py | 67 ------------------
.../tc-testing/plugin-lib/nsPlugin.py | 20 +++---
.../tc-testing/tc-tests/actions/bpf.json | 14 ++--
.../tc-testing/tc-tests/filters/bpf.json | 10 ++-
tools/testing/selftests/tc-testing/tdc.py | 11 ++-
tools/testing/selftests/tc-testing/tdc.sh | 2 +-
9 files changed, 25 insertions(+), 130 deletions(-)
create mode 100644 tools/testing/selftests/tc-testing/action-ebpf
delete mode 100644 tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py
--
2.40.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
@ 2023-11-24 15:42 ` Pedro Tammela
2023-11-28 2:15 ` Jakub Kicinski
2023-11-24 15:42 ` [PATCH net-next 2/5] selftests: tc-testing: remove unnecessary time.sleep Pedro Tammela
` (5 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela, Davide Caratti
As tdc only tests loading/deleting and anything more complicated is
better left to the ebpf test suite, provide a pre-compiled version of
'action.c' and don't bother compiling it in kselftests or on the fly
at all.
Cc: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
tools/testing/selftests/tc-testing/Makefile | 29 +-------
tools/testing/selftests/tc-testing/README | 2 -
.../testing/selftests/tc-testing/action-ebpf | Bin 0 -> 856 bytes
.../tc-testing/plugin-lib/buildebpfPlugin.py | 67 ------------------
.../tc-testing/tc-tests/actions/bpf.json | 14 ++--
.../tc-testing/tc-tests/filters/bpf.json | 10 ++-
tools/testing/selftests/tc-testing/tdc.sh | 2 +-
7 files changed, 11 insertions(+), 113 deletions(-)
create mode 100644 tools/testing/selftests/tc-testing/action-ebpf
delete mode 100644 tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py
diff --git a/tools/testing/selftests/tc-testing/Makefile b/tools/testing/selftests/tc-testing/Makefile
index b1fa2e177e2f..e8b3dde4fa16 100644
--- a/tools/testing/selftests/tc-testing/Makefile
+++ b/tools/testing/selftests/tc-testing/Makefile
@@ -1,31 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
-include ../../../scripts/Makefile.include
-top_srcdir = $(abspath ../../../..)
-APIDIR := $(top_scrdir)/include/uapi
-TEST_GEN_FILES = action.o
+TEST_PROGS += ./tdc.sh
+TEST_FILES := action-ebpf tdc*.py Tdc*.py plugins plugin-lib tc-tests scripts
include ../lib.mk
-
-PROBE := $(shell $(LLC) -march=bpf -mcpu=probe -filetype=null /dev/null 2>&1)
-
-ifeq ($(PROBE),)
- CPU ?= probe
-else
- CPU ?= generic
-endif
-
-CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \
- | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
-
-CLANG_FLAGS = -I. -I$(APIDIR) \
- $(CLANG_SYS_INCLUDES) \
- -Wno-compare-distinct-pointer-types
-
-$(OUTPUT)/%.o: %.c
- $(CLANG) $(CLANG_FLAGS) \
- -O2 --target=bpf -emit-llvm -c $< -o - | \
- $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@
-
-TEST_PROGS += ./tdc.sh
-TEST_FILES := tdc*.py Tdc*.py plugins plugin-lib tc-tests scripts
diff --git a/tools/testing/selftests/tc-testing/README b/tools/testing/selftests/tc-testing/README
index be7b00799b3e..fc8e858ff119 100644
--- a/tools/testing/selftests/tc-testing/README
+++ b/tools/testing/selftests/tc-testing/README
@@ -195,8 +195,6 @@ directory:
and the other is a test whether the command leaked memory or not.
(This one is a preliminary version, it may not work quite right yet,
but the overall template is there and it should only need tweaks.)
- - buildebpfPlugin.py:
- builds all programs in $EBPFDIR.
ACKNOWLEDGEMENTS
diff --git a/tools/testing/selftests/tc-testing/action-ebpf b/tools/testing/selftests/tc-testing/action-ebpf
new file mode 100644
index 0000000000000000000000000000000000000000..4879479b2ee5c046279be0fe8f9ca313dfb7e618
GIT binary patch
literal 856
zcmb_ayKcfj5L_FFP=-`UX`o1n`2r$0A&n*IpgTFnLKX%`_!N;U`3b&--wH~R684VW
zGukMra)oDhcIIBb_s4kTdmixc;2Y|SRe;%r7+E=j7CQH2*%9vjGf8`~C9?lCIqPKq
z0V7lbI2>i;4uxB2IQfRywbcWscZm%V+i>M{cKD3|LY-|jB&p8JwOW?M`i`k`$r`e-
zC|*}8na?*>z5rF^X|}F1GK49FmEP#&8S!mp@PEb_r>Rd{&-q1E)skfwzsJ=^YYJZ^
zYA*SHxV}g7SDx>m{VgVh?O*Z}>URklWc~pgW_@`FFBFjbmFFLrY<w&cJ}6@0lM0^K
aydN`Ueu^4BW!vY^mI$NC86WSzL;VvvQZ+sR
literal 0
HcmV?d00001
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py
deleted file mode 100644
index d34fe06268d2..000000000000
--- a/tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py
+++ /dev/null
@@ -1,67 +0,0 @@
-'''
-build ebpf program
-'''
-
-import os
-import signal
-from string import Template
-import subprocess
-import time
-from TdcPlugin import TdcPlugin
-from tdc_config import *
-
-class SubPlugin(TdcPlugin):
- def __init__(self):
- self.sub_class = 'buildebpf/SubPlugin'
- self.tap = ''
- super().__init__()
-
- def pre_suite(self, testcount, testidlist):
- super().pre_suite(testcount, testidlist)
-
- if self.args.buildebpf:
- self._ebpf_makeall()
-
- def post_suite(self, index):
- super().post_suite(index)
-
- self._ebpf_makeclean()
-
- def add_args(self, parser):
- super().add_args(parser)
-
- self.argparser_group = self.argparser.add_argument_group(
- 'buildebpf',
- 'options for buildebpfPlugin')
- self.argparser_group.add_argument(
- '--nobuildebpf', action='store_false', default=True,
- dest='buildebpf',
- help='Don\'t build eBPF programs')
-
- return self.argparser
-
- def _ebpf_makeall(self):
- if self.args.buildebpf:
- self._make('all')
-
- def _ebpf_makeclean(self):
- if self.args.buildebpf:
- self._make('clean')
-
- def _make(self, target):
- command = 'make -C {} {}'.format(self.args.NAMES['EBPFDIR'], target)
- proc = subprocess.Popen(command,
- shell=True,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env=os.environ.copy())
- (rawout, serr) = proc.communicate()
-
- if proc.returncode != 0 and len(serr) > 0:
- foutput = serr.decode("utf-8")
- else:
- foutput = rawout.decode("utf-8")
-
- proc.stdout.close()
- proc.stderr.close()
- return proc, foutput
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json b/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json
index 91832400ddbd..6e00bf32ef9a 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json
@@ -54,9 +54,6 @@
"actions",
"bpf"
],
- "plugins": {
- "requires": "buildebpfPlugin"
- },
"setup": [
[
"$TC action flush action bpf",
@@ -65,10 +62,10 @@
255
]
],
- "cmdUnderTest": "$TC action add action bpf object-file $EBPFDIR/action.o section action-ok index 667",
+ "cmdUnderTest": "$TC action add action bpf object-file $EBPFDIR/action-ebpf section action-ok index 667",
"expExitCode": "0",
"verifyCmd": "$TC action get action bpf index 667",
- "matchPattern": "action order [0-9]*: bpf action.o:\\[action-ok\\] id [0-9].* tag [0-9a-f]{16}( jited)? default-action pipe.*index 667 ref",
+ "matchPattern": "action order [0-9]*: bpf action-ebpf:\\[action-ok\\] id [0-9].* tag [0-9a-f]{16}( jited)? default-action pipe.*index 667 ref",
"matchCount": "1",
"teardown": [
"$TC action flush action bpf"
@@ -81,9 +78,6 @@
"actions",
"bpf"
],
- "plugins": {
- "requires": "buildebpfPlugin"
- },
"setup": [
[
"$TC action flush action bpf",
@@ -92,10 +86,10 @@
255
]
],
- "cmdUnderTest": "$TC action add action bpf object-file $EBPFDIR/action.o section action-ko index 667",
+ "cmdUnderTest": "$TC action add action bpf object-file $EBPFDIR/action-ebpf section action-ko index 667",
"expExitCode": "255",
"verifyCmd": "$TC action get action bpf index 667",
- "matchPattern": "action order [0-9]*: bpf action.o:\\[action-ko\\] id [0-9].*index 667 ref",
+ "matchPattern": "action order [0-9]*: bpf action-ebpf:\\[action-ko\\] id [0-9].*index 667 ref",
"matchCount": "0",
"teardown": [
[
diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json b/tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json
index 013fb983bc3f..725d406a30ac 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json
@@ -52,17 +52,16 @@
],
"plugins": {
"requires": [
- "buildebpfPlugin",
"nsPlugin"
]
},
"setup": [
"$TC qdisc add dev $DEV1 ingress"
],
- "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf object-file $EBPFDIR/action.o section action-ok",
+ "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf object-file $EBPFDIR/action-ebpf section action-ok",
"expExitCode": "0",
"verifyCmd": "$TC filter get dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf",
- "matchPattern": "filter parent ffff: protocol ip pref 100 bpf chain [0-9]+ handle 0x1 action.o:\\[action-ok\\].*tag [0-9a-f]{16}( jited)?",
+ "matchPattern": "filter parent ffff: protocol ip pref 100 bpf chain [0-9]+ handle 0x1 action-ebpf:\\[action-ok\\].*tag [0-9a-f]{16}( jited)?",
"matchCount": "1",
"teardown": [
"$TC qdisc del dev $DEV1 ingress"
@@ -77,17 +76,16 @@
],
"plugins": {
"requires": [
- "buildebpfPlugin",
"nsPlugin"
]
},
"setup": [
"$TC qdisc add dev $DEV1 ingress"
],
- "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf object-file $EBPFDIR/action.o section action-ko",
+ "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf object-file $EBPFDIR/action-ebpf section action-ko",
"expExitCode": "1",
"verifyCmd": "$TC filter get dev $DEV1 parent ffff: handle 1 protocol ip prio 100 bpf",
- "matchPattern": "filter parent ffff: protocol ip pref 100 bpf chain [0-9]+ handle 0x1 action.o:\\[action-ko\\].*tag [0-9a-f]{16}( jited)?",
+ "matchPattern": "filter parent ffff: protocol ip pref 100 bpf chain [0-9]+ handle 0x1 action-ebpf:\\[action-ko\\].*tag [0-9a-f]{16}( jited)?",
"matchCount": "0",
"teardown": [
"$TC qdisc del dev $DEV1 ingress"
diff --git a/tools/testing/selftests/tc-testing/tdc.sh b/tools/testing/selftests/tc-testing/tdc.sh
index 4dbe50bde5a0..407fa53822a0 100755
--- a/tools/testing/selftests/tc-testing/tdc.sh
+++ b/tools/testing/selftests/tc-testing/tdc.sh
@@ -64,5 +64,5 @@ try_modprobe sch_hfsc
try_modprobe sch_hhf
try_modprobe sch_htb
try_modprobe sch_teql
-./tdc.py -J`nproc` -c actions --nobuildebpf
+./tdc.py -J`nproc` -c actions
./tdc.py -J`nproc` -c qdisc
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 2/5] selftests: tc-testing: remove unnecessary time.sleep
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin Pedro Tammela
@ 2023-11-24 15:42 ` Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 3/5] selftests: tc-testing: prefix iproute2 functions with "ipr2" Pedro Tammela
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela
This operation is redundant and it's not stabilizing nor waiting
for anything.
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
tools/testing/selftests/tc-testing/tdc.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/tdc.py b/tools/testing/selftests/tc-testing/tdc.py
index 669ec89ebfe1..c5ec861687b6 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -497,11 +497,6 @@ def prepare_run(pm, args, testlist):
pm.call_post_suite(1)
return emergency_exit_message
- if args.verbose:
- print('give test rig 2 seconds to stabilize')
-
- time.sleep(2)
-
def purge_run(pm, index):
pm.call_post_suite(index)
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 3/5] selftests: tc-testing: prefix iproute2 functions with "ipr2"
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 2/5] selftests: tc-testing: remove unnecessary time.sleep Pedro Tammela
@ 2023-11-24 15:42 ` Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 4/5] selftests: tc-testing: cleanup on Ctrl-C Pedro Tammela
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela, Simon Horman
As suggested by Simon, prefix the functions that operate on iproute2
commands in contrast with the "nl" netlink prefix.
Cc: Simon Horman <horms@kernel.org>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
.../selftests/tc-testing/plugin-lib/nsPlugin.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
index 65c8f3f983b9..dc7a0597cf44 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
@@ -37,7 +37,7 @@ class SubPlugin(TdcPlugin):
if netlink == True:
self._nl_ns_create()
else:
- self._ns_create()
+ self._ipr2_ns_create()
# Make sure the netns is visible in the fs
ticks = 20
@@ -71,7 +71,7 @@ class SubPlugin(TdcPlugin):
if netlink == True:
self._nl_ns_destroy()
else:
- self._ns_destroy()
+ self._ipr2_ns_destroy()
def post_suite(self, index):
if self.args.verbose:
@@ -161,7 +161,7 @@ class SubPlugin(TdcPlugin):
ticks -= 1
continue
- def _ns_create_cmds(self):
+ def _ipr2_ns_create_cmds(self):
cmds = []
ns = self.args.NAMES['NS']
@@ -181,26 +181,26 @@ class SubPlugin(TdcPlugin):
return cmds
- def _ns_create(self):
+ def _ipr2_ns_create(self):
'''
Create the network namespace in which the tests will be run and set up
the required network devices for it.
'''
- self._exec_cmd_batched('pre', self._ns_create_cmds())
+ self._exec_cmd_batched('pre', self._ipr2_ns_create_cmds())
def _nl_ns_destroy(self):
ns = self.args.NAMES['NS']
netns.remove(ns)
- def _ns_destroy_cmd(self):
+ def _ipr2_ns_destroy_cmd(self):
return self._replace_keywords('netns delete {}'.format(self.args.NAMES['NS']))
- def _ns_destroy(self):
+ def _ipr2_ns_destroy(self):
'''
Destroy the network namespace for testing (and any associated network
devices as well)
'''
- self._exec_cmd('post', self._ns_destroy_cmd())
+ self._exec_cmd('post', self._ipr2_ns_destroy_cmd())
@cached_property
def _proc(self):
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 4/5] selftests: tc-testing: cleanup on Ctrl-C
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
` (2 preceding siblings ...)
2023-11-24 15:42 ` [PATCH net-next 3/5] selftests: tc-testing: prefix iproute2 functions with "ipr2" Pedro Tammela
@ 2023-11-24 15:42 ` Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 5/5] selftests: tc-testing: remove unused import Pedro Tammela
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela
Cleanup net namespaces and other resources if we get a SIGINT (Ctrl-C).
As user visible resources are allocated on a per test basis, it's only
required to catch this condition when (possibly) running tests.
So far calling post_suite is enough to free up anything that might
linger.
A missing keyword replacement for nsPlugin is also included.
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py | 2 +-
tools/testing/selftests/tc-testing/tdc.py | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
index dc7a0597cf44..77b1106b8388 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
@@ -78,7 +78,7 @@ class SubPlugin(TdcPlugin):
print('{}.post_suite'.format(self.sub_class))
# Make sure we don't leak resources
- cmd = "$IP -a netns del"
+ cmd = self._replace_keywords("$IP -a netns del")
if self.args.verbose > 3:
print('_exec_cmd: command "{}"'.format(cmd))
diff --git a/tools/testing/selftests/tc-testing/tdc.py b/tools/testing/selftests/tc-testing/tdc.py
index c5ec861687b6..caeacc691587 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -1018,7 +1018,11 @@ def main():
if args.verbose > 2:
print('args is {}'.format(args))
- set_operation_mode(pm, parser, args, remaining)
+ try:
+ set_operation_mode(pm, parser, args, remaining)
+ except KeyboardInterrupt:
+ # Cleanup on Ctrl-C
+ pm.call_post_suite(None)
if __name__ == "__main__":
main()
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 5/5] selftests: tc-testing: remove unused import
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
` (3 preceding siblings ...)
2023-11-24 15:42 ` [PATCH net-next 4/5] selftests: tc-testing: cleanup on Ctrl-C Pedro Tammela
@ 2023-11-24 15:42 ` Pedro Tammela
2023-11-27 15:48 ` [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Jamal Hadi Salim
2023-11-28 2:20 ` patchwork-bot+netdevbpf
6 siblings, 0 replies; 9+ messages in thread
From: Pedro Tammela @ 2023-11-24 15:42 UTC (permalink / raw
To: netdev
Cc: jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm, Pedro Tammela
Remove this leftover from the times we pre-allocated everything
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
index 77b1106b8388..bb19b8b76d3b 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
@@ -23,8 +23,6 @@ class SubPlugin(TdcPlugin):
super().__init__()
def pre_suite(self, testcount, testlist):
- from itertools import cycle
-
super().pre_suite(testcount, testlist)
def prepare_test(self, test):
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
` (4 preceding siblings ...)
2023-11-24 15:42 ` [PATCH net-next 5/5] selftests: tc-testing: remove unused import Pedro Tammela
@ 2023-11-27 15:48 ` Jamal Hadi Salim
2023-11-28 2:20 ` patchwork-bot+netdevbpf
6 siblings, 0 replies; 9+ messages in thread
From: Jamal Hadi Salim @ 2023-11-27 15:48 UTC (permalink / raw
To: Pedro Tammela
Cc: netdev, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm
On Fri, Nov 24, 2023 at 10:43 AM Pedro Tammela <pctammela@mojatatu.com> wrote:
>
> Address the recommendations from the previous series and cleanup some
> leftovers.
>
> Pedro Tammela (5):
> selftests: tc-testing: remove buildebpf plugin
> selftests: tc-testing: remove unnecessary time.sleep
> selftests: tc-testing: prefix iproute2 functions with "ipr2"
> selftests: tc-testing: cleanup on Ctrl-C
> selftests: tc-testing: remove unused import
>
> tools/testing/selftests/tc-testing/Makefile | 29 +-------
> tools/testing/selftests/tc-testing/README | 2 -
> .../testing/selftests/tc-testing/action-ebpf | Bin 0 -> 856 bytes
> .../tc-testing/plugin-lib/buildebpfPlugin.py | 67 ------------------
> .../tc-testing/plugin-lib/nsPlugin.py | 20 +++---
> .../tc-testing/tc-tests/actions/bpf.json | 14 ++--
> .../tc-testing/tc-tests/filters/bpf.json | 10 ++-
> tools/testing/selftests/tc-testing/tdc.py | 11 ++-
> tools/testing/selftests/tc-testing/tdc.sh | 2 +-
> 9 files changed, 25 insertions(+), 130 deletions(-)
> create mode 100644 tools/testing/selftests/tc-testing/action-ebpf
> delete mode 100644 tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py
For the patch series:
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
cheers,
jamal
> --
> 2.40.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin
2023-11-24 15:42 ` [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin Pedro Tammela
@ 2023-11-28 2:15 ` Jakub Kicinski
0 siblings, 0 replies; 9+ messages in thread
From: Jakub Kicinski @ 2023-11-28 2:15 UTC (permalink / raw
To: Pedro Tammela
Cc: netdev, jhs, xiyou.wangcong, jiri, davem, pabeni, edumazet,
linux-kselftest, bpf, llvm, Davide Caratti
On Fri, 24 Nov 2023 12:42:44 -0300 Pedro Tammela wrote:
> diff --git a/tools/testing/selftests/tc-testing/Makefile b/tools/testing/selftests/tc-testing/Makefile
> index b1fa2e177e2f..e8b3dde4fa16 100644
> --- a/tools/testing/selftests/tc-testing/Makefile
> +++ b/tools/testing/selftests/tc-testing/Makefile
> @@ -1,31 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
> -include ../../../scripts/Makefile.include
>
> -top_srcdir = $(abspath ../../../..)
> -APIDIR := $(top_scrdir)/include/uapi
> -TEST_GEN_FILES = action.o
> +TEST_PROGS += ./tdc.sh
nit: could you try to remove the ./ prefix, as a follow up?
I think it's not necessary and it confuses one of patchwork checks.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
` (5 preceding siblings ...)
2023-11-27 15:48 ` [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Jamal Hadi Salim
@ 2023-11-28 2:20 ` patchwork-bot+netdevbpf
6 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-11-28 2:20 UTC (permalink / raw
To: Pedro Tammela
Cc: netdev, jhs, xiyou.wangcong, jiri, davem, kuba, pabeni, edumazet,
linux-kselftest, bpf, llvm
Hello:
This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Fri, 24 Nov 2023 12:42:43 -0300 you wrote:
> Address the recommendations from the previous series and cleanup some
> leftovers.
>
> Pedro Tammela (5):
> selftests: tc-testing: remove buildebpf plugin
> selftests: tc-testing: remove unnecessary time.sleep
> selftests: tc-testing: prefix iproute2 functions with "ipr2"
> selftests: tc-testing: cleanup on Ctrl-C
> selftests: tc-testing: remove unused import
>
> [...]
Here is the summary with links:
- [net-next,1/5] selftests: tc-testing: remove buildebpf plugin
https://git.kernel.org/netdev/net-next/c/a79d8ba734bd
- [net-next,2/5] selftests: tc-testing: remove unnecessary time.sleep
https://git.kernel.org/netdev/net-next/c/8059e68b9928
- [net-next,3/5] selftests: tc-testing: prefix iproute2 functions with "ipr2"
https://git.kernel.org/netdev/net-next/c/56e16bc69bb7
- [net-next,4/5] selftests: tc-testing: cleanup on Ctrl-C
https://git.kernel.org/netdev/net-next/c/501679f5d4a4
- [net-next,5/5] selftests: tc-testing: remove unused import
https://git.kernel.org/netdev/net-next/c/ed346fccfc40
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-11-28 2:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-24 15:42 [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 1/5] selftests: tc-testing: remove buildebpf plugin Pedro Tammela
2023-11-28 2:15 ` Jakub Kicinski
2023-11-24 15:42 ` [PATCH net-next 2/5] selftests: tc-testing: remove unnecessary time.sleep Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 3/5] selftests: tc-testing: prefix iproute2 functions with "ipr2" Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 4/5] selftests: tc-testing: cleanup on Ctrl-C Pedro Tammela
2023-11-24 15:42 ` [PATCH net-next 5/5] selftests: tc-testing: remove unused import Pedro Tammela
2023-11-27 15:48 ` [PATCH net-next 0/5] selftests: tc-testing: updates and cleanups for tdc Jamal Hadi Salim
2023-11-28 2:20 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.