Commit d37512a2 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller

rtnl: add link netns id to interface messages

This patch adds a new attribute (IFLA_LINK_NETNSID) which contains the 'link'
netns id when this netns is different from the netns where the interface
stands (for example for x-net interfaces like ip tunnels).
With this attribute, it's possible to interpret correctly all advertised
information (like IFLA_LINK, etc.).
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c7aecd4
...@@ -46,6 +46,7 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh) ...@@ -46,6 +46,7 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
* to create when creating a new device. * to create when creating a new device.
* @get_num_rx_queues: Function to determine number of receive queues * @get_num_rx_queues: Function to determine number of receive queues
* to create when creating a new device. * to create when creating a new device.
* @get_link_net: Function to get the i/o netns of the device
*/ */
struct rtnl_link_ops { struct rtnl_link_ops {
struct list_head list; struct list_head list;
...@@ -93,6 +94,7 @@ struct rtnl_link_ops { ...@@ -93,6 +94,7 @@ struct rtnl_link_ops {
int (*fill_slave_info)(struct sk_buff *skb, int (*fill_slave_info)(struct sk_buff *skb,
const struct net_device *dev, const struct net_device *dev,
const struct net_device *slave_dev); const struct net_device *slave_dev);
struct net *(*get_link_net)(const struct net_device *dev);
}; };
int __rtnl_link_register(struct rtnl_link_ops *ops); int __rtnl_link_register(struct rtnl_link_ops *ops);
......
...@@ -146,6 +146,7 @@ enum { ...@@ -146,6 +146,7 @@ enum {
IFLA_PHYS_PORT_ID, IFLA_PHYS_PORT_ID,
IFLA_CARRIER_CHANGES, IFLA_CARRIER_CHANGES,
IFLA_PHYS_SWITCH_ID, IFLA_PHYS_SWITCH_ID,
IFLA_LINK_NETNSID,
__IFLA_MAX __IFLA_MAX
}; };
......
...@@ -875,6 +875,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, ...@@ -875,6 +875,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ nla_total_size(1) /* IFLA_OPERSTATE */ + nla_total_size(1) /* IFLA_OPERSTATE */
+ nla_total_size(1) /* IFLA_LINKMODE */ + nla_total_size(1) /* IFLA_LINKMODE */
+ nla_total_size(4) /* IFLA_CARRIER_CHANGES */ + nla_total_size(4) /* IFLA_CARRIER_CHANGES */
+ nla_total_size(4) /* IFLA_LINK_NETNSID */
+ nla_total_size(ext_filter_mask + nla_total_size(ext_filter_mask
& RTEXT_FILTER_VF ? 4 : 0) /* IFLA_NUM_VF */ & RTEXT_FILTER_VF ? 4 : 0) /* IFLA_NUM_VF */
+ rtnl_vfinfo_size(dev, ext_filter_mask) /* IFLA_VFINFO_LIST */ + rtnl_vfinfo_size(dev, ext_filter_mask) /* IFLA_VFINFO_LIST */
...@@ -1169,6 +1170,18 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, ...@@ -1169,6 +1170,18 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
goto nla_put_failure; goto nla_put_failure;
} }
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(dev_net(dev), link_net);
if (nla_put_s32(skb, IFLA_LINK_NETNSID, id))
goto nla_put_failure;
}
}
if (!(af_spec = nla_nest_start(skb, IFLA_AF_SPEC))) if (!(af_spec = nla_nest_start(skb, IFLA_AF_SPEC)))
goto nla_put_failure; goto nla_put_failure;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment