Jakub Kicinski kuba@kernel.org writes:
Add drivers/net as a target for mixed-use tests. The setup is expected to work similarly to the forwarding tests. Since we only need one interface (unlike forwarding tests) read the target device name from NETIF. If not present we'll try to run the test against netdevsim.
Signed-off-by: Jakub Kicinski kuba@kernel.org
Reviewed-by: Petr Machata petrm@nvidia.com
However:
diff --git a/tools/testing/selftests/net/lib/py/nsim.py b/tools/testing/selftests/net/lib/py/nsim.py new file mode 100644 index 000000000000..25ae0d081788 --- /dev/null +++ b/tools/testing/selftests/net/lib/py/nsim.py @@ -0,0 +1,118 @@ +# SPDX-License-Identifier: GPL-2.0
+import json +import os +import random +import re +import time +from .utils import cmd, ip
+class NetdevSim:
- """
- Class for netdevsim netdevice and its attributes.
- """
- def __init__(self, nsimdev, port_index, ifname, ns=None):
# In case udev renamed the netdev to according to new schema,# check if the name matches the port_index.nsimnamere = re.compile(r"eni\d+np(\d+)")match = nsimnamere.match(ifname)if match and int(match.groups()[0]) != port_index + 1:raise Exception("netdevice name mismatches the expected one")self.ifname = ifnameself.nsimdev = nsimdevself.port_index = port_indexself.ns = nsself.dfs_dir = "%s/ports/%u/" % (nsimdev.dfs_dir, port_index)ret = ip("-j link show dev %s" % ifname, ns=ns)self.dev = json.loads(ret.stdout)[0]
I don't think self.ifname, .ns, .dfs_dir, .dev are actually used outside of this function.
- def dfs_write(self, path, val):
self.nsimdev.dfs_write(f'ports/{self.port_index}/' + path, val)+class NetdevSimDev:
- """
- Class for netdevsim bus device and its attributes.
- """
- @staticmethod
- def ctrl_write(path, val):
fullpath = os.path.join("/sys/bus/netdevsim/", path)with open(fullpath, "w") as f:f.write(val)- def dfs_write(self, path, val):
fullpath = os.path.join(f"/sys/kernel/debug/netdevsim/netdevsim{self.addr}/", path)with open(fullpath, "w") as f:f.write(val)- def __init__(self, port_count=1, ns=None):
# nsim will spawn in init_net, we'll set to actual ns once we switch it the.sre
the.sre?