Commit 81adee47 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

net: Support specifying the network namespace upon device creation. 



There is no good reason to not support userspace specifying the
network namespace during device creation, and it makes it easier
to create a network device and pass it to a child network namespace
with a well known name.

We have to be careful to ensure that the target network namespace
for the new device exists through the life of the call.  To keep
that logic clear I have factored out the network namespace grabbing
logic into rtnl_link_get_net.

In addtion we need to continue to pass the source network namespace
to the rtnl_link_ops.newlink method so that we can find the base
device source network namespace.

Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
parent f7a3a1d8

drivers/net/can/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ nla_put_failure: 
	return -EMSGSIZE;

}



static int can_newlink(struct net_device *dev,

static int can_newlink(struct net *src_net, struct net_device *dev,

		       struct nlattr *tb[], struct nlattr *data[])

{

	return -EOPNOTSUPP;

drivers/net/macvlan.c

+2 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int macvlan_get_tx_queues(struct net *net, 
	return 0;

}



static int macvlan_newlink(struct net_device *dev,

static int macvlan_newlink(struct net *src_net, struct net_device *dev,

			   struct nlattr *tb[], struct nlattr *data[])

{

	struct macvlan_dev *vlan = netdev_priv(dev);
@@ -515,7 +515,7 @@ static int macvlan_newlink(struct net_device *dev, 
	if (!tb[IFLA_LINK])

		return -EINVAL;



	lowerdev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));

	lowerdev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));

	if (lowerdev == NULL)

		return -ENODEV;

drivers/net/veth.c

+12 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int veth_validate(struct nlattr *tb[], struct nlattr *data[]) 


static struct rtnl_link_ops veth_link_ops;



static int veth_newlink(struct net_device *dev,

static int veth_newlink(struct net *src_net, struct net_device *dev,

			 struct nlattr *tb[], struct nlattr *data[])

{

	int err;
@@ -348,6 +348,7 @@ static int veth_newlink(struct net_device *dev, 
	struct veth_priv *priv;

	char ifname[IFNAMSIZ];

	struct nlattr *peer_tb[IFLA_MAX + 1], **tbp;

	struct net *net;



	/*

	 * create and register peer first
@@ -380,14 +381,22 @@ static int veth_newlink(struct net_device *dev, 
	else

		snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");



	peer = rtnl_create_link(dev_net(dev), ifname, &veth_link_ops, tbp);

	if (IS_ERR(peer))

	net = rtnl_link_get_net(src_net, tbp);

	if (IS_ERR(net))

		return PTR_ERR(net);



	peer = rtnl_create_link(src_net, net, ifname, &veth_link_ops, tbp);

	if (IS_ERR(peer)) {

		put_net(net);

		return PTR_ERR(peer);

	}



	if (tbp[IFLA_ADDRESS] == NULL)

		random_ether_addr(peer->dev_addr);



	err = register_netdevice(peer);

	put_net(net);

	net = NULL;

	if (err < 0)

		goto err_register_peer;

include/net/rtnetlink.h

+5 −3
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ struct rtnl_link_ops { 
	int			(*validate)(struct nlattr *tb[],

					    struct nlattr *data[]);



	int			(*newlink)(struct net_device *dev,

	int			(*newlink)(struct net *src_net,

					   struct net_device *dev,

					   struct nlattr *tb[],

					   struct nlattr *data[]);

	int			(*changelink)(struct net_device *dev,
@@ -83,8 +84,9 @@ extern void rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops); 
extern int	rtnl_link_register(struct rtnl_link_ops *ops);

extern void	rtnl_link_unregister(struct rtnl_link_ops *ops);



extern struct net_device *rtnl_create_link(struct net *net, char *ifname,

		const struct rtnl_link_ops *ops, struct nlattr *tb[]);

extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);

extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net,

	char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]);

extern const struct nla_policy ifla_policy[IFLA_MAX+1];



#define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)

net/8021q/vlan_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int vlan_get_tx_queues(struct net *net, 
	return 0;

}



static int vlan_newlink(struct net_device *dev,

static int vlan_newlink(struct net *src_net, struct net_device *dev,

			struct nlattr *tb[], struct nlattr *data[])

{

	struct vlan_dev_info *vlan = vlan_dev_info(dev);
@@ -131,7 +131,7 @@ static int vlan_newlink(struct net_device *dev, 


	if (!tb[IFLA_LINK])

		return -EINVAL;

	real_dev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));

	real_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));

	if (!real_dev)

		return -ENODEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE