* [PATCH v2 net] selftests/tc-testing: pass mp_pm via initialiser
@ 2026-09-03 10:36 Florian Westphal
2026-09-04 11:01 ` netdev-bot+sashiko
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2026-09-03 10:36 UTC (permalink / raw)
To: netdev; +Cc: jhs, jiri, victor, Florian Westphal
The script doesn't work for me, "tdc.py -J32" gives:
-- ns/SubPlugin.__init__
Executing 1205 tests in parallel and 89 in serial
Using 39 batches and 4 workers
multiprocessing.pool.RemoteTraceback:
"""
Traceback (most recent call last):
File "/usr/lib/python3.14/multiprocessing/pool.py", line 125, in worker
result = (True, func(*args, **kwds))
~~~~^^^^^^^^^^^^^^^
File "/usr/lib/python3.14/multiprocessing/pool.py", line 48, in mapstar
return list(map(*args))
File "tools/testing/selftests/tc-testing/tdc.py", line 604, in __mp_runner
(_, tsr) = test_runner(mp_pm, mp_args, tests)
^^^^^
NameError: name 'mp_pm' is not defined
Other problem:
run_one_test() appends random suffix to NAMES[+ (NS, DEV0, ...).
There is a chance that other run_one_test instances pick up the altered
string, not the configured one and append another random suffix.
This causes spurious error when pyroute2 plugin tries to add
a device like "dummy0id1234idabcd".
Keep NAMES[] as-is. Append only to args.NAMES and update
readers to use args.NAMES too.
Assisted-by: ollama:gemma4:26b
Signed-off-by: Florian Westphal <fw@strlen.de>
---
v2:
- detach from 'reset conntrack after packet munging' series.
- make global NAMES readonly, only change local copy.
.../tc-testing/plugin-lib/scapyPlugin.py | 2 +-
tools/testing/selftests/tc-testing/tdc.py | 64 +++++++++----------
2 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py
index 254136e3da5a..26998deea0b6 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py
@@ -49,6 +49,6 @@ class SubPlugin(TdcPlugin):
pkt = eval(scapyinfo['packet'])
if '$' in scapyinfo['iface']:
tpl = Template(scapyinfo['iface'])
- scapyinfo['iface'] = tpl.safe_substitute(NAMES)
+ scapyinfo['iface'] = tpl.safe_substitute(self.args.NAMES)
for count in range(scapyinfo['count']):
sendp(pkt, iface=scapyinfo['iface'])
diff --git a/tools/testing/selftests/tc-testing/tdc.py b/tools/testing/selftests/tc-testing/tdc.py
index 511d66c36a2a..7c7f96aaef55 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -188,13 +188,13 @@ class PluginMgr:
self.argparser = argparse.ArgumentParser(
description='Linux TC unit tests')
-def replace_keywords(cmd):
+def replace_keywords(cmd, names):
"""
For a given executable command, substitute any known
variables contained within NAMES with the correct values
"""
tcmd = Template(cmd)
- subcmd = tcmd.safe_substitute(NAMES)
+ subcmd = tcmd.safe_substitute(names)
return subcmd
@@ -206,7 +206,7 @@ def exec_cmd(caseinfo, args, pm, stage, command):
if len(command.strip()) == 0:
return None, None
if '$' in command:
- command = replace_keywords(command)
+ command = replace_keywords(command, args.NAMES)
command = pm.call_adjust_command(caseinfo, stage, command)
if args.verbose > 0:
@@ -374,11 +374,6 @@ def find_in_json_other(res, outputJSONVal, matchJSONVal, matchJSONKey=None):
def run_one_test(pm, args, index, tidx):
global NAMES
- ns = NAMES['NS']
- dev0 = NAMES['DEV0']
- dev1 = NAMES['DEV1']
- dummy = NAMES['DUMMY']
- ifb = NAMES['IFB']
result = True
tresult = ""
tap = ""
@@ -396,6 +391,15 @@ def run_one_test(pm, args, index, tidx):
pm.call_post_execute(tidx)
return res
+ # populate NAMES with TESTID for this test
+ args.NAMES = NAMES.copy()
+ args.NAMES['TESTID'] = tidx['id']
+ args.NAMES['NS'] = '{}-{}'.format(NAMES['NS'], tidx['random'])
+ args.NAMES['DEV0'] = '{}id{}'.format(NAMES['DEV0'], tidx['id'])
+ args.NAMES['DEV1'] = '{}id{}'.format(NAMES['DEV1'], tidx['id'])
+ args.NAMES['DUMMY'] = '{}id{}'.format(NAMES['DUMMY'], tidx['id'])
+ args.NAMES['IFB'] = '{}id{}'.format(NAMES['IFB'], tidx['id'])
+
if 'dependsOn' in tidx:
if (args.verbose > 0):
print('probe command for test skip')
@@ -409,13 +413,6 @@ def run_one_test(pm, args, index, tidx):
pm.call_post_execute(tidx)
return res
- # populate NAMES with TESTID for this test
- NAMES['TESTID'] = tidx['id']
- NAMES['NS'] = '{}-{}'.format(NAMES['NS'], tidx['random'])
- NAMES['DEV0'] = '{}id{}'.format(NAMES['DEV0'], tidx['id'])
- NAMES['DEV1'] = '{}id{}'.format(NAMES['DEV1'], tidx['id'])
- NAMES['DUMMY'] = '{}id{}'.format(NAMES['DUMMY'], tidx['id'])
- NAMES['IFB'] = '{}id{}'.format(NAMES['IFB'], tidx['id'])
pm.call_pre_case(tidx)
prepare_env(tidx, args, pm, 'setup', "-----> prepare stage", tidx["setup"])
@@ -468,16 +465,6 @@ def run_one_test(pm, args, index, tidx):
index += 1
- # remove TESTID from NAMES
- del(NAMES['TESTID'])
-
- # Restore names
- NAMES['NS'] = ns
- NAMES['DEV0'] = dev0
- NAMES['DEV1'] = dev1
- NAMES['DUMMY'] = dummy
- NAMES['IFB'] = ifb
-
return res
def prepare_run(pm, args, testlist):
@@ -600,6 +587,18 @@ def mp_bins(alltests):
return (serial, parallel)
+mp_pm = None
+mp_args = None
+
+def __mp_init__(pm, args):
+ """
+ This function is called once when each worker process starts.
+ It sets the global variables in the child process's memory space.
+ """
+ global mp_pm, mp_args
+ mp_pm = pm
+ mp_args = args
+
def __mp_runner(tests):
(_, tsr) = test_runner(mp_pm, mp_args, tests)
return tsr._testsuite
@@ -615,14 +614,13 @@ def test_runner_mp(pm, args, alltests):
print("Executing {} tests in parallel and {} in serial".format(len(parallel), len(serial)))
print("Using {} batches and {} workers".format(len(batches), args.mp))
- # We can't pickle these objects so workaround them
- global mp_pm
- mp_pm = pm
-
- global mp_args
- mp_args = args
-
- with Pool(args.mp) as p:
+ # Use the 'initializer' to pass the unpickleable/shared objects
+ # to each worker process exactly once upon startup.
+ with Pool(
+ processes=args.mp,
+ initializer=__mp_init__,
+ initargs=(pm, args)
+ ) as p:
pres = p.map(__mp_runner, batches)
tsr = TestSuiteReport()
--
2.55.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2 net] selftests/tc-testing: pass mp_pm via initialiser
2026-09-03 10:36 [PATCH v2 net] selftests/tc-testing: pass mp_pm via initialiser Florian Westphal
@ 2026-09-04 11:01 ` netdev-bot+sashiko
0 siblings, 0 replies; 2+ messages in thread
From: netdev-bot+sashiko @ 2026-09-04 11:01 UTC (permalink / raw)
To: fw; +Cc: netdev, jhs, jiri, victor, kuba
Thank you for your contribution! Sashiko AI review found 3 potential
issue(s) to consider:
Critical: 0 · High: 0 · Medium: 1 · Low: 2
- [Medium] run_one_test() (tools/testing/selftests/tc-
testing/tdc.py:394-401) rebuilds the per-test substitution dictionary…
- [Low] The new comment in test_runner_mp() (tdc.py:617-618) states "Use
the 'initializer' to pass the unpickleable/shared objects to each…
- [Low] The commit fixes two independent, user-visible breakages and
carries no `Fixes:` tag for either, and squashes them into a single…
--
selftests/tc-testing: pass mp_pm via initialiser
This passes pm and args to the multiprocessing workers via
Pool(initializer=...) instead of relying on module globals, and stops
run_one_test() from mutating the module-global NAMES dictionary by
building a per-test copy in args.NAMES. Readers of the substitution
dictionary are converted to args.NAMES.
No Link: tags in the commit header.
> diff --git a/tools/testing/selftests/tc-testing/tdc.py b/tools/testing/selftests/tc-testing/tdc.py
> index 511d66c36a2a..7c7f96aaef55 100755
> --- a/tools/testing/selftests/tc-testing/tdc.py
> +++ b/tools/testing/selftests/tc-testing/tdc.py
[ ... ]
> @@ -206,7 +206,7 @@ def exec_cmd(caseinfo, args, pm, stage, command):
> if len(command.strip()) == 0:
> return None, None
> if '$' in command:
> - command = replace_keywords(command)
> + command = replace_keywords(command, args.NAMES)
>
> command = pm.call_adjust_command(caseinfo, stage, command)
> if args.verbose > 0:
[ ... ]
> @@ -396,6 +391,15 @@ def run_one_test(pm, args, index, tidx):
> pm.call_post_execute(tidx)
> return res
>
> + # populate NAMES with TESTID for this test
> + args.NAMES = NAMES.copy()
> + args.NAMES['TESTID'] = tidx['id']
> + args.NAMES['NS'] = '{}-{}'.format(NAMES['NS'], tidx['random'])
> + args.NAMES['DEV0'] = '{}id{}'.format(NAMES['DEV0'], tidx['id'])
> + args.NAMES['DEV1'] = '{}id{}'.format(NAMES['DEV1'], tidx['id'])
> + args.NAMES['DUMMY'] = '{}id{}'.format(NAMES['DUMMY'], tidx['id'])
> + args.NAMES['IFB'] = '{}id{}'.format(NAMES['IFB'], tidx['id'])
> +
[Severity: Medium]
Should this copy start from args.NAMES rather than from the module-global
NAMES?
In a worker process the module-global NAMES is the pristine dict imported
from tdc_config.py, because with a non-fork start method the worker
re-imports tdc.py as __mp_main__. That is exactly the situation the first
half of this patch addresses: the reported "NameError: name 'mp_pm' is not
defined" only happens because the child does not inherit parent module
state.
The only place -p/--path and -d/--device are applied is
check_default_settings(), which runs in the parent only:
if args.path != None:
NAMES['TC'] = args.path
if args.device != None:
NAMES['DEV2'] = args.device
The configured dict does reach the worker as args.NAMES through
initargs=(pm, args), and run_one_test() then discards it with
args.NAMES = NAMES.copy().
So for "tdc.py -J4 -p /my/build/tc", do the parallel tests end up running
/sbin/tc instead of the requested binary? The parent validated args.path,
not /sbin/tc, so if /sbin/tc is missing the parallel tests would all fail.
Similarly with -d <nic>: in the worker args.device stays set while
args.NAMES['DEV2'] is '', so $DEV2 expands to nothing and
nsPlugin._ipr2_ns_create_cmds() emits commands like
link set netns <ns>
netns exec <ns> $IP link set up
which iproute2 rejects and _proc_check() turns into a RuntimeError.
Also, exec_cmd() still reads the module-global dict for the timeout:
(rawout, serr) = proc.communicate(timeout=NAMES['TIMEOUT'])
while its substitution path now uses args.NAMES. Should that reader be
converted too, so there is a single source of truth inside a worker?
One note on the shape of a fix: args.NAMES = args.NAMES.copy() would not
work, since args.NAMES is reassigned per test and would re-accumulate the
id<ID> suffixes this patch removes. Keeping a pristine copy of the
configured names (for example on args, or passed through __mp_init__) and
deriving each test's dict from that would avoid both problems.
[ ... ]
> @@ -600,6 +587,18 @@ def mp_bins(alltests):
>
> return (serial, parallel)
>
> +mp_pm = None
> +mp_args = None
> +
> +def __mp_init__(pm, args):
> + """
> + This function is called once when each worker process starts.
> + It sets the global variables in the child process's memory space.
> + """
> + global mp_pm, mp_args
> + mp_pm = pm
> + mp_args = args
> +
> def __mp_runner(tests):
> (_, tsr) = test_runner(mp_pm, mp_args, tests)
> return tsr._testsuite
> @@ -615,14 +614,13 @@ def test_runner_mp(pm, args, alltests):
> print("Executing {} tests in parallel and {} in serial".format(len(parallel), len(serial)))
> print("Using {} batches and {} workers".format(len(batches), args.mp))
>
> - # We can't pickle these objects so workaround them
> - global mp_pm
> - mp_pm = pm
> -
> - global mp_args
> - mp_args = args
> -
> - with Pool(args.mp) as p:
> + # Use the 'initializer' to pass the unpickleable/shared objects
> + # to each worker process exactly once upon startup.
^^^^^^^^^^^^^^^^^^^^^^^
[Severity: Low]
Is the word "unpickleable" right here? With forkserver or spawn,
multiprocessing serialises the worker bootstrap payload, initargs
included, so pm and args have to be picklable for this to work at all.
If they really were unpicklable, Pool() would raise in the parent before
__mp_init__() ever ran, and the run would abort with zero tests executed.
The baseline comment said the opposite ("We can't pickle these objects so
workaround them"); could the new comment say that pm and args are now
required to be picklable, so the requirement is visible to whoever adds
the next plugin?
I checked the objects currently shipped and they do pickle: tdc.py
registers its module-level identity() via
parser.register('type', None, identity), and nsPlugin's cached_property
_proc (a subprocess.Popen) is not materialised before Pool() is created,
since prepare_run() -> call_pre_suite() only records testcount/testlist.
So there is no failure today. A plugin from plugin-lib-custom or
$TDC_PLUGIN_DIR that caches a Popen or a socket in pre_suite() would
break -J only on newer Python versions.
Could the changelog also name the root cause, that Python 3.14 changed
the default start method on Linux from fork to forkserver, so the old
global mp_pm inheritance no longer works? As written, a backporter
cannot tell that the failure is Python-version dependent.
> + with Pool(
> + processes=args.mp,
> + initializer=__mp_init__,
> + initargs=(pm, args)
> + ) as p:
> pres = p.map(__mp_runner, batches)
[Severity: Low]
Could this be split into two patches, each with a Fixes: tag?
The two problems have separate origins. The -J NameError comes from the
global mp_pm/mp_args workaround and the test_runner(mp_pm, mp_args, tests)
call in __mp_runner(), added by ac9b829309646 ("selftests/tc-testing:
implement tdc parallel test run").
The doubly-suffixed names such as dummy0id1234idabcd come from the
mutate-the-global-and-restore pattern in run_one_test() (the
ns = NAMES['NS'] ... ifb = NAMES['IFB'] save and the restore at the end),
added by 98cfbe4234a41, with the IFB entry added later by 4177fd4469824.
The restore is skipped whenever prepare_env() raises PluginMgrTestFail,
since test_runner() breaks out of the loop, and the worker process is then
reused for the next batch with the suffixed names still in the global.
As one patch, a maintainer cannot pick up the multiprocessing initializer
fix without also taking the NAMES ownership rework.
--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260903103621.13160-1-fw%40strlen.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-04 11:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-03 10:36 [PATCH v2 net] selftests/tc-testing: pass mp_pm via initialiser Florian Westphal
2026-09-04 11:01 ` netdev-bot+sashiko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox