xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: advertise the new ifindex when the netns iface changes

Browse Source 
The goal is to let the user follow an interface that moves to another
netns.

CC: Jiri Benc <jbenc@redhat.com>
CC: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel
2018-01-25 15:01:39 +01:00
committed by David S. Miller
parent c36ac8e230
commit 38e01b3056
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/rtnetlink.h
View File

@@ -19,10 +19,11 @@ extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change, gfp_t flags); void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change, gfp_t flags);
void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change, void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,
gfp_t flags, int *new_nsid); gfp_t flags, int *new_nsid, int new_ifindex);
struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev, struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
unsigned change, u32 event, unsigned change, u32 event,
gfp_t flags, int *new_nsid); gfp_t flags, int *new_nsid,
int new_ifindex);
void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev, void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev,
gfp_t flags); gfp_t flags);

1
include/uapi/linux/if_link.h
View File

@@ -163,6 +163,7 @@ enum {
IFLA_IF_NETNSID, IFLA_IF_NETNSID,
IFLA_CARRIER_UP_COUNT, IFLA_CARRIER_UP_COUNT,
IFLA_CARRIER_DOWN_COUNT, IFLA_CARRIER_DOWN_COUNT,
IFLA_NEW_IFINDEX,
__IFLA_MAX __IFLA_MAX
}; };

19
net/core/dev.c
View File

@@ -7360,7 +7360,7 @@ static void rollback_registered_many(struct list_head *head)
if (!dev->rtnl_link_ops || if (!dev->rtnl_link_ops ||
dev->rtnl_link_state == RTNL_LINK_INITIALIZED) dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0, skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
GFP_KERNEL, NULL); GFP_KERNEL, NULL, 0);
/* /*
* Flush the unicast and multicast chains * Flush the unicast and multicast chains
@@ -8473,7 +8473,7 @@ EXPORT_SYMBOL(unregister_netdev);
int dev_change_net_namespace(struct net_device *dev, struct net *net, const char *pat) int dev_change_net_namespace(struct net_device *dev, struct net *net, const char *pat)
{ {
int err, new_nsid; int err, new_nsid, new_ifindex;
ASSERT_RTNL(); ASSERT_RTNL();
@@ -8529,8 +8529,16 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
call_netdevice_notifiers(NETDEV_UNREGISTER, dev); call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
rcu_barrier(); rcu_barrier();
call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev); call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev);
new_nsid = peernet2id_alloc(dev_net(dev), net); new_nsid = peernet2id_alloc(dev_net(dev), net);
rtmsg_ifinfo_newnet(RTM_DELLINK, dev, ~0U, GFP_KERNEL, &new_nsid); /* If there is an ifindex conflict assign a new one */
if (__dev_get_by_index(net, dev->ifindex))
new_ifindex = dev_new_index(net);
else
new_ifindex = dev->ifindex;
rtmsg_ifinfo_newnet(RTM_DELLINK, dev, ~0U, GFP_KERNEL, &new_nsid,
new_ifindex);
/* /*
* Flush the unicast and multicast chains * Flush the unicast and multicast chains
@@ -8544,10 +8552,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
/* Actually switch the network namespace */ /* Actually switch the network namespace */
dev_net_set(dev, net); dev_net_set(dev, net);
dev->ifindex = new_ifindex;
/* If there is an ifindex conflict assign a new one */
if (__dev_get_by_index(net, dev->ifindex))
dev->ifindex = dev_new_index(net);
/* Send a netdev-add uevent to the new namespace */ /* Send a netdev-add uevent to the new namespace */
kobject_uevent(&dev->dev.kobj, KOBJ_ADD); kobject_uevent(&dev->dev.kobj, KOBJ_ADD);

31
net/core/rtnetlink.c
View File

@@ -988,6 +988,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ rtnl_xdp_size() /* IFLA_XDP */ + rtnl_xdp_size() /* IFLA_XDP */
+ nla_total_size(4) /* IFLA_EVENT */ + nla_total_size(4) /* IFLA_EVENT */
+ nla_total_size(4) /* IFLA_NEW_NETNSID */ + nla_total_size(4) /* IFLA_NEW_NETNSID */
+ nla_total_size(4) /* IFLA_NEW_IFINDEX */
+ nla_total_size(1) /* IFLA_PROTO_DOWN */ + nla_total_size(1) /* IFLA_PROTO_DOWN */
+ nla_total_size(4) /* IFLA_IF_NETNSID */ + nla_total_size(4) /* IFLA_IF_NETNSID */
+ nla_total_size(4) /* IFLA_CARRIER_UP_COUNT */ + nla_total_size(4) /* IFLA_CARRIER_UP_COUNT */
@@ -1511,7 +1512,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
struct net_device *dev, struct net *src_net, struct net_device *dev, struct net *src_net,
int type, u32 pid, u32 seq, u32 change, int type, u32 pid, u32 seq, u32 change,
unsigned int flags, u32 ext_filter_mask, unsigned int flags, u32 ext_filter_mask,
u32 event, int *new_nsid, int tgt_netnsid) u32 event, int *new_nsid, int new_ifindex,
int tgt_netnsid)
{ {
struct ifinfomsg *ifm; struct ifinfomsg *ifm;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
@@ -1608,6 +1610,10 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
if (new_nsid && if (new_nsid &&
nla_put_s32(skb, IFLA_NEW_NETNSID, *new_nsid) < 0) nla_put_s32(skb, IFLA_NEW_NETNSID, *new_nsid) < 0)
goto nla_put_failure; goto nla_put_failure;
if (new_ifindex &&
nla_put_s32(skb, IFLA_NEW_IFINDEX, new_ifindex) < 0)
goto nla_put_failure;
rcu_read_lock(); rcu_read_lock();
if (rtnl_fill_link_af(skb, dev, ext_filter_mask)) if (rtnl_fill_link_af(skb, dev, ext_filter_mask))
@@ -1853,7 +1859,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
NETLINK_CB(cb->skb).portid, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, 0, cb->nlh->nlmsg_seq, 0,
flags, flags,
ext_filter_mask, 0, NULL, ext_filter_mask, 0, NULL, 0,
netnsid); netnsid);
if (err < 0) { if (err < 0) {
@@ -3088,7 +3094,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,
err = rtnl_fill_ifinfo(nskb, dev, net, err = rtnl_fill_ifinfo(nskb, dev, net,
RTM_NEWLINK, NETLINK_CB(skb).portid, RTM_NEWLINK, NETLINK_CB(skb).portid,
nlh->nlmsg_seq, 0, 0, ext_filter_mask, nlh->nlmsg_seq, 0, 0, ext_filter_mask,
0, NULL, netnsid); 0, NULL, 0, netnsid);
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in if_nlmsg_size */ /* -EMSGSIZE implies BUG in if_nlmsg_size */
WARN_ON(err == -EMSGSIZE); WARN_ON(err == -EMSGSIZE);
@@ -3184,7 +3190,8 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)
struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev, struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
unsigned int change, unsigned int change,
u32 event, gfp_t flags, int *new_nsid) u32 event, gfp_t flags, int *new_nsid,
int new_ifindex)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct sk_buff *skb; struct sk_buff *skb;
@@ -3197,7 +3204,7 @@ struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
err = rtnl_fill_ifinfo(skb, dev, dev_net(dev), err = rtnl_fill_ifinfo(skb, dev, dev_net(dev),
type, 0, 0, change, 0, 0, event, type, 0, 0, change, 0, 0, event,
new_nsid, -1); new_nsid, new_ifindex, -1);
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in if_nlmsg_size() */ /* -EMSGSIZE implies BUG in if_nlmsg_size() */
WARN_ON(err == -EMSGSIZE); WARN_ON(err == -EMSGSIZE);
@@ -3220,14 +3227,15 @@ void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev, gfp_t flags)
static void rtmsg_ifinfo_event(int type, struct net_device *dev, static void rtmsg_ifinfo_event(int type, struct net_device *dev,
unsigned int change, u32 event, unsigned int change, u32 event,
gfp_t flags, int *new_nsid) gfp_t flags, int *new_nsid, int new_ifindex)
{ {
struct sk_buff *skb; struct sk_buff *skb;
if (dev->reg_state != NETREG_REGISTERED) if (dev->reg_state != NETREG_REGISTERED)
return; return;
skb = rtmsg_ifinfo_build_skb(type, dev, change, event, flags, new_nsid); skb = rtmsg_ifinfo_build_skb(type, dev, change, event, flags, new_nsid,
new_ifindex);
if (skb) if (skb)
rtmsg_ifinfo_send(skb, dev, flags); rtmsg_ifinfo_send(skb, dev, flags);
} }
@@ -3235,14 +3243,15 @@ static void rtmsg_ifinfo_event(int type, struct net_device *dev,
void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change, void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,
gfp_t flags) gfp_t flags)
{ {
rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags, NULL); rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags,
NULL, 0);
} }
void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change, void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,
gfp_t flags, int *new_nsid) gfp_t flags, int *new_nsid, int new_ifindex)
{ {
rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags, rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags,
new_nsid); new_nsid, new_ifindex);
} }
static int nlmsg_populate_fdb_fill(struct sk_buff *skb, static int nlmsg_populate_fdb_fill(struct sk_buff *skb,
@@ -4642,7 +4651,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
case NETDEV_CHANGELOWERSTATE: case NETDEV_CHANGELOWERSTATE:
case NETDEV_CHANGE_TX_QUEUE_LEN: case NETDEV_CHANGE_TX_QUEUE_LEN:
rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, rtnl_get_event(event), rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, rtnl_get_event(event),
GFP_KERNEL, NULL); GFP_KERNEL, NULL, 0);
break; break;
default: default:
break; break;