diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-09-08 16:02:08 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-09-09 12:14:52 +0200 |
| commit | 90058bdca9fbf1cc0856650088847c12a2e812a5 (patch) | |
| tree | 56ee191f28063eb179a087ce72bd89ba9bed8716 /executor | |
| parent | a29cf5afb0f318fae8b15230623d70549a8c5a8c (diff) | |
executor: fix setup of netdevsim device
2 fixed:
1. netdevsim devices cannot be created via NETLINK anymore:
https://elixir.bootlin.com/linux/v6.0-rc4/source/drivers/net/netdevsim/netdev.c#L397
But we already create them via /sys/bus/netdevsim/new_device,
so just remove the netlink creation.
2. These devices are sticky and are not removed on net namspace destruction,
so delete the previous version explicitly.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 6ab9265d1..d7e3726a3 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -331,7 +331,8 @@ static void netlink_add_xfrm(struct nlmsg* nlmsg, int sock, const char* name) netlink_add_device_impl(nlmsg, "xfrm", name, true); netlink_nest(nlmsg, IFLA_INFO_DATA); int if_id = 1; - netlink_attr(nlmsg, IFLA_XFRM_IF_ID, &if_id, sizeof(if_id)); + // This is IFLA_XFRM_IF_ID attr which is not present in older kernel headers. + netlink_attr(nlmsg, 2, &if_id, sizeof(if_id)); netlink_done(nlmsg); netlink_done(nlmsg); int err = netlink_send(nlmsg, sock); @@ -1094,10 +1095,11 @@ static void initialize_wifi_devices(void) static void netdevsim_add(unsigned int addr, unsigned int port_count) { - char buf[16]; - - sprintf(buf, "%u %u", addr, port_count); - if (write_file("/sys/bus/netdevsim/new_device", buf)) { + // These devices are sticky and are not deleted on net namespace destruction. + // So try to delete the previous version of the device. + write_file("/sys/bus/netdevsim/del_device", "%u", addr); + if (write_file("/sys/bus/netdevsim/new_device", "%u %u", addr, port_count)) { + char buf[32]; snprintf(buf, sizeof(buf), "netdevsim%d", addr); initialize_devlink_ports("netdevsim", buf, "netdevsim"); } @@ -1365,6 +1367,7 @@ static void initialize_netdevices(void) // - ifb0/1 // - teql0 // - eql + // Note: netdevsim devices can't have the same name even in different namespaces. char netdevsim[16]; sprintf(netdevsim, "netdevsim%d", (int)procid); struct { @@ -1383,8 +1386,6 @@ static void initialize_netdevices(void) {"batadv", "batadv0"}, // Note: this adds vxcan0/vxcan1 pair, similar to veth (creating vxcan0 would fail). {"vxcan", "vxcan1"}, - // Note: netdevsim devices can't have the same name even in different namespaces. - {"netdevsim", netdevsim}, // This adds connected veth0 and veth1 devices. {"veth", 0}, {"wireguard", "wg0"}, |