Without NETIF, NetDrvEpEnv addresses its pair of netdevsim devices from nsim_v4_pfx and nsim_v6_pfx and brings them up in create_local(). A following patch lets the env create a veth pair instead, which needs the same addresses and setup. Rename the prefixes to sw_v4_pfx and sw_v6_pfx, as they serve any software interface pair, and update tso.py, which builds its tunnel addresses from them. Move the address and link setup out of create_local() into _setup_sw_ifaces(), which takes the names of the local interface and its peer. No functional change. Signed-off-by: Maciej Fijalkowski --- tools/testing/selftests/drivers/net/hw/tso.py | 8 ++--- .../selftests/drivers/net/lib/py/env.py | 29 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/tso.py b/tools/testing/selftests/drivers/net/hw/tso.py index 176ddf97fabb..5fd6d3d2ec73 100755 --- a/tools/testing/selftests/drivers/net/hw/tso.py +++ b/tools/testing/selftests/drivers/net/hw/tso.py @@ -245,10 +245,10 @@ def run_big_tcp_stream(cfg, ipver, remote_v4, remote_v6): def build_tunnel(cfg, outer_ipver, tun_info): - local_v4 = NetDrvEpEnv.nsim_v4_pfx + "1" - local_v6 = NetDrvEpEnv.nsim_v6_pfx + "1" - remote_v4 = NetDrvEpEnv.nsim_v4_pfx + "2" - remote_v6 = NetDrvEpEnv.nsim_v6_pfx + "2" + local_v4 = NetDrvEpEnv.sw_v4_pfx + "1" + local_v6 = NetDrvEpEnv.sw_v6_pfx + "1" + remote_v4 = NetDrvEpEnv.sw_v4_pfx + "2" + remote_v6 = NetDrvEpEnv.sw_v6_pfx + "2" local_addr = cfg.addr_v[outer_ipver] remote_addr = cfg.remote_addr_v[outer_ipver] diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py index 6262080a8bf4..c1d58bef754f 100644 --- a/tools/testing/selftests/drivers/net/lib/py/env.py +++ b/tools/testing/selftests/drivers/net/lib/py/env.py @@ -129,8 +129,8 @@ class NetDrvEpEnv(NetDrvEnvBase): """ # Network prefixes used for local tests - nsim_v4_pfx = "192.0.2." - nsim_v6_pfx = "2001:db8::" + sw_v4_pfx = "192.0.2." + sw_v6_pfx = "2001:db8::" def __init__(self, src_path, nsim_test=None, queue_count=None): super().__init__(src_path) @@ -169,10 +169,10 @@ class NetDrvEpEnv(NetDrvEnvBase): self.dev = self._ns.nsims[0].dev - self.addr_v["4"] = self.nsim_v4_pfx + "1" - self.addr_v["6"] = self.nsim_v6_pfx + "1" - self.remote_addr_v["4"] = self.nsim_v4_pfx + "2" - self.remote_addr_v["6"] = self.nsim_v6_pfx + "2" + self.addr_v["4"] = self.sw_v4_pfx + "1" + self.addr_v["6"] = self.sw_v6_pfx + "1" + self.remote_addr_v["4"] = self.sw_v4_pfx + "2" + self.remote_addr_v["6"] = self.sw_v6_pfx + "2" kind = "netns" args = self._netns.name @@ -208,13 +208,18 @@ class NetDrvEpEnv(NetDrvEnvBase): NetdevSimDev.ctrl_write('link_device', f'{nsfd0.fileno()}:{ifi0} {nsfd1.fileno()}:{ifi1}') - ip(f" addr add dev {self._ns.nsims[0].ifname} {self.nsim_v4_pfx}1/24") - ip(f"-6 addr add dev {self._ns.nsims[0].ifname} {self.nsim_v6_pfx}1/64 nodad") - ip(f" link set dev {self._ns.nsims[0].ifname} up") + self._setup_sw_ifaces(self._ns.nsims[0].ifname, + self._ns_peer.nsims[0].ifname) - ip(f" addr add dev {self._ns_peer.nsims[0].ifname} {self.nsim_v4_pfx}2/24", ns=self._netns) - ip(f"-6 addr add dev {self._ns_peer.nsims[0].ifname} {self.nsim_v6_pfx}2/64 nodad", ns=self._netns) - ip(f" link set dev {self._ns_peer.nsims[0].ifname} up", ns=self._netns) + def _setup_sw_ifaces(self, ifname, peer_ifname): + """Address and bring up a local interface and its peer in _netns.""" + ip(f" addr add dev {ifname} {self.sw_v4_pfx}1/24") + ip(f"-6 addr add dev {ifname} {self.sw_v6_pfx}1/64 nodad") + ip(f" link set dev {ifname} up") + + ip(f" addr add dev {peer_ifname} {self.sw_v4_pfx}2/24", ns=self._netns) + ip(f"-6 addr add dev {peer_ifname} {self.sw_v6_pfx}2/64 nodad", ns=self._netns) + ip(f" link set dev {peer_ifname} up", ns=self._netns) def _check_env(self): vars_needed = [ -- 2.43.0