nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

veth: Set VETH_INFO_PEER to veth_link_ops.peer_type.

Browse source 
For per-netns RTNL, we need to prefetch the peer device's netns.

Let's set rtnl_link_ops.peer_type and accordingly remove duplicated
validation in ->newlink().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20241108004823.29419-7-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kuniyuki Iwashima 2024-11-07 16:48:19 -08:00 committed by Jakub Kicinski
parent 28690e5361
commit 0eb87b02a7
1 changed files with 4 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/veth.c
View file

@ -1781,19 +1781,11 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
/* /*
* create and register peer first * create and register peer first
*/ */
if (data != NULL && data[VETH_INFO_PEER] != NULL) { if (data && data[VETH_INFO_PEER]) {
struct nlattr *nla_peer; struct nlattr *nla_peer = data[VETH_INFO_PEER];
nla_peer = data[VETH_INFO_PEER];
ifmp = nla_data(nla_peer); ifmp = nla_data(nla_peer);
err = rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack); rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack);
if (err < 0)
return err;
err = veth_validate(peer_tb, NULL, extack);
if (err < 0)
return err;
tbp = peer_tb; tbp = peer_tb;
} else { } else {
ifmp = NULL; ifmp = NULL;
@ -1809,9 +1801,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
} }
net = rtnl_link_get_net(src_net, tbp); net = rtnl_link_get_net(src_net, tbp);
if (IS_ERR(net))
return PTR_ERR(net);
peer = rtnl_create_link(net, ifname, name_assign_type, peer = rtnl_create_link(net, ifname, name_assign_type,
&veth_link_ops, tbp, extack); &veth_link_ops, tbp, extack);
if (IS_ERR(peer)) { if (IS_ERR(peer)) {
@ -1952,6 +1941,7 @@ static struct rtnl_link_ops veth_link_ops = {
.newlink = veth_newlink, .newlink = veth_newlink,
.dellink = veth_dellink, .dellink = veth_dellink,
.policy = veth_policy, .policy = veth_policy,
.peer_type = VETH_INFO_PEER,
.maxtype = VETH_INFO_MAX, .maxtype = VETH_INFO_MAX,
.get_link_net = veth_get_link_net, .get_link_net = veth_get_link_net,
.get_num_tx_queues = veth_get_num_queues, .get_num_tx_queues = veth_get_num_queues,