fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 07:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: tests: skip already used macvtap ifindexes

Browse source 
In old kernel versions the creation of a macvtap can fail if its
ifindex is already used by a macvtap in another namespace, because of
a conflict in sysfs entries generation [1].

Try to detect this situation in platform tests and skip an ifindex if
already in use.

[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=17af2bce88d31e65ed73d638bb752d2e13c66ced
This commit is contained in:
Beniamino Galvani 2016-06-06 22:43:27 +02:00
parent ff3cd5aaf5
commit 21bdb82555
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/platform/tests/test-link.c
View file

@ -778,11 +778,32 @@ test_software_detect (gconstpointer user_data)
}
case NM_LINK_TYPE_MACVLAN: {
NMPlatformLnkMacvlan lnk_macvlan = { };
const NMPlatformLink *dummy;
char buf[256];
int i;
lnk_macvlan.mode = MACVLAN_MODE_BRIDGE;
lnk_macvlan.no_promisc = FALSE;
lnk_macvlan.tap = FALSE;
/* Since in old kernel versions sysfs files for macvtaps are not
* namespaced, the creation can fail if a macvtap in another namespace
* has the same index. Try to detect this situation and skip already
* used indexes.
* http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=17af2bce88d31e65ed73d638bb752d2e13c66ced
*/
for (i = ifindex_parent + 1; i < ifindex_parent + 100; i++) {
snprintf (buf, sizeof (buf), "/sys/class/macvtap/tap%d", i);
if (!g_file_test (buf, G_FILE_TEST_IS_SYMLINK))
break;
_LOGD ("skipping ifindex %d as already used by a macvtap", i);
dummy = nmtstp_link_dummy_add (NM_PLATFORM_GET, FALSE, "dummy-tmp");
g_assert_cmpint (dummy->ifindex, ==, i);
nmtstp_link_del (NM_PLATFORM_GET, FALSE, dummy->ifindex, NULL);
}
if (!nmtstp_link_macvlan_add (NULL, ext, DEVICE_NAME, ifindex_parent, &lnk_macvlan))
g_error ("Failed adding MACVLAN interface");
break;