Commit 727d5fbb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'openvswitch-netns' 



Flavio Leitner says:

====================
Allow openvswitch to query ports in another netns.

Today Open vSwitch users are moving internal ports to other namespaces and
although packets are flowing OK, the userspace daemon can't find out basic
information like if the port is UP or DOWN, for instance.

This patchset extends openvswitch API to retrieve the current netnsid of
a port. It will be used by the userspace daemon to find out in which netns
the port is located.

This patchset also extends the rtnetlink getlink call to accept and operate
on a given netnsid.  More details are available in each patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 27c565ae 79e1ad14

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ enum { 
	IFLA_XDP,

	IFLA_EVENT,

	IFLA_NEW_NETNSID,

	IFLA_IF_NETNSID,

	__IFLA_MAX

};

include/uapi/linux/openvswitch.h

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ enum ovs_vport_attr { 
				/* receiving upcalls */

	OVS_VPORT_ATTR_STATS,	/* struct ovs_vport_stats */

	OVS_VPORT_ATTR_PAD,

	OVS_VPORT_ATTR_IFINDEX,

	OVS_VPORT_ATTR_NETNSID,

	__OVS_VPORT_ATTR_MAX

};

net/core/net_namespace.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ int peernet2id_alloc(struct net *net, struct net *peer) 
		rtnl_net_notifyid(net, RTM_NEWNSID, id);

	return id;

}

EXPORT_SYMBOL_GPL(peernet2id_alloc);



/* This function returns, if assigned, the id of a peer netns. */

int peernet2id(struct net *net, struct net *peer)

net/core/rtnetlink.c

+85 −18
Original line number Diff line number Diff line
@@ -921,7 +921,8 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, 
	       + nla_total_size(4)  /* IFLA_EVENT */

	       + nla_total_size(4)  /* IFLA_NEW_NETNSID */

	       + nla_total_size(1); /* IFLA_PROTO_DOWN */



	       + nla_total_size(4)  /* IFLA_IF_NETNSID */

	       + 0;

}



static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
@@ -1370,13 +1371,14 @@ static noinline_for_stack int nla_put_ifalias(struct sk_buff *skb, 
}



static int rtnl_fill_link_netnsid(struct sk_buff *skb,

				  const struct net_device *dev)

				  const struct net_device *dev,

				  struct net *src_net)

{

	if (dev->rtnl_link_ops && dev->rtnl_link_ops->get_link_net) {

		struct net *link_net = dev->rtnl_link_ops->get_link_net(dev);



		if (!net_eq(dev_net(dev), link_net)) {

			int id = peernet2id_alloc(dev_net(dev), link_net);

			int id = peernet2id_alloc(src_net, link_net);



			if (nla_put_s32(skb, IFLA_LINK_NETNSID, id))

				return -EMSGSIZE;
@@ -1427,10 +1429,11 @@ static int rtnl_fill_link_af(struct sk_buff *skb, 
	return 0;

}



static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,

static int rtnl_fill_ifinfo(struct sk_buff *skb,

			    struct net_device *dev, struct net *src_net,

			    int type, u32 pid, u32 seq, u32 change,

			    unsigned int flags, u32 ext_filter_mask,

			    u32 event, int *new_nsid)

			    u32 event, int *new_nsid, int tgt_netnsid)

{

	struct ifinfomsg *ifm;

	struct nlmsghdr *nlh;
@@ -1448,6 +1451,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, 
	ifm->ifi_flags = dev_get_flags(dev);

	ifm->ifi_change = change;



	if (tgt_netnsid >= 0 && nla_put_s32(skb, IFLA_IF_NETNSID, tgt_netnsid))

		goto nla_put_failure;



	if (nla_put_string(skb, IFLA_IFNAME, dev->name) ||

	    nla_put_u32(skb, IFLA_TXQLEN, dev->tx_queue_len) ||

	    nla_put_u8(skb, IFLA_OPERSTATE,
@@ -1513,7 +1519,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, 
			goto nla_put_failure;

	}



	if (rtnl_fill_link_netnsid(skb, dev))

	if (rtnl_fill_link_netnsid(skb, dev, src_net))

		goto nla_put_failure;



	if (new_nsid &&
@@ -1571,6 +1577,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { 
	[IFLA_XDP]		= { .type = NLA_NESTED },

	[IFLA_EVENT]		= { .type = NLA_U32 },

	[IFLA_GROUP]		= { .type = NLA_U32 },

	[IFLA_IF_NETNSID]	= { .type = NLA_S32 },

};



static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
@@ -1674,9 +1681,28 @@ static bool link_dump_filtered(struct net_device *dev, 
	return false;

}



static struct net *get_target_net(struct sk_buff *skb, int netnsid)

{

	struct net *net;



	net = get_net_ns_by_id(sock_net(skb->sk), netnsid);

	if (!net)

		return ERR_PTR(-EINVAL);



	/* For now, the caller is required to have CAP_NET_ADMIN in

	 * the user namespace owning the target net ns.

	 */

	if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {

		put_net(net);

		return ERR_PTR(-EACCES);

	}

	return net;

}



static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)

{

	struct net *net = sock_net(skb->sk);

	struct net *tgt_net = net;

	int h, s_h;

	int idx = 0, s_idx;

	struct net_device *dev;
@@ -1686,6 +1712,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 
	const struct rtnl_link_ops *kind_ops = NULL;

	unsigned int flags = NLM_F_MULTI;

	int master_idx = 0;

	int netnsid = -1;

	int err;

	int hdrlen;
@@ -1704,6 +1731,15 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 


	if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX,

			ifla_policy, NULL) >= 0) {

		if (tb[IFLA_IF_NETNSID]) {

			netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);

			tgt_net = get_target_net(skb, netnsid);

			if (IS_ERR(tgt_net)) {

				tgt_net = net;

				netnsid = -1;

			}

		}



		if (tb[IFLA_EXT_MASK])

			ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);
@@ -1719,17 +1755,19 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 


	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {

		idx = 0;

		head = &net->dev_index_head[h];

		head = &tgt_net->dev_index_head[h];

		hlist_for_each_entry(dev, head, index_hlist) {

			if (link_dump_filtered(dev, master_idx, kind_ops))

				goto cont;

			if (idx < s_idx)

				goto cont;

			err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,

			err = rtnl_fill_ifinfo(skb, dev, net,

					       RTM_NEWLINK,

					       NETLINK_CB(cb->skb).portid,

					       cb->nlh->nlmsg_seq, 0,

					       flags,

					       ext_filter_mask, 0, NULL);

					       ext_filter_mask, 0, NULL,

					       netnsid);



			if (err < 0) {

				if (likely(skb->len))
@@ -1748,6 +1786,8 @@ out_err: 
	cb->args[0] = h;

	cb->seq = net->dev_base_seq;

	nl_dump_check_consistent(cb, nlmsg_hdr(skb));

	if (netnsid >= 0)

		put_net(tgt_net);



	return err;

}
@@ -2360,6 +2400,9 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (err < 0)

		goto errout;



	if (tb[IFLA_IF_NETNSID])

		return -EOPNOTSUPP;



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);

	else
@@ -2454,6 +2497,9 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (err < 0)

		return err;



	if (tb[IFLA_IF_NETNSID])

		return -EOPNOTSUPP;



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);
@@ -2585,6 +2631,9 @@ replay: 
	if (err < 0)

		return err;



	if (tb[IFLA_IF_NETNSID])

		return -EOPNOTSUPP;



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);

	else
@@ -2818,11 +2867,13 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
			struct netlink_ext_ack *extack)

{

	struct net *net = sock_net(skb->sk);

	struct net *tgt_net = net;

	struct ifinfomsg *ifm;

	char ifname[IFNAMSIZ];

	struct nlattr *tb[IFLA_MAX+1];

	struct net_device *dev = NULL;

	struct sk_buff *nskb;

	int netnsid = -1;

	int err;

	u32 ext_filter_mask = 0;
@@ -2830,35 +2881,50 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (err < 0)

		return err;



	if (tb[IFLA_IF_NETNSID]) {

		netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);

		tgt_net = get_target_net(skb, netnsid);

		if (IS_ERR(tgt_net))

			return PTR_ERR(tgt_net);

	}



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);



	if (tb[IFLA_EXT_MASK])

		ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);



	err = -EINVAL;

	ifm = nlmsg_data(nlh);

	if (ifm->ifi_index > 0)

		dev = __dev_get_by_index(net, ifm->ifi_index);

		dev = __dev_get_by_index(tgt_net, ifm->ifi_index);

	else if (tb[IFLA_IFNAME])

		dev = __dev_get_by_name(net, ifname);

		dev = __dev_get_by_name(tgt_net, ifname);

	else

		return -EINVAL;

		goto out;



	err = -ENODEV;

	if (dev == NULL)

		return -ENODEV;

		goto out;



	err = -ENOBUFS;

	nskb = nlmsg_new(if_nlmsg_size(dev, ext_filter_mask), GFP_KERNEL);

	if (nskb == NULL)

		return -ENOBUFS;

		goto out;



	err = rtnl_fill_ifinfo(nskb, dev, RTM_NEWLINK, NETLINK_CB(skb).portid,

			       nlh->nlmsg_seq, 0, 0, ext_filter_mask, 0, NULL);

	err = rtnl_fill_ifinfo(nskb, dev, net,

			       RTM_NEWLINK, NETLINK_CB(skb).portid,

			       nlh->nlmsg_seq, 0, 0, ext_filter_mask,

			       0, NULL, netnsid);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in if_nlmsg_size */

		WARN_ON(err == -EMSGSIZE);

		kfree_skb(nskb);

	} else

		err = rtnl_unicast(nskb, net, NETLINK_CB(skb).portid);

out:

	if (netnsid >= 0)

		put_net(tgt_net);



	return err;

}
@@ -2948,8 +3014,9 @@ struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev, 
	if (skb == NULL)

		goto errout;



	err = rtnl_fill_ifinfo(skb, dev, type, 0, 0, change, 0, 0, event,

			       new_nsid);

	err = rtnl_fill_ifinfo(skb, dev, dev_net(dev),

			       type, 0, 0, change, 0, 0, event,

			       new_nsid, -1);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in if_nlmsg_size() */

		WARN_ON(err == -EMSGSIZE);

net/openvswitch/datapath.c

+34 −13
Original line number Diff line number Diff line
@@ -1848,7 +1848,8 @@ static struct genl_family dp_datapath_genl_family __ro_after_init = { 


/* Called with ovs_mutex or RCU read lock. */

static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,

				   u32 portid, u32 seq, u32 flags, u8 cmd)

				   struct net *net, u32 portid, u32 seq,

				   u32 flags, u8 cmd)

{

	struct ovs_header *ovs_header;

	struct ovs_vport_stats vport_stats;
@@ -1864,9 +1865,17 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb, 
	if (nla_put_u32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no) ||

	    nla_put_u32(skb, OVS_VPORT_ATTR_TYPE, vport->ops->type) ||

	    nla_put_string(skb, OVS_VPORT_ATTR_NAME,

			   ovs_vport_name(vport)))

			   ovs_vport_name(vport)) ||

	    nla_put_u32(skb, OVS_VPORT_ATTR_IFINDEX, vport->dev->ifindex))

		goto nla_put_failure;



	if (!net_eq(net, dev_net(vport->dev))) {

		int id = peernet2id_alloc(net, dev_net(vport->dev));



		if (nla_put_s32(skb, OVS_VPORT_ATTR_NETNSID, id))

			goto nla_put_failure;

	}



	ovs_vport_get_stats(vport, &vport_stats);

	if (nla_put_64bit(skb, OVS_VPORT_ATTR_STATS,

			  sizeof(struct ovs_vport_stats), &vport_stats,
@@ -1896,8 +1905,8 @@ static struct sk_buff *ovs_vport_cmd_alloc_info(void) 
}



/* Called with ovs_mutex, only via ovs_dp_notify_wq(). */

struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 portid,

					 u32 seq, u8 cmd)

struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, struct net *net,

					 u32 portid, u32 seq, u8 cmd)

{

	struct sk_buff *skb;

	int retval;
@@ -1906,7 +1915,7 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 portid, 
	if (!skb)

		return ERR_PTR(-ENOMEM);



	retval = ovs_vport_cmd_fill_info(vport, skb, portid, seq, 0, cmd);

	retval = ovs_vport_cmd_fill_info(vport, skb, net, portid, seq, 0, cmd);

	BUG_ON(retval < 0);



	return skb;
@@ -1920,6 +1929,8 @@ static struct vport *lookup_vport(struct net *net, 
	struct datapath *dp;

	struct vport *vport;



	if (a[OVS_VPORT_ATTR_IFINDEX])

		return ERR_PTR(-EOPNOTSUPP);

	if (a[OVS_VPORT_ATTR_NAME]) {

		vport = ovs_vport_locate(net, nla_data(a[OVS_VPORT_ATTR_NAME]));

		if (!vport)
@@ -1944,6 +1955,7 @@ static struct vport *lookup_vport(struct net *net, 
		return vport;

	} else

		return ERR_PTR(-EINVAL);



}



/* Called with ovs_mutex */
@@ -1983,6 +1995,8 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) 
	if (!a[OVS_VPORT_ATTR_NAME] || !a[OVS_VPORT_ATTR_TYPE] ||

	    !a[OVS_VPORT_ATTR_UPCALL_PID])

		return -EINVAL;

	if (a[OVS_VPORT_ATTR_IFINDEX])

		return -EOPNOTSUPP;



	port_no = a[OVS_VPORT_ATTR_PORT_NO]

		? nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]) : 0;
@@ -2032,8 +2046,9 @@ restart: 
		goto exit_unlock_free;

	}



	err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,

				      info->snd_seq, 0, OVS_VPORT_CMD_NEW);

	err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),

				      info->snd_portid, info->snd_seq, 0,

				      OVS_VPORT_CMD_NEW);



	if (netdev_get_fwd_headroom(vport->dev) > dp->max_headroom)

		update_headroom(dp);
@@ -2090,8 +2105,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info) 
			goto exit_unlock_free;

	}



	err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,

				      info->snd_seq, 0, OVS_VPORT_CMD_NEW);

	err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),

				      info->snd_portid, info->snd_seq, 0,

				      OVS_VPORT_CMD_NEW);

	BUG_ON(err < 0);



	ovs_unlock();
@@ -2128,8 +2144,9 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info) 
		goto exit_unlock_free;

	}



	err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,

				      info->snd_seq, 0, OVS_VPORT_CMD_DEL);

	err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),

				      info->snd_portid, info->snd_seq, 0,

				      OVS_VPORT_CMD_DEL);

	BUG_ON(err < 0);



	/* the vport deletion may trigger dp headroom update */
@@ -2169,8 +2186,9 @@ static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info) 
	err = PTR_ERR(vport);

	if (IS_ERR(vport))

		goto exit_unlock_free;

	err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,

				      info->snd_seq, 0, OVS_VPORT_CMD_NEW);

	err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),

				      info->snd_portid, info->snd_seq, 0,

				      OVS_VPORT_CMD_NEW);

	BUG_ON(err < 0);

	rcu_read_unlock();
@@ -2202,6 +2220,7 @@ static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb) 
		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node) {

			if (j >= skip &&

			    ovs_vport_cmd_fill_info(vport, skb,

						    sock_net(skb->sk),

						    NETLINK_CB(cb->skb).portid,

						    cb->nlh->nlmsg_seq,

						    NLM_F_MULTI,
@@ -2228,6 +2247,8 @@ static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = { 
	[OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },

	[OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_U32 },

	[OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },

	[OVS_VPORT_ATTR_IFINDEX] = { .type = NLA_U32 },

	[OVS_VPORT_ATTR_NETNSID] = { .type = NLA_S32 },

};



static const struct genl_ops dp_vport_genl_ops[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE