SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32927 from yuwata/test-network-netdevsim

Browse Source 
test-network: workaround for netdevsim bug
This commit is contained in:
Luca Boccassi
2024-05-20 15:03:53 +02:00
committed by GitHub
parent 2fa7626e18 90fe8cf209
commit 30633afcb8
6 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
+2
View File
@@ -10,6 +10,8 @@ Packages=
dnf5
f2fs-tools
scsi-target-utils
kernel-modules-extra
kernel-modules-internal
InitrdPackages=
btrfs-progs
test/test-network/conf/25-netdevsim.link
+11
View File
@@ -0,0 +1,11 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Driver=netdevsim
[Link]
NamePolicy=keep kernel database onboard slot path
AlternativeNamesPolicy=database onboard slot path mac
# Also set a fixed name. Workaround for bug in kernel 6.9:
# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb
AlternativeName=sim99
MACAddressPolicy=persistent
test/test-network/conf/25-sriov-udev.network
+1 -1
View File
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Name=eni99np1
Name=sim99
[Network]
Address=192.168.100.100/24
test/test-network/conf/25-sriov.link
+3
View File
@@ -5,6 +5,9 @@ Driver=netdevsim
[Link]
NamePolicy=keep kernel database onboard slot path
AlternativeNamesPolicy=database onboard slot path mac
# Also set a fixed name. Workaround for bug in kernel 6.9:
# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb
AlternativeName=sim99
MACAddressPolicy=persistent
[SR-IOV]
test/test-network/conf/25-sriov.network
+1 -1
View File
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Name=eni99np1
Name=sim99
[Network]
Address=192.168.100.100/24
test/test-network/systemd-networkd-tests.py
+25 -22
View File
@@ -562,7 +562,7 @@ def link_exists(*links):
return True
def link_resolve(link):
return check_output(f'ip link show {link}').split(':')[1].strip()
return check_output(f'ip link show {link}').split(':')[1].strip().split('@')[0]
def remove_link(*links, protect=False):
for link in links:
@@ -5268,22 +5268,28 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
def tearDown(self):
tear_down_common()
@expectedFailureIfNetdevsimWithSRIOVIsNotAvailable()
def test_sriov(self):
copy_network_unit('25-default.link', '25-sriov.network')
def setup_netdevsim(self, id=99, num_ports=1, num_vfs=0):
call('modprobe netdevsim')
# Create netdevsim device.
with open('/sys/bus/netdevsim/new_device', mode='w', encoding='utf-8') as f:
f.write('99 1')
f.write(f'{id} {num_ports}')
with open('/sys/bus/netdevsim/devices/netdevsim99/sriov_numvfs', mode='w', encoding='utf-8') as f:
f.write('3')
# Create VF.
if num_vfs > 0:
with open(f'/sys/bus/netdevsim/devices/netdevsim{id}/sriov_numvfs', mode='w', encoding='utf-8') as f:
f.write(f'{num_vfs}')
@expectedFailureIfNetdevsimWithSRIOVIsNotAvailable()
def test_sriov(self):
copy_network_unit('25-netdevsim.link', '25-sriov.network')
self.setup_netdevsim(num_vfs=3)
start_networkd()
self.wait_online('eni99np1:routable')
self.wait_online('sim99:routable')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
@@ -5295,18 +5301,15 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
def test_sriov_udev(self):
copy_network_unit('25-sriov.link', '25-sriov-udev.network')
call('modprobe netdevsim')
with open('/sys/bus/netdevsim/new_device', mode='w', encoding='utf-8') as f:
f.write('99 1')
self.setup_netdevsim()
start_networkd()
self.wait_online('eni99np1:routable')
self.wait_online('sim99:routable')
# the name eni99np1 may be an alternative name.
ifname = link_resolve('eni99np1')
# The name sim99 is an alternative name, and cannot be used by udevadm below.
ifname = link_resolve('sim99')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
@@ -5322,7 +5325,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
udevadm_reload()
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
@@ -5338,7 +5341,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
udevadm_reload()
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
@@ -5354,7 +5357,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
udevadm_reload()
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
@@ -5370,7 +5373,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
udevadm_reload()
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
output = check_output('ip link show dev eni99np1')
output = check_output('ip link show dev sim99')
print(output)
self.assertRegex(output,
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'