net: rtnetlink: add linkprop commands to add and delete alternative ifnames (36fbf1e5) · Commits · 戴 / test

include/linux/netdevice.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -927,10 +927,14 @@ struct tlsdev_ops;

		struct netdev_name_node {
		struct hlist_node hlist;
		struct list_head list;
		struct net_device *dev;
		const char *name;
		};

		int netdev_name_node_alt_create(struct net_device dev, const char name);
		int netdev_name_node_alt_destroy(struct net_device dev, const char name);

		/*
		* This structure defines the management hooks for network devices.
		* The following hooks can be defined; unless noted otherwise, they are

include/uapi/linux/if.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#define IFNAMSIZ 16
		#endif /* __UAPI_DEF_IF_IFNAMSIZ */
		#define IFALIASZ 256
		#define ALTIFNAMSIZ 128
		#include <linux/hdlc/ioctl.h>

		/* For glibc compatibility. An empty enum does not compile. */

include/uapi/linux/if_link.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,8 @@ enum {
		IFLA_NEW_IFINDEX,
		IFLA_MIN_MTU,
		IFLA_MAX_MTU,
		IFLA_PROP_LIST,
		IFLA_ALT_IFNAME, /* Alternative ifname */
		__IFLA_MAX
		};

include/uapi/linux/rtnetlink.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,13 @@ enum {
		RTM_GETNEXTHOP,
		#define RTM_GETNEXTHOP RTM_GETNEXTHOP

		RTM_NEWLINKPROP = 108,
		#define RTM_NEWLINKPROP RTM_NEWLINKPROP
		RTM_DELLINKPROP,
		#define RTM_DELLINKPROP RTM_DELLINKPROP
		RTM_GETLINKPROP,
		#define RTM_GETLINKPROP RTM_GETLINKPROP

		__RTM_MAX,
		#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
		};

net/core/dev.c

+57 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,13 @@ static struct netdev_name_node netdev_name_node_alloc(struct net_device dev,
		static struct netdev_name_node *
		netdev_name_node_head_alloc(struct net_device *dev)
		{
		return netdev_name_node_alloc(dev, dev->name);
		struct netdev_name_node *name_node;

		name_node = netdev_name_node_alloc(dev, dev->name);
		if (!name_node)
		return NULL;
		INIT_LIST_HEAD(&name_node->list);
		return name_node;
		}

		static void netdev_name_node_free(struct netdev_name_node *name_node)
		@@ -289,6 +295,55 @@ static struct netdev_name_node netdev_name_node_lookup_rcu(struct net net,
		return NULL;
		}

		int netdev_name_node_alt_create(struct net_device dev, const char name)
		{
		struct netdev_name_node *name_node;
		struct net *net = dev_net(dev);

		name_node = netdev_name_node_lookup(net, name);
		if (name_node)
		return -EEXIST;
		name_node = netdev_name_node_alloc(dev, name);
		if (!name_node)
		return -ENOMEM;
		netdev_name_node_add(net, name_node);
		/* The node that holds dev->name acts as a head of per-device list. */
		list_add_tail(&name_node->list, &dev->name_node->list);

		return 0;
		}
		EXPORT_SYMBOL(netdev_name_node_alt_create);

		static void __netdev_name_node_alt_destroy(struct netdev_name_node *name_node)
		{
		list_del(&name_node->list);
		netdev_name_node_del(name_node);
		kfree(name_node->name);
		netdev_name_node_free(name_node);
		}

		int netdev_name_node_alt_destroy(struct net_device dev, const char name)
		{
		struct netdev_name_node *name_node;
		struct net *net = dev_net(dev);

		name_node = netdev_name_node_lookup(net, name);
		if (!name_node)
		return -ENOENT;
		__netdev_name_node_alt_destroy(name_node);

		return 0;
		}
		EXPORT_SYMBOL(netdev_name_node_alt_destroy);

		static void netdev_name_node_alt_flush(struct net_device *dev)
		{
		struct netdev_name_node name_node, tmp;

		list_for_each_entry_safe(name_node, tmp, &dev->name_node->list, list)
		__netdev_name_node_alt_destroy(name_node);
		}

		/* Device list insertion */
		static void list_netdevice(struct net_device *dev)
		{
		@@ -8317,6 +8372,7 @@ static void rollback_registered_many(struct list_head *head)
		dev_uc_flush(dev);
		dev_mc_flush(dev);

		netdev_name_node_alt_flush(dev);
		netdev_name_node_free(dev->name_node);

		if (dev->netdev_ops->ndo_uninit)

Admin message