github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ipv6: Use link netns in newlink() of rtnl_link_ops

Browse Source 
When link_net is set, use it as link netns instead of dev_net(). This
prepares for rtnetlink core to create device in target netns directly,
in which case the two namespaces may be different.

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250219125039.18024-9-shaw.leon@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Xiao Liang 2025-02-19 20:50:34 +08:00 committed by Jakub Kicinski
parent db014522f3
commit 5e72ce3e39
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv6/ip6_gre.c
View File

@ -1969,7 +1969,7 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[],
return ret;
}
static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev,
static int ip6gre_newlink_common(struct net *link_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
@ -1990,7 +1990,7 @@ static int ip6gre_newlink_common(struct net *src_net, struct net_device *dev,
eth_hw_addr_random(dev);
nt->dev = dev;
nt->net = dev_net(dev);
nt->net = link_net;
err = register_netdevice(dev);
if (err)
@ -2007,11 +2007,10 @@ static int ip6gre_newlink(struct net_device *dev,
struct rtnl_newlink_params *params,
struct netlink_ext_ack *extack)
{
struct net *net = params->link_net ? : dev_net(dev);
struct ip6_tnl *nt = netdev_priv(dev);
struct nlattr **data = params->data;
struct net *src_net = params->net;
struct nlattr **tb = params->tb;
struct net *net = dev_net(dev);
struct ip6gre_net *ign;
int err;
@ -2026,7 +2025,7 @@ static int ip6gre_newlink(struct net_device *dev,
return -EEXIST;
}
err = ip6gre_newlink_common(src_net, dev, tb, data, extack);
err = ip6gre_newlink_common(net, dev, tb, data, extack);
if (!err) {
ip6gre_tnl_link_config(nt, !tb[IFLA_MTU]);
ip6gre_tunnel_link_md(ign, nt);
@ -2246,11 +2245,10 @@ static int ip6erspan_newlink(struct net_device *dev,
struct rtnl_newlink_params *params,
struct netlink_ext_ack *extack)
{
struct net *net = params->link_net ? : dev_net(dev);
struct ip6_tnl *nt = netdev_priv(dev);
struct nlattr **data = params->data;
struct net *src_net = params->net;
struct nlattr **tb = params->tb;
struct net *net = dev_net(dev);
struct ip6gre_net *ign;
int err;
@ -2266,7 +2264,7 @@ static int ip6erspan_newlink(struct net_device *dev,
return -EEXIST;
}
err = ip6gre_newlink_common(src_net, dev, tb, data, extack);
err = ip6gre_newlink_common(net, dev, tb, data, extack);
if (!err) {
ip6erspan_tnl_link_config(nt, !tb[IFLA_MTU]);
ip6erspan_tunnel_link_md(ign, nt);

9
net/ipv6/ip6_tunnel.c
View File

@ -253,8 +253,7 @@ static void ip6_dev_free(struct net_device *dev)
static int ip6_tnl_create2(struct net_device *dev)
{
struct ip6_tnl *t = netdev_priv(dev);
struct net *net = dev_net(dev);
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
struct ip6_tnl_net *ip6n = net_generic(t->net, ip6_tnl_net_id);
int err;
dev->rtnl_link_ops = &ip6_link_ops;
@ -2008,12 +2007,14 @@ static int ip6_tnl_newlink(struct net_device *dev,
{
struct nlattr **data = params->data;
struct nlattr **tb = params->tb;
struct net *net = dev_net(dev);
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
struct ip_tunnel_encap ipencap;
struct ip6_tnl_net *ip6n;
struct ip6_tnl *nt, *t;
struct net *net;
int err;
net = params->link_net ? : dev_net(dev);
ip6n = net_generic(net, ip6_tnl_net_id);
nt = netdev_priv(dev);
nt->net = net;

6
net/ipv6/ip6_vti.c
View File

@ -177,8 +177,7 @@ vti6_tnl_unlink(struct vti6_net *ip6n, struct ip6_tnl *t)
static int vti6_tnl_create2(struct net_device *dev)
{
struct ip6_tnl *t = netdev_priv(dev);
struct net *net = dev_net(dev);
struct vti6_net *ip6n = net_generic(net, vti6_net_id);
struct vti6_net *ip6n = net_generic(t->net, vti6_net_id);
int err;
dev->rtnl_link_ops = &vti6_link_ops;
@ -1002,9 +1001,10 @@ static int vti6_newlink(struct net_device *dev,
struct netlink_ext_ack *extack)
{
struct nlattr **data = params->data;
struct net *net = dev_net(dev);
struct ip6_tnl *nt;
struct net *net;
net = params->link_net ? : dev_net(dev);
nt = netdev_priv(dev);
vti6_netlink_parms(data, &nt->parms);

6
net/ipv6/sit.c
View File

@ -201,8 +201,7 @@ static void ipip6_tunnel_clone_6rd(struct net_device *dev, struct sit_net *sitn)
static int ipip6_tunnel_create(struct net_device *dev)
{
struct ip_tunnel *t = netdev_priv(dev);
struct net *net = dev_net(dev);
struct sit_net *sitn = net_generic(net, sit_net_id);
struct sit_net *sitn = net_generic(t->net, sit_net_id);
int err;
__dev_addr_set(dev, &t->parms.iph.saddr, 4);
@ -1556,14 +1555,15 @@ static int ipip6_newlink(struct net_device *dev,
{
struct nlattr **data = params->data;
struct nlattr **tb = params->tb;
struct net *net = dev_net(dev);
struct ip_tunnel *nt;
struct ip_tunnel_encap ipencap;
#ifdef CONFIG_IPV6_SIT_6RD
struct ip_tunnel_6rd ip6rd;
#endif
struct net *net;
int err;
net = params->link_net ? : dev_net(dev);
nt = netdev_priv(dev);
nt->net = net;