conf: merge network namespace move & rename on shutdown

On shutdown we move physical network interfaces back to the
host namespace and rename them afterwards as well as in the
later lxc_network_delete() step. However, if the device had
a name which already exists in the host namespace then the
moving fails and so do the subsequent rename attempts. When
the namespace ceases to exist the devices finally end up
in the host namespace named 'dev<ID>' by the kernel.

In order to avoid this, we do the moving and renaming in a
single step (lxc_netdev_move_by_*()'s move & rename happen
in a single netlink transaction).

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 076360109c87ed2552db838b93db04665b224acd..659893626699cd946fd13d865a8f071b8cdc849d 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2934,15 +2934,17 @@ static int setup_network(struct lxc_list *network)
 }
 
 /* try to move physical nics to the init netns */
-void restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf)
+void lxc_restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf)
 {
        int i, ret, oldfd;
        char path[MAXPATHLEN];
        char ifname[IFNAMSIZ]; 
 
-       if (netnsfd < 0)
+       if (netnsfd < 0 || conf->num_savednics == 0)
                return;
 
+       INFO("running to reset %d nic names", conf->num_savednics);
+
        ret = snprintf(path, MAXPATHLEN, "/proc/self/ns/net");
        if (ret < 0 || ret >= MAXPATHLEN) {
                WARN("Failed to open monitor netns fd");
@@ -2964,32 +2966,17 @@ void restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf)
                        WARN("no interface corresponding to index '%d'", s->ifindex);
                        continue;
                }
-               if (lxc_netdev_move_by_name(ifname, 1, NULL))
+               if (lxc_netdev_move_by_name(ifname, 1, s->orig_name))
                        WARN("Error moving nic name:%s back to host netns", ifname);
+               free(s->orig_name);
        }
+       conf->num_savednics = 0;
+
        if (setns(oldfd, 0) != 0)
                SYSERROR("Failed to re-enter monitor's netns");
        close(oldfd);
 }
 
-void lxc_rename_phys_nics_on_shutdown(int netnsfd, struct lxc_conf *conf)
-{
-       int i;
-
-       if (conf->num_savednics == 0)
-               return;
-
-       INFO("running to reset %d nic names", conf->num_savednics);
-       restore_phys_nics_to_netns(netnsfd, conf);
-       for (i=0; i<conf->num_savednics; i++) {
-               struct saved_nic *s = &conf->saved_nics[i];
-               INFO("resetting nic %d to %s", s->ifindex, s->orig_name);
-               lxc_netdev_rename_by_index(s->ifindex, s->orig_name);
-               free(s->orig_name);
-       }
-       conf->num_savednics = 0;
-}
-
 static char *default_rootfs_mount = LXCROOTFSMOUNT;
 
 struct lxc_conf *lxc_conf_init(void)

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index ac2b58ca8aef896e2951454a447e25873ea2d857..8e52351217828275935975758d9b8a9b39da8a7d 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -389,7 +389,7 @@ extern int do_rootfs_setup(struct lxc_conf *conf, const char *name,
 struct cgroup_process_info;
 extern int lxc_setup(struct lxc_handler *handler);
 
-extern void lxc_rename_phys_nics_on_shutdown(int netnsfd, struct lxc_conf *conf);
+extern void lxc_restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf);
 
 extern int find_unmapped_nsuid(struct lxc_conf *conf, enum idtype idtype);
 extern int mapped_hostid(unsigned id, struct lxc_conf *conf, enum idtype idtype);

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 0139a31740942814bece06161bf87bada33a16a2..a6bdd25a1aab195d615638cf9f3d3c7ae59c249f 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1190,7 +1190,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
        }
 
        DEBUG("Pushing physical nics back to host namespace");
-       lxc_rename_phys_nics_on_shutdown(netnsfd, handler->conf);
+       lxc_restore_phys_nics_to_netns(netnsfd, handler->conf);
 
        DEBUG("Tearing down virtual network devices used by container");
        lxc_delete_network(handler);