From c3946c3d2975015473d9552b537ed02b5f89be63 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 15 Apr 2016 20:07:02 +0200 Subject: [PATCH 1/3] device: improve logging when changing IP configuration nm_device_set_ip4_config() is called during cleanup and from ip4_config_merge_and_apply(). The latter, has several call sites. It's not easy to track whether we called set_ip4_config with or without commit (and if we call it without commit, we might not see a logging line at all). (same for nm_device_set_ip6_config()/ip6_config_merge_and_apply()). (cherry picked from commit f50e39fc9852865ab6bb984d2db9b34d83263426) (cherry picked from commit a3b3e17bf91485b692a8de19d92b2ba9d7fadb8e) --- src/devices/nm-device.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 55002ca892..4a28d8d266 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6544,6 +6544,9 @@ nm_device_set_ip4_config (NMDevice *self, g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); + _LOGD (LOGD_IP4, "ip4-config: update (commit=%d, routes-full-sync=%d, new-config=%p)", + commit, routes_full_sync, new_config); + priv = NM_DEVICE_GET_PRIVATE (self); ip_ifindex = nm_device_get_ip_ifindex (self); @@ -6571,7 +6574,7 @@ nm_device_set_ip4_config (NMDevice *self, * this causes a re-read and reset. This should only happen for relevant changes */ nm_ip4_config_replace (old_config, new_config, &has_changes); if (has_changes) { - _LOGD (LOGD_IP4, "update IP4Config instance (%s)", + _LOGD (LOGD_IP4, "ip4-config: update IP4Config instance (%s)", nm_ip4_config_get_dbus_path (old_config)); } } else { @@ -6583,13 +6586,13 @@ nm_device_set_ip4_config (NMDevice *self, nm_ip4_config_export (new_config); } - _LOGD (LOGD_IP4, "set IP4Config instance (%s)", + _LOGD (LOGD_IP4, "ip4-config: set IP4Config instance (%s)", nm_ip4_config_get_dbus_path (new_config)); } } else if (old_config) { has_changes = TRUE; priv->ip4_config = NULL; - _LOGD (LOGD_IP4, "clear IP4Config instance (%s)", + _LOGD (LOGD_IP4, "ip4-config: clear IP4Config instance (%s)", nm_ip4_config_get_dbus_path (old_config)); /* Device config is invalid if combined config is invalid */ g_clear_object (&priv->dev_ip4_config); @@ -6677,6 +6680,9 @@ nm_device_set_ip6_config (NMDevice *self, g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); + _LOGD (LOGD_IP6, "ip6-config: update (commit=%d, routes-full-sync=%d, new-config=%p)", + commit, routes_full_sync, new_config); + priv = NM_DEVICE_GET_PRIVATE (self); ip_ifindex = nm_device_get_ip_ifindex (self); @@ -6698,7 +6704,7 @@ nm_device_set_ip6_config (NMDevice *self, * this causes a re-read and reset. This should only happen for relevant changes */ nm_ip6_config_replace (old_config, new_config, &has_changes); if (has_changes) { - _LOGD (LOGD_IP6, "update IP6Config instance (%s)", + _LOGD (LOGD_IP6, "ip6-config: update IP6Config instance (%s)", nm_ip6_config_get_dbus_path (old_config)); } } else { @@ -6710,13 +6716,13 @@ nm_device_set_ip6_config (NMDevice *self, nm_ip6_config_export (new_config); } - _LOGD (LOGD_IP6, "set IP6Config instance (%s)", + _LOGD (LOGD_IP6, "ip6-config: set IP6Config instance (%s)", nm_ip6_config_get_dbus_path (new_config)); } } else if (old_config) { has_changes = TRUE; priv->ip6_config = NULL; - _LOGD (LOGD_IP6, "clear IP6Config instance (%s)", + _LOGD (LOGD_IP6, "ip6-config: clear IP6Config instance (%s)", nm_ip6_config_get_dbus_path (old_config)); } From 6fa2405997d8399c3af64dcbde02e31dc59cc1e8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 15 Apr 2016 20:01:36 +0200 Subject: [PATCH 2/3] device: restore IP configuration when link comes up This is especially important, because changing MTU takes the link down for a moment. Taking a link down deletes IP routes and IPv6 addresses. Thus, when the link comes up again, we must restore them. Otherwise, we don't call merge_and_apply() until the next DHCP lease (or possibly never in case of static addressing). https://bugzilla.redhat.com/show_bug.cgi?id=1309899 (cherry picked from commit 35a7ea77b0dc5cddb8d8f0854499715ccf57287c) (cherry picked from commit 5367eac8146ef47f07f1bcfe1e3e74d381080706) --- src/devices/nm-device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4a28d8d266..e6c88dd3b8 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -370,6 +370,9 @@ static gboolean nm_device_set_ip6_config (NMDevice *self, gboolean commit, gboolean routes_full_sync, NMDeviceStateReason *reason); +static gboolean ip6_config_merge_and_apply (NMDevice *self, + gboolean commit, + NMDeviceStateReason *out_reason); static gboolean nm_device_master_add_slave (NMDevice *self, NMDevice *slave, gboolean configure); static void nm_device_slave_notify_enslave (NMDevice *self, gboolean success); @@ -1516,6 +1519,19 @@ device_link_changed (NMDevice *self) } } + if (priv->up && !was_up) { + /* the link was down and just came up. That happens for example, while changing MTU. + * We must restore IP configuration. */ + if (priv->ip4_state == IP_DONE) { + if (!ip4_config_merge_and_apply (self, NULL, TRUE, NULL)) + _LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again"); + } + if (priv->ip6_state == IP_DONE) { + if (!ip6_config_merge_and_apply (self, TRUE, NULL)) + _LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again"); + } + } + return G_SOURCE_REMOVE; } From 8d9e033ecd39e82a2dcc2500f75d92cf3c023da3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 15 Apr 2016 20:53:15 +0200 Subject: [PATCH 3/3] platform: ensure refetching routes when link goes down It's not enough to consider IF_LOWER_UP flag. Instead, the important flag is actually IF_UP. Actually, I suspect that IF_LOWER_UP is not needed. But for now leave it, in order not to break something. (cherry picked from commit 02e84ba1e8a98de20e4ef718d5069f64ca5398a0) (cherry picked from commit 11bfe8a88146b4ad8f05d2ea3c01f6e5b901c8dc) --- src/platform/nm-linux-platform.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 4e45e0a164..0043fc6d8b 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -1887,9 +1887,14 @@ cache_pre_hook (NMPCache *cache, const NMPObject *old, const NMPObject *new, NMP if ( ops_type == NMP_CACHE_OPS_UPDATED && old && new /* <-- nonsensical, make coverity happy */ && old->_link.netlink.is_in_netlink - && NM_FLAGS_HAS (old->link.flags, IFF_LOWER_UP) && new->_link.netlink.is_in_netlink - && !NM_FLAGS_HAS (new->link.flags, IFF_LOWER_UP)) { + && ( ( NM_FLAGS_HAS (old->link.flags, IFF_UP) + && !NM_FLAGS_HAS (new->link.flags, IFF_UP)) + || ( NM_FLAGS_HAS (old->link.flags, IFF_LOWER_UP) + && !NM_FLAGS_HAS (new->link.flags, IFF_LOWER_UP)))) { + /* FIXME: I suspect that IFF_LOWER_UP must not be considered, and I + * think kernel does send RTM_DELROUTE events for IPv6 routes, so + * we might not need to refresh IPv6 routes. */ delayed_action_schedule (platform, DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES | DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES,