github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests/net: rename _nk_host_ifname to nk_host_ifname

Browse Source 
Rename _nk_host_ifname to nk_host_ifname in NetDrvContEnv to make it
a public attribute, matching the nk_guest_ifname rename. Tests that
access the host-side netkit interface name (e.g. for cleanup after
deleting the netkit pair) no longer trigger pylint protected-access
warnings.

Signed-off-by: Wei Wang <weibunny@fb.com>
Link: https://patch.msgid.link/20260608233118.2694144-7-weibunny.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Wei Wang 2026-06-08 16:31:14 -07:00 committed by Jakub Kicinski
parent b9d51f2e13
commit 593e22f652
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/drivers/net/hw/nk_qlease.py
View File

@ -193,9 +193,9 @@ def test_destroy(cfg) -> None:
kill_timer = threading.Timer(1, rx_proc.proc.terminate)
kill_timer.start()
ip(f"link del dev {cfg._nk_host_ifname}")
ip(f"link del dev {cfg.nk_host_ifname}")
kill_timer.join()
cfg._nk_host_ifname = None
cfg.nk_host_ifname = None
cfg.nk_guest_ifname = None
queue_info = netdevnl.queue_get(

26
tools/testing/selftests/drivers/net/lib/py/env.py
View File

@ -341,7 +341,7 @@ class NetDrvContEnv(NetDrvEpEnv):
userns=False, **kwargs):
self.netns = None
self._userns = userns
self._nk_host_ifname = None
self.nk_host_ifname = None
self.nk_guest_ifname = None
self._tc_clsact_added = False
self._tc_attached = False
@ -395,7 +395,7 @@ class NetDrvContEnv(NetDrvEpEnv):
raise KsftSkipEx("Failed to create netkit pair")
netkit_links.sort(key=lambda x: x['ifindex'])
self._nk_host_ifname = netkit_links[1]['ifname']
self.nk_host_ifname = netkit_links[1]['ifname']
self.nk_guest_ifname = netkit_links[0]['ifname']
self.nk_host_ifindex = netkit_links[1]['ifindex']
self.nk_guest_ifindex = netkit_links[0]['ifindex']
@ -407,11 +407,11 @@ class NetDrvContEnv(NetDrvEpEnv):
def __del__(self):
if self._primary_rx_redirect_attached:
cmd(f"tc filter del dev {self._nk_host_ifname} ingress", fail=False)
cmd(f"tc filter del dev {self.nk_host_ifname} ingress", fail=False)
self._primary_rx_redirect_attached = False
if self._primary_rx_redirect_clsact_added:
cmd(f"tc qdisc del dev {self._nk_host_ifname} clsact", fail=False)
cmd(f"tc qdisc del dev {self.nk_host_ifname} clsact", fail=False)
self._primary_rx_redirect_clsact_added = False
if self._tc_attached:
@ -427,9 +427,9 @@ class NetDrvContEnv(NetDrvEpEnv):
host=self.remote, fail=False)
self._remote_route_added = False
if self._nk_host_ifname:
cmd(f"ip link del dev {self._nk_host_ifname}")
self._nk_host_ifname = None
if self.nk_host_ifname:
cmd(f"ip link del dev {self.nk_host_ifname}")
self.nk_host_ifname = None
self.nk_guest_ifname = None
if self._init_ns_attached:
@ -470,9 +470,9 @@ class NetDrvContEnv(NetDrvEpEnv):
self._init_ns_attached = True
ip("netns set init 0", ns=self.netns)
ip(f"link set dev {self.nk_guest_ifname} netns {self.netns.name}")
ip(f"link set dev {self._nk_host_ifname} up")
ip(f"-6 addr add fe80::1/64 dev {self._nk_host_ifname} nodad")
ip(f"-6 route add {self.nk_guest_ipv6}/128 via fe80::2 dev {self._nk_host_ifname}")
ip(f"link set dev {self.nk_host_ifname} up")
ip(f"-6 addr add fe80::1/64 dev {self.nk_host_ifname} nodad")
ip(f"-6 route add {self.nk_guest_ipv6}/128 via fe80::2 dev {self.nk_host_ifname}")
ip("link set lo up", ns=self.netns)
ip(f"link set dev {self.nk_guest_ifname} up", ns=self.netns)
@ -548,9 +548,9 @@ class NetDrvContEnv(NetDrvEpEnv):
if not bpf_obj:
raise KsftSkipEx("nk_primary_rx_redirect.bpf.o not found")
if self._tc_ensure_clsact(self._nk_host_ifname):
if self._tc_ensure_clsact(self.nk_host_ifname):
self._primary_rx_redirect_clsact_added = True
cmd(f"tc filter add dev {self._nk_host_ifname} ingress"
cmd(f"tc filter add dev {self.nk_host_ifname} ingress"
f" bpf obj {bpf_obj} sec tc/ingress direct-action")
self._primary_rx_redirect_attached = True
@ -559,7 +559,7 @@ class NetDrvContEnv(NetDrvEpEnv):
self._remote_route_added = True
filters = json.loads(
cmd(f"tc -j filter show dev {self._nk_host_ifname} ingress").stdout)
cmd(f"tc -j filter show dev {self.nk_host_ifname} ingress").stdout)
redirect_prog_id = None
for bpf in filters:
if 'options' not in bpf: