| From 72c2500b2ade34d02ee5d2701e954d40ca6b0837 Mon Sep 17 00:00:00 2001 |
| From: Yu Watanabe <watanabe.yu+github@gmail.com> |
| Date: Wed, 8 Aug 2018 20:21:07 +0900 |
| Subject: [PATCH 1/3] network: drop redundant lines |
| |
| Follow-up for 44b598a1c9d11c23420a5ef45ff11bcb0ed195eb. |
| --- |
| src/network/networkd-link.c | 12 ++++-------- |
| 1 file changed, 4 insertions(+), 8 deletions(-) |
| |
| diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| index 4c534e685d..52b6eb3b99 100644 |
| --- a/src/network/networkd-link.c |
| +++ b/src/network/networkd-link.c |
| @@ -1312,23 +1312,19 @@ int link_set_mtu(Link *link, uint32_t mtu) { |
| return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m"); |
| |
| /* If IPv6 not configured (no static IPv6 address and IPv6LL autoconfiguration is disabled) |
| - for this interface, or if it is a bridge slave, then disable IPv6 else enable it. */ |
| + * for this interface, or if it is a bridge slave, then disable IPv6 else enable it. */ |
| (void) link_enable_ipv6(link); |
| |
| /* IPv6 protocol requires a minimum MTU of IPV6_MTU_MIN(1280) bytes |
| - on the interface. Bump up MTU bytes to IPV6_MTU_MIN. */ |
| - if (link_ipv6_enabled(link) && link->network->mtu < IPV6_MIN_MTU) { |
| + * on the interface. Bump up MTU bytes to IPV6_MTU_MIN. */ |
| + 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"); |
| |
| - link->network->mtu = IPV6_MIN_MTU; |
| + mtu = IPV6_MIN_MTU; |
| } |
| |
| - r = sd_netlink_message_append_u32(req, IFLA_MTU, link->network->mtu); |
| - if (r < 0) |
| - return log_link_error_errno(link, r, "Could not set MTU: %m"); |
| - |
| r = sd_netlink_message_append_u32(req, IFLA_MTU, mtu); |
| if (r < 0) |
| return log_link_error_errno(link, r, "Could not append MTU: %m"); |
| -- |
| 2.25.0.265.gbab2e86ba0-goog |
| |
| |
| From ee4931068e3e7a722327399db91ee020a74b3592 Mon Sep 17 00:00:00 2001 |
| From: Yu Watanabe <watanabe.yu+github@gmail.com> |
| Date: Wed, 8 Aug 2018 21:14:20 +0900 |
| Subject: [PATCH 2/3] network: do not re-set MTU when current and requested MTU |
| are same |
| |
| --- |
| src/network/networkd-link.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| index 52b6eb3b99..9f68451dec 100644 |
| --- a/src/network/networkd-link.c |
| +++ b/src/network/networkd-link.c |
| @@ -1305,6 +1305,9 @@ int link_set_mtu(Link *link, uint32_t mtu) { |
| assert(link->manager); |
| assert(link->manager->rtnl); |
| |
| + if (link->mtu == mtu) |
| + return 0; |
| + |
| log_link_debug(link, "Setting MTU: %" PRIu32, mtu); |
| |
| r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex); |
| -- |
| 2.25.0.265.gbab2e86ba0-goog |
| |
| |
| From 55dc8c4a82f9aa8f4171941300432cb2c96544c3 Mon Sep 17 00:00:00 2001 |
| From: Yu Watanabe <watanabe.yu+github@gmail.com> |
| Date: Mon, 13 Aug 2018 16:12:08 +0900 |
| Subject: [PATCH 3/3] network: call link_acquire_conf() and |
| link_enter_join_netdev() after MTU is set |
| |
| Fixes #9831. |
| --- |
| src/network/networkd-link.c | 37 ++++++++++++++++++++++++++++--------- |
| 1 file changed, 28 insertions(+), 9 deletions(-) |
| |
| diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| index 9f68451dec..e20acf8b2c 100644 |
| --- a/src/network/networkd-link.c |
| +++ b/src/network/networkd-link.c |
| @@ -1279,6 +1279,8 @@ static int link_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userd |
| return 0; |
| } |
| |
| +static int link_configure_after_setting_mtu(Link *link); |
| + |
| static int set_mtu_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) { |
| _cleanup_(link_unrefp) Link *link = userdata; |
| int r; |
| @@ -1287,12 +1289,21 @@ static int set_mtu_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userda |
| assert(link); |
| assert(link->ifname); |
| |
| + link->setting_mtu = false; |
| + |
| if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) |
| return 1; |
| |
| r = sd_netlink_message_get_errno(m); |
| - if (r < 0) |
| + if (r < 0) { |
| log_link_warning_errno(link, r, "Could not set MTU: %m"); |
| + return 1; |
| + } |
| + |
| + log_link_debug(link, "Setting MTU done."); |
| + |
| + if (link->state == LINK_STATE_PENDING) |
| + (void) link_configure_after_setting_mtu(link); |
| |
| return 1; |
| } |
| @@ -1305,7 +1316,7 @@ int link_set_mtu(Link *link, uint32_t mtu) { |
| assert(link->manager); |
| assert(link->manager->rtnl); |
| |
| - if (link->mtu == mtu) |
| + if (link->mtu == mtu || link->setting_mtu) |
| return 0; |
| |
| log_link_debug(link, "Setting MTU: %" PRIu32, mtu); |
| @@ -1706,11 +1717,6 @@ static int link_acquire_conf(Link *link) { |
| |
| assert(link); |
| |
| - if (link->setting_mtu) { |
| - link->setting_mtu = false; |
| - return 0; |
| - } |
| - |
| r = link_acquire_ipv4_conf(link); |
| if (r < 0) |
| return r; |
| @@ -2874,6 +2880,19 @@ static int link_configure(Link *link) { |
| return r; |
| } |
| |
| + return link_configure_after_setting_mtu(link); |
| +} |
| + |
| +static int link_configure_after_setting_mtu(Link *link) { |
| + int r; |
| + |
| + assert(link); |
| + assert(link->network); |
| + assert(link->state == LINK_STATE_PENDING); |
| + |
| + if (link->setting_mtu) |
| + return 0; |
| + |
| if (link_has_carrier(link) || link->network->configure_without_carrier) { |
| r = link_acquire_conf(link); |
| if (r < 0) |
| @@ -3281,8 +3300,8 @@ static int link_carrier_lost(Link *link) { |
| assert(link); |
| |
| /* Some devices reset itself while setting the MTU. This causes the DHCP client fall into a loop. |
| - setting_mtu keep track whether the device got reset because of setting MTU and does not drop the |
| - configuration and stop the clients as well. */ |
| + * setting_mtu keep track whether the device got reset because of setting MTU and does not drop the |
| + * configuration and stop the clients as well. */ |
| if (link->setting_mtu) |
| return 0; |
| |
| -- |
| 2.25.0.265.gbab2e86ba0-goog |
| |
