Merge pull request #13915 from ddstreet/ipv6_mtu
Set ipv6 mtu after link-up or device mtu change
This commit is contained in:
Yu Watanabe
GitHub
commit
2e048b14eb
|
|
@ -1350,7 +1350,7 @@ int link_set_mtu(Link *link, uint32_t mtu) {
|
|||
if (link_ipv6_enabled(link) && mtu < IPV6_MIN_MTU) {
|
||||
|
||||
log_link_warning(link, "Bumping MTU to " STRINGIFY(IPV6_MIN_MTU) ", as "
|
||||
"IPv6 is requested and requires a minimum MTU of " STRINGIFY(IPV6_MIN_MTU) " bytes: %m");
|
||||
"IPv6 is requested and requires a minimum MTU of " STRINGIFY(IPV6_MIN_MTU) " bytes");
|
||||
|
||||
mtu = IPV6_MIN_MTU;
|
||||
}
|
||||
|
|
@ -2387,9 +2387,23 @@ static int link_set_ipv6_mtu(Link *link) {
|
|||
if (link->network->ipv6_mtu == 0)
|
||||
return 0;
|
||||
|
||||
/* IPv6 protocol requires a minimum MTU of IPV6_MTU_MIN(1280) bytes
|
||||
* on the interface. Bump up IPv6 MTU bytes to IPV6_MTU_MIN. */
|
||||
if (link->network->ipv6_mtu < IPV6_MIN_MTU) {
|
||||
log_link_notice(link, "Bumping IPv6 MTU to "STRINGIFY(IPV6_MIN_MTU)" byte minimum required");
|
||||
link->network->ipv6_mtu = IPV6_MIN_MTU;
|
||||
}
|
||||
|
||||
r = sysctl_write_ip_property_uint32(AF_INET6, link->ifname, "mtu", link->network->ipv6_mtu);
|
||||
if (r < 0)
|
||||
log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m");
|
||||
if (r < 0) {
|
||||
if (link->mtu < link->network->ipv6_mtu)
|
||||
log_link_warning(link, "Cannot set IPv6 MTU %"PRIu32" higher than device MTU %"PRIu32,
|
||||
link->network->ipv6_mtu, link->mtu);
|
||||
else
|
||||
log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m");
|
||||
}
|
||||
|
||||
link->ipv6_mtu_set = true;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -2696,10 +2710,6 @@ static int link_configure(Link *link) {
|
|||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = link_set_ipv6_mtu(link);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (link_ipv4ll_enabled(link, ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_FALLBACK_IPV4)) {
|
||||
r = ipv4ll_configure(link);
|
||||
if (r < 0)
|
||||
|
|
@ -2776,6 +2786,12 @@ static int link_configure_after_setting_mtu(Link *link) {
|
|||
if (link->setting_mtu)
|
||||
return 0;
|
||||
|
||||
/* The kernel resets ipv6 mtu after changing device mtu;
|
||||
* we must set this here, after we've set device mtu */
|
||||
r = link_set_ipv6_mtu(link);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (link_has_carrier(link) || link->network->configure_without_carrier) {
|
||||
r = link_acquire_conf(link);
|
||||
if (r < 0)
|
||||
|
|
@ -3484,11 +3500,30 @@ int link_carrier_reset(Link *link) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* This is called every time an interface admin state changes to up;
|
||||
* specifically, when IFF_UP flag changes from unset to set */
|
||||
static int link_admin_state_up(Link *link) {
|
||||
int r;
|
||||
|
||||
/* We set the ipv6 mtu after the device mtu, but the kernel resets
|
||||
* ipv6 mtu on NETDEV_UP, so we need to reset it. The check for
|
||||
* ipv6_mtu_set prevents this from trying to set it too early before
|
||||
* the link->network has been setup; we only need to reset it
|
||||
* here if we've already set it during normal initialization. */
|
||||
if (link->ipv6_mtu_set) {
|
||||
r = link_set_ipv6_mtu(link);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int link_update(Link *link, sd_netlink_message *m) {
|
||||
struct ether_addr mac;
|
||||
const char *ifname;
|
||||
uint32_t mtu;
|
||||
bool had_carrier, carrier_gained, carrier_lost;
|
||||
bool had_carrier, carrier_gained, carrier_lost, link_was_admin_up;
|
||||
int old_master, r;
|
||||
|
||||
assert(link);
|
||||
|
|
@ -3618,12 +3653,22 @@ int link_update(Link *link, sd_netlink_message *m) {
|
|||
old_master = link->master_ifindex;
|
||||
(void) sd_netlink_message_read_u32(m, IFLA_MASTER, (uint32_t *) &link->master_ifindex);
|
||||
|
||||
link_was_admin_up = link->flags & IFF_UP;
|
||||
had_carrier = link_has_carrier(link);
|
||||
|
||||
r = link_update_flags(link, m, old_master != link->master_ifindex);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!link_was_admin_up && (link->flags & IFF_UP)) {
|
||||
log_link_info(link, "Link UP");
|
||||
|
||||
r = link_admin_state_up(link);
|
||||
if (r < 0)
|
||||
return r;
|
||||
} else if (link_was_admin_up && !(link->flags & IFF_UP))
|
||||
log_link_info(link, "Link DOWN");
|
||||
|
||||
r = link_update_lldp(link);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ typedef struct Link {
|
|||
bool routing_policy_rules_configured:1;
|
||||
bool qdiscs_configured:1;
|
||||
bool setting_mtu:1;
|
||||
bool ipv6_mtu_set:1;
|
||||
|
||||
LIST_HEAD(Address, pool_addresses);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
[Match]
|
||||
OriginalName=dummy98
|
||||
|
||||
[Link]
|
||||
MTUBytes=1600
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
[NetDev]
|
||||
Name=dummy98
|
||||
Kind=dummy
|
||||
MTUBytes=1600
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
[Match]
|
||||
Name=dummy98
|
||||
|
||||
[Network]
|
||||
IPv6AcceptRA=no
|
||||
Address=10.1.2.3/16
|
||||
Address=2001:db8:0:f101::15/64
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
[Network]
|
||||
IPv6MTUBytes=1400
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
[Network]
|
||||
IPv6MTUBytes=1550
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
[Link]
|
||||
MTUBytes=1600
|
||||
|
|
@ -142,6 +142,8 @@ def setUpModule():
|
|||
running_units.append(u)
|
||||
|
||||
drop_in = [
|
||||
'[Unit]',
|
||||
'StartLimitIntervalSec=0',
|
||||
'[Service]',
|
||||
'Restart=no',
|
||||
'ExecStart=',
|
||||
|
|
@ -216,8 +218,8 @@ def tearDownModule():
|
|||
for u in running_units:
|
||||
check_output(f'systemctl start {u}')
|
||||
|
||||
def read_link_attr(link, dev, attribute):
|
||||
with open(os.path.join(os.path.join(os.path.join('/sys/class/net/', link), dev), attribute)) as f:
|
||||
def read_link_attr(*args):
|
||||
with open(os.path.join('/sys/class/net/', *args)) as f:
|
||||
return f.readline().strip()
|
||||
|
||||
def read_bridge_port_attr(bridge, link, attribute):
|
||||
|
|
@ -267,14 +269,33 @@ def read_ipv4_sysctl_attr(link, attribute):
|
|||
with open(os.path.join(os.path.join(network_sysctl_ipv4_path, link), attribute)) as f:
|
||||
return f.readline().strip()
|
||||
|
||||
def copy_unit_to_networkd_unit_path(*units):
|
||||
def copy_unit_to_networkd_unit_path(*units, dropins=True):
|
||||
"""Copy networkd unit files into the testbed.
|
||||
|
||||
Any networkd unit file type can be specified, as well as drop-in files.
|
||||
|
||||
By default, all drop-ins for a specified unit file are copied in;
|
||||
to avoid that specify dropins=False.
|
||||
|
||||
When a drop-in file is specified, its unit file is also copied in automatically.
|
||||
"""
|
||||
print()
|
||||
for unit in units:
|
||||
shutil.copy(os.path.join(networkd_ci_path, unit), network_unit_file_path)
|
||||
if (os.path.exists(os.path.join(networkd_ci_path, unit + '.d'))):
|
||||
if dropins and os.path.exists(os.path.join(networkd_ci_path, unit + '.d')):
|
||||
copytree(os.path.join(networkd_ci_path, unit + '.d'), os.path.join(network_unit_file_path, unit + '.d'))
|
||||
if unit.endswith('.conf'):
|
||||
dropin = unit
|
||||
dropindir = os.path.join(network_unit_file_path, os.path.dirname(dropin))
|
||||
os.makedirs(dropindir, exist_ok=True)
|
||||
shutil.copy(os.path.join(networkd_ci_path, dropin), dropindir)
|
||||
unit = os.path.dirname(dropin).rstrip('.d')
|
||||
shutil.copy(os.path.join(networkd_ci_path, unit), network_unit_file_path)
|
||||
|
||||
def remove_unit_from_networkd_path(units):
|
||||
"""Remove previously copied unit files from the testbed.
|
||||
|
||||
Drop-ins will be removed automatically.
|
||||
"""
|
||||
for unit in units:
|
||||
if (os.path.exists(os.path.join(network_unit_file_path, unit))):
|
||||
os.remove(os.path.join(network_unit_file_path, unit))
|
||||
|
|
@ -352,7 +373,7 @@ class Utilities():
|
|||
def check_operstate(self, link, expected, show_status=True, setup_state='configured'):
|
||||
self.assertRegex(get_operstate(link, show_status, setup_state), expected)
|
||||
|
||||
def wait_online(self, links_with_operstate, timeout='20s', bool_any=False, setup_state='configured'):
|
||||
def wait_online(self, links_with_operstate, timeout='20s', bool_any=False, setup_state='configured', setup_timeout=5):
|
||||
args = wait_online_cmd + [f'--timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate]
|
||||
if bool_any:
|
||||
args += ['--any']
|
||||
|
|
@ -363,13 +384,23 @@ class Utilities():
|
|||
output = check_output(*networkctl_cmd, 'status', link.split(':')[0], env=env)
|
||||
print(output)
|
||||
raise
|
||||
if not bool_any:
|
||||
for link in links_with_operstate:
|
||||
output = check_output(*networkctl_cmd, 'status', link.split(':')[0])
|
||||
print(output)
|
||||
for line in output.splitlines():
|
||||
if 'State:' in line:
|
||||
self.assertRegex(line, setup_state)
|
||||
if not bool_any and setup_state:
|
||||
# check at least once now, then once per sec for setup_timeout secs
|
||||
for secs in range(setup_timeout + 1):
|
||||
for link in links_with_operstate:
|
||||
output = check_output(*networkctl_cmd, 'status', link.split(':')[0])
|
||||
print(output)
|
||||
if not re.search(rf'(?m)^\s*State:.*({setup_state}).*$', output):
|
||||
# this link isn't in the right state; break into the sleep below
|
||||
break
|
||||
else:
|
||||
# all the links were in the right state; break to exit the timer loop
|
||||
break
|
||||
# don't bother sleeping if time is up
|
||||
if secs < setup_timeout:
|
||||
time.sleep(1)
|
||||
else:
|
||||
self.fail(f'link {link} state does not match {setup_state}')
|
||||
|
||||
def wait_address(self, link, address_regex, scope='global', ipv='', timeout_sec=100):
|
||||
for i in range(timeout_sec):
|
||||
|
|
@ -3304,6 +3335,101 @@ class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities):
|
|||
print(output)
|
||||
self.assertRegex(output, '2001:db8:0:1::/64 proto ra')
|
||||
|
||||
class NetworkdMTUTests(unittest.TestCase, Utilities):
|
||||
links = ['dummy98']
|
||||
|
||||
units = [
|
||||
'12-dummy.netdev',
|
||||
'12-dummy-mtu.netdev',
|
||||
'12-dummy-mtu.link',
|
||||
'12-dummy.network',
|
||||
]
|
||||
|
||||
def setUp(self):
|
||||
remove_links(self.links)
|
||||
stop_networkd(show_logs=False)
|
||||
|
||||
def tearDown(self):
|
||||
remove_log_file()
|
||||
remove_links(self.links)
|
||||
remove_unit_from_networkd_path(self.units)
|
||||
stop_networkd(show_logs=True)
|
||||
|
||||
def check_mtu(self, mtu, ipv6_mtu=None, reset=True):
|
||||
if not ipv6_mtu:
|
||||
ipv6_mtu = mtu
|
||||
|
||||
# test normal start
|
||||
start_networkd()
|
||||
self.wait_online(['dummy98:routable'])
|
||||
self.assertEqual(read_ipv6_sysctl_attr('dummy98', 'mtu'), ipv6_mtu)
|
||||
self.assertEqual(read_link_attr('dummy98', 'mtu'), mtu)
|
||||
|
||||
# test normal restart
|
||||
restart_networkd()
|
||||
self.wait_online(['dummy98:routable'])
|
||||
self.assertEqual(read_ipv6_sysctl_attr('dummy98', 'mtu'), ipv6_mtu)
|
||||
self.assertEqual(read_link_attr('dummy98', 'mtu'), mtu)
|
||||
|
||||
if reset:
|
||||
self.reset_check_mtu(mtu, ipv6_mtu)
|
||||
|
||||
def reset_check_mtu(self, mtu, ipv6_mtu=None):
|
||||
''' test setting mtu/ipv6_mtu with interface already up '''
|
||||
stop_networkd()
|
||||
|
||||
# note - changing the device mtu resets the ipv6 mtu
|
||||
run('ip link set up mtu 1501 dev dummy98')
|
||||
run('ip link set up mtu 1500 dev dummy98')
|
||||
self.assertEqual(read_link_attr('dummy98', 'mtu'), '1500')
|
||||
self.assertEqual(read_ipv6_sysctl_attr('dummy98', 'mtu'), '1500')
|
||||
|
||||
self.check_mtu(mtu, ipv6_mtu, reset=False)
|
||||
|
||||
def test_mtu_network(self):
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy.network.d/mtu.conf')
|
||||
self.check_mtu('1600')
|
||||
|
||||
def test_mtu_netdev(self):
|
||||
copy_unit_to_networkd_unit_path('12-dummy-mtu.netdev', '12-dummy.network', dropins=False)
|
||||
# note - MTU set by .netdev happens ONLY at device creation!
|
||||
self.check_mtu('1600', reset=False)
|
||||
|
||||
def test_mtu_link(self):
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy-mtu.link', '12-dummy.network', dropins=False)
|
||||
# must reload udev because it only picks up new files after 3 second delay
|
||||
call('udevadm control --reload')
|
||||
# note - MTU set by .link happens ONLY at udev processing of device 'add' uevent!
|
||||
self.check_mtu('1600', reset=False)
|
||||
|
||||
def test_ipv6_mtu(self):
|
||||
''' set ipv6 mtu without setting device mtu '''
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy.network.d/ipv6-mtu-1400.conf')
|
||||
self.check_mtu('1500', '1400')
|
||||
|
||||
def test_ipv6_mtu_toolarge(self):
|
||||
''' try set ipv6 mtu over device mtu (it shouldn't work) '''
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy.network.d/ipv6-mtu-1550.conf')
|
||||
self.check_mtu('1500', '1500')
|
||||
|
||||
def test_mtu_network_ipv6_mtu(self):
|
||||
''' set ipv6 mtu and set device mtu via network file '''
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy.network.d/mtu.conf', '12-dummy.network.d/ipv6-mtu-1550.conf')
|
||||
self.check_mtu('1600', '1550')
|
||||
|
||||
def test_mtu_netdev_ipv6_mtu(self):
|
||||
''' set ipv6 mtu and set device mtu via netdev file '''
|
||||
copy_unit_to_networkd_unit_path('12-dummy-mtu.netdev', '12-dummy.network.d/ipv6-mtu-1550.conf')
|
||||
self.check_mtu('1600', '1550', reset=False)
|
||||
|
||||
def test_mtu_link_ipv6_mtu(self):
|
||||
''' set ipv6 mtu and set device mtu via link file '''
|
||||
copy_unit_to_networkd_unit_path('12-dummy.netdev', '12-dummy-mtu.link', '12-dummy.network.d/ipv6-mtu-1550.conf')
|
||||
# must reload udev because it only picks up new files after 3 second delay
|
||||
call('udevadm control --reload')
|
||||
self.check_mtu('1600', '1550', reset=False)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--build-dir', help='Path to build dir', dest='build_dir')
|
||||
|
|
|
|||
Loading…
Reference in New Issue