rpms
/
NetworkManager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.4.2

This commit is contained in:
Lubomir Rintel 2016-10-10 19:17:40 +02:00
parent 76dec7d585
commit 3a1a8315bc
6 changed files with 11 additions and 2106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -328,3 +328,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.2.2.tar.xz
/NetworkManager-1.3.0.git20160621.072358da.tar.xz
/NetworkManager-1.4.0.tar.xz
/NetworkManager-1.4.2.tar.xz

245
0001-wifi-set-mac-addr-workaround-rh1371478
View File

@ -1,245 +0,0 @@
From c52f385566e558ee3edc98d20225155b362d212f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 28 Aug 2016 13:52:32 +0200
Subject: [PATCH 1/4] platform: split processing result from do_change_link()
(cherry picked from commit 3dc09446771a3434ed948bdd5e6ca9f6ef9a9e76)
(cherry picked from commit 471521ca84187cd32afcd20aebe5a369fe7368dc)
---
src/platform/nm-linux-platform.c | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 98c4e46..eeb24ca 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -4060,18 +4060,14 @@ out:
return !!nmp_cache_lookup_obj (priv->cache, obj_id);
}
-static NMPlatformError
-do_change_link (NMPlatform *platform,
- int ifindex,
- struct nl_msg *nlmsg)
+static WaitForNlResponseResult
+do_change_link_request (NMPlatform *platform,
+ int ifindex,
+ struct nl_msg *nlmsg)
{
nm_auto_pop_netns NMPNetns *netns = NULL;
WaitForNlResponseResult seq_result = WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN;
int nle;
- char s_buf[256];
- NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS;
- NMLogLevel log_level = LOGL_DEBUG;
- const char *log_result = "failure", *log_detail = "";
if (!nm_platform_netns_push (platform, &netns))
return NM_PLATFORM_ERROR_UNSPECIFIED;
@@ -4098,6 +4094,18 @@ retry:
nlmsg_hdr (nlmsg)->nlmsg_type = RTM_SETLINK;
goto retry;
}
+ return seq_result;
+}
+
+static NMPlatformError
+do_change_link_result (NMPlatform *platform,
+ int ifindex,
+ WaitForNlResponseResult seq_result)
+{
+ char s_buf[256];
+ NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS;
+ NMLogLevel log_level = LOGL_DEBUG;
+ const char *log_result = "failure", *log_detail = "";
if (seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK) {
log_result = "success";
@@ -4123,6 +4131,17 @@ retry:
return result;
}
+static NMPlatformError
+do_change_link (NMPlatform *platform,
+ int ifindex,
+ struct nl_msg *nlmsg)
+{
+ WaitForNlResponseResult seq_result;
+
+ seq_result = do_change_link_request (platform, ifindex, nlmsg);
+ return do_change_link_result (platform, ifindex, seq_result);
+}
+
static gboolean
link_add (NMPlatform *platform,
const char *name,
--
2.7.4
From 559ed361a30650f263668aadb86233fb405f0b29 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 28 Aug 2016 14:08:42 +0200
Subject: [PATCH 2/4] platform: workaround kernel wrongly returning ENFILE when
changing MAC address
https://bugzilla.gnome.org/show_bug.cgi?id=770456
(cherry picked from commit 2bef71611bd9fd2e333a7522205f0262ac25680f)
(cherry picked from commit 06d1679aa9867682297316e7b2cfac6fc8f67c2a)
---
src/platform/nm-linux-platform.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index eeb24ca..c36e967 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -4449,6 +4449,8 @@ link_set_address (NMPlatform *platform, int ifindex, gconstpointer address, size
{
nm_auto_nlmsg struct nl_msg *nlmsg = NULL;
gs_free char *mac = NULL;
+ WaitForNlResponseResult seq_result;
+ char s_buf[256];
if (!address || !length)
g_return_val_if_reached (NM_PLATFORM_ERROR_BUG);
@@ -4468,7 +4470,30 @@ link_set_address (NMPlatform *platform, int ifindex, gconstpointer address, size
NLA_PUT (nlmsg, IFLA_ADDRESS, length, address);
- return do_change_link (platform, ifindex, nlmsg);
+ seq_result = do_change_link_request (platform, ifindex, nlmsg);
+
+ if (NM_IN_SET (-((int) seq_result), ENFILE)) {
+ const NMPObject *obj_cache;
+
+ /* workaround ENFILE which may be wrongly returned (bgo #770456).
+ * If the MAC address is as expected, assume success? */
+
+ obj_cache = nmp_cache_lookup_link (NM_LINUX_PLATFORM_GET_PRIVATE (platform)->cache, ifindex);
+ if ( obj_cache
+ && obj_cache->link.addr.len == length
+ && memcmp (obj_cache->link.addr.data, address, length) == 0) {
+ _NMLOG (LOGL_DEBUG,
+ "do-change-link[%d]: %s changing link: %s%s",
+ ifindex,
+ "success",
+ wait_for_nl_response_to_string (seq_result, s_buf, sizeof (s_buf)),
+ " (assume success changing address)");
+ return NM_PLATFORM_ERROR_SUCCESS;
+ }
+ }
+
+ return do_change_link_result (platform, ifindex, seq_result);
+
nla_put_failure:
g_return_val_if_reached (NM_PLATFORM_ERROR_UNSPECIFIED);
}
--
2.7.4
From afe1a15516f0a5024f161e3ff1046afdfb7e58b8 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 29 Aug 2016 17:14:04 +0200
Subject: [PATCH 3/4] device: fix spelling in logging
(cherry picked from commit d51f2c2a4e99799739e2adbeaf578144b556c4b9)
(cherry picked from commit b1f5d3d798498c53fe65257490b2df3e3f71e364)
---
src/devices/nm-device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 199acc6..305a1bb 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -11820,7 +11820,7 @@ _hw_addr_set (NMDevice *self,
operation, addr, detail);
} else {
_LOGW (LOGD_DEVICE,
- "set-hw-addr: new MAC address %s not successfully set to %s (%s)",
+ "set-hw-addr: new MAC address %s not successfully %s (%s)",
addr, operation, detail);
success = FALSE;
}
--
2.7.4
From ac81b54da92c569db110407a63142565d69963f4 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 29 Aug 2016 18:28:34 +0200
Subject: [PATCH 4/4] device: add hack to wait after changing MAC address
It seems some drivers return success for nm_platform_link_set_address(),
but at that point the address did not yet actually change *sigh*.
It changes a bit later, possibly after setting the device up.
Add a workaround to retry reading the MAC address when platform indicates
success but the address still differs at first.
https://bugzilla.gnome.org/show_bug.cgi?id=770456
(cherry picked from commit 67b685235847ac49712d77023e23ef5c38e82a9e)
(cherry picked from commit 3b51959f48f2b40a4d85e1d36fd69a46548369cb)
---
src/devices/nm-device.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 305a1bb..6939332 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -11774,6 +11774,7 @@ _hw_addr_set (NMDevice *self,
{
NMDevicePrivate *priv;
gboolean success = FALSE;
+ gboolean needs_refresh = FALSE;
NMPlatformError plerr;
const char *cur_addr;
guint8 addr_bytes[NM_UTILS_HWADDR_LEN_MAX];
@@ -11819,10 +11820,10 @@ _hw_addr_set (NMDevice *self,
_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
operation, addr, detail);
} else {
- _LOGW (LOGD_DEVICE,
- "set-hw-addr: new MAC address %s not successfully %s (%s)",
+ _LOGD (LOGD_DEVICE,
+ "set-hw-addr: new MAC address %s not successfully %s (%s) (refresh link)",
addr, operation, detail);
- success = FALSE;
+ needs_refresh = TRUE;
}
} else {
_NMLOG (plerr == NM_PLATFORM_ERROR_NOT_FOUND ? LOGL_DEBUG : LOGL_WARN,
@@ -11836,6 +11837,27 @@ _hw_addr_set (NMDevice *self,
return FALSE;
}
+ if (needs_refresh) {
+ /* The platform call indicated success, however the address is not
+ * as expected. May be a kernel issue and the MAC address takes
+ * a moment to change (bgo#770456).
+ *
+ * Try to reload the link and check again. */
+ nm_platform_link_refresh (NM_PLATFORM_GET, nm_device_get_ip_ifindex (self));
+
+ nm_device_update_hw_address (self);
+ cur_addr = nm_device_get_hw_address (self);
+ if (cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1)) {
+ _LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
+ operation, addr, detail);
+ } else {
+ _LOGW (LOGD_DEVICE,
+ "set-hw-addr: new MAC address %s not successfully %s (%s)",
+ addr, operation, detail);
+ return FALSE;
+ }
+ }
+
return success;
}
--
2.7.4

1570
0002-dhcp-helper-sync-notify-rh1372854.patch
View File

File diff suppressed because it is too large Load Diff

279
0003-wifi-set-mac-addr-workaround-rh1371478-v2.patch
View File

@ -1,279 +0,0 @@
From 3c701b60dc169a24cf52c0397560125ddce3d54c Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 7 Sep 2016 23:47:14 +0200
Subject: [PATCH 1/2] device: workaround driver issue with delayed change of
MAC address
brcmfmac and possibly other drivers don't change the MAC address
right away, but instead the result is delayed. That is problematic
because we cannot continue activation before the MAC address is
settled.
Add a hack to workaround the issue by waiting until the MAC address
changed.
The previous attempt to workaround this was less intrusive: we would
just refresh the link once and check the result. But that turns out
not to be sufficent for all cases. Now, wait and poll.
https://bugzilla.gnome.org/show_bug.cgi?id=770456
https://bugzilla.redhat.com/show_bug.cgi?id=1374023
(cherry picked from commit 1a85103765d4eaa0acab6b03658a4f9cfe684a64)
(cherry picked from commit 8d575403685208aad75f918484ae7adbc1a46085)
---
src/devices/nm-device.c | 85 ++++++++++++++++++++++++++++++++++---------------
src/devices/nm-device.h | 2 +-
2 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 674563f..3e549c5 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -11549,16 +11549,17 @@ nm_device_get_hw_address (NMDevice *self)
return priv->hw_addr;
}
-void
+gboolean
nm_device_update_hw_address (NMDevice *self)
{
NMDevicePrivate *priv;
const guint8 *hwaddr;
gsize hwaddrlen = 0;
+ gboolean changed = FALSE;
priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->ifindex <= 0)
- return;
+ return FALSE;
hwaddr = nm_platform_link_get_address (NM_PLATFORM_GET, priv->ifindex, &hwaddrlen);
@@ -11585,6 +11586,7 @@ nm_device_update_hw_address (NMDevice *self)
* update our inital hw-address as well. */
nm_device_update_initial_hw_address (self);
}
+ changed = TRUE;
}
} else {
/* Invalid or no hardware address */
@@ -11597,6 +11599,7 @@ nm_device_update_hw_address (NMDevice *self)
"hw-addr: failed reading current MAC address");
}
}
+ return changed;
}
void
@@ -11756,6 +11759,15 @@ nm_device_hw_addr_is_explict (NMDevice *self)
}
static gboolean
+_hw_addr_matches (NMDevice *self, const char *addr)
+{
+ const char *cur_addr;
+
+ cur_addr = nm_device_get_hw_address (self);
+ return cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1);
+}
+
+static gboolean
_hw_addr_set (NMDevice *self,
const char *addr,
const char *operation,
@@ -11765,7 +11777,6 @@ _hw_addr_set (NMDevice *self,
gboolean success = FALSE;
gboolean needs_refresh = FALSE;
NMPlatformError plerr;
- const char *cur_addr;
guint8 addr_bytes[NM_UTILS_HWADDR_LEN_MAX];
guint hw_addr_len;
gboolean was_up;
@@ -11776,11 +11787,9 @@ _hw_addr_set (NMDevice *self,
priv = NM_DEVICE_GET_PRIVATE (self);
- cur_addr = nm_device_get_hw_address (self);
-
/* Do nothing if current MAC is same */
- if (cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1)) {
- _LOGT (LOGD_DEVICE, "set-hw-addr: no MAC address change needed (%s)", cur_addr);
+ if (_hw_addr_matches (self, addr)) {
+ _LOGT (LOGD_DEVICE, "set-hw-addr: no MAC address change needed (%s)", addr);
return TRUE;
}
@@ -11804,8 +11813,7 @@ _hw_addr_set (NMDevice *self,
if (success) {
/* MAC address succesfully changed; update the current MAC to match */
nm_device_update_hw_address (self);
- cur_addr = nm_device_get_hw_address (self);
- if (cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1)) {
+ if (_hw_addr_matches (self, addr)) {
_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
operation, addr, detail);
} else {
@@ -11827,24 +11835,51 @@ _hw_addr_set (NMDevice *self,
}
if (needs_refresh) {
- /* The platform call indicated success, however the address is not
- * as expected. May be a kernel issue and the MAC address takes
- * a moment to change (bgo#770456).
- *
- * Try to reload the link and check again. */
- nm_platform_link_refresh (NM_PLATFORM_GET, nm_device_get_ip_ifindex (self));
-
- nm_device_update_hw_address (self);
- cur_addr = nm_device_get_hw_address (self);
- if (cur_addr && nm_utils_hwaddr_matches (cur_addr, -1, addr, -1)) {
- _LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
- operation, addr, detail);
+ if (_hw_addr_matches (self, addr)) {
+ /* the MAC address already changed during nm_device_bring_up() above. */
} else {
- _LOGW (LOGD_DEVICE,
- "set-hw-addr: new MAC address %s not successfully %s (%s)",
- addr, operation, detail);
- return FALSE;
+ gint64 poll_end, now;
+
+ /* The platform call indicated success, however the address is not
+ * as expected. That is either due to a driver issue (brcmfmac, bgo#770456,
+ * rh#1374023) or a race where externally the MAC address was reset.
+ * The race is rather unlikely.
+ *
+ * The alternative would be to postpone the activation in case the
+ * MAC address is not yet ready and poll without blocking. However,
+ * that is rather complicated and it is not expected that this case
+ * happens for regular drivers.
+ * Note that brcmfmac can block NetworkManager for 500 msec while
+ * taking down the device. Let's add annother 100 msec to that.
+ *
+ * wait/poll up to 100 msec until it changes. */
+
+ poll_end = nm_utils_get_monotonic_timestamp_us () + (100 * 1000);
+ for (;;) {
+ if (!nm_platform_link_refresh (NM_PLATFORM_GET, nm_device_get_ip_ifindex (self)))
+ goto handle_fail;
+ if (!nm_device_update_hw_address (self))
+ goto handle_wait;
+ if (!_hw_addr_matches (self, addr))
+ goto handle_fail;
+
+ break;
+handle_wait:
+ now = nm_utils_get_monotonic_timestamp_us ();
+ if (now < poll_end) {
+ g_usleep (NM_MIN (poll_end - now, 500));
+ continue;
+ }
+handle_fail:
+ _LOGW (LOGD_DEVICE,
+ "set-hw-addr: new MAC address %s not successfully %s (%s)",
+ addr, operation, detail);
+ return FALSE;
+ }
}
+
+ _LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
+ operation, addr, detail);
}
return success;
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index be12ce7..a757a37 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -588,7 +588,7 @@ void nm_device_reactivate_ip6_config (NMDevice *device,
NMSettingIPConfig *s_ip6_old,
NMSettingIPConfig *s_ip6_new);
-void nm_device_update_hw_address (NMDevice *self);
+gboolean nm_device_update_hw_address (NMDevice *self);
void nm_device_update_initial_hw_address (NMDevice *self);
void nm_device_update_permanent_hw_address (NMDevice *self);
void nm_device_update_dynamic_ip_setup (NMDevice *self);
--
2.7.4
From d99c3b63e81347fb861e1306eb0b603cfa15223e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 11 Sep 2016 09:48:56 +0200
Subject: [PATCH 2/2] device: wait for MAC address change to complete before
setting interface up
Some drivers (brcmfmac) don't change the MAC address right away.
NetworkManager works around that by waiting synchronously until
the address changes (commit 1a85103765d4eaa0acab6b03658a4f9cfe684a64).
wpa_supplicant on the other hand, only re-reads the MAC address
when changing state from DISABLED to ENABLED, which happens when
the interface comes up.
That is a bug in wpa_supplicant and the driver, but we can work-around by
waiting until the MAC address actually changed before setting the interface
IFF_UP. Also note, that there is still a race in wpa_supplicant which might
miss a change to DISABLED state altogether.
https://bugzilla.gnome.org/show_bug.cgi?id=770504
https://bugzilla.redhat.com/show_bug.cgi?id=1374023
(cherry picked from commit 32f7c1d4b9aba597a99128631f07c2985149f303)
(cherry picked from commit cd8f2ecc617a896d8007e6fe825c676a626a3b8d)
---
src/devices/nm-device.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 3e549c5..47e858b 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -11829,12 +11829,8 @@ _hw_addr_set (NMDevice *self,
nm_platform_error_to_string (plerr));
}
- if (was_up) {
- if (!nm_device_bring_up (self, TRUE, NULL))
- return FALSE;
- }
-
if (needs_refresh) {
+ success = TRUE;
if (_hw_addr_matches (self, addr)) {
/* the MAC address already changed during nm_device_bring_up() above. */
} else {
@@ -11871,15 +11867,24 @@ handle_wait:
continue;
}
handle_fail:
- _LOGW (LOGD_DEVICE,
- "set-hw-addr: new MAC address %s not successfully %s (%s)",
- addr, operation, detail);
- return FALSE;
+ success = FALSE;
+ break;
}
}
- _LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
- operation, addr, detail);
+ if (success) {
+ _LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
+ operation, addr, detail);
+ } else {
+ _LOGW (LOGD_DEVICE,
+ "set-hw-addr: new MAC address %s not successfully %s (%s)",
+ addr, operation, detail);
+ }
+ }
+
+ if (was_up) {
+ if (!nm_device_bring_up (self, TRUE, NULL))
+ return FALSE;
}
return success;
--
2.7.4

20
NetworkManager.spec
View File

@ -1,18 +1,18 @@
%global dbus_version 1.1
%global dbus_glib_version 0.100
%global glib2_version 2.32.0
%global wireless_tools_version 1:28-0pre9
%global libnl3_version 3.2.7
%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global snapshot %{nil}
%global git_sha %{nil}
%global rpm_version 1.4.0
%global real_version 1.4.0
%global release_version 4
%global rpm_version 1.4.2
%global real_version 1.4.2
%global release_version 1
%global epoch_version 1
%global obsoletes_nmver 1:0.9.9.95-1
@ -99,9 +99,6 @@ Source2: 00-server.conf
Source3: 20-connectivity-fedora.conf
#Patch1: 0001-some.patch
Patch1: 0001-wifi-set-mac-addr-workaround-rh1371478
Patch2: 0002-dhcp-helper-sync-notify-rh1372854.patch
Patch3: 0003-wifi-set-mac-addr-workaround-rh1371478-v2.patch
Requires(post): systemd
Requires(preun): systemd
@ -133,7 +130,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
%if 0%{?fedora}
BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
%endif
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: glib2-devel >= 2.32.0
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: pkgconfig
@ -343,9 +340,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%prep
%setup -q -n NetworkManager-%{real_version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
#%patch1 -p1
%build
%if %{with regen_docs}
@ -653,6 +648,9 @@ fi
%endif
%changelog
* Mon Oct 10 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.4.2-1
- Update to 1.4.2
* Tue Sep 13 2016 Thomas Haller <thaller@redhat.com> - 1:1.4.0-4
- wifi: fix another activation failure when changing MAC address (rh#1371478, bgo#770456, bgo#770504)

2
sources
View File

@ -1 +1 @@
337e676261ca94af08f8e9b6f9b09a5b NetworkManager-1.4.0.tar.xz
59b5b5585467756787c6cb535cbd306e NetworkManager-1.4.2.tar.xz