Commit fefd5d08 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

netkit: Set IFLA_NETKIT_PEER_INFO to netkit_link_ops.peer_type. 



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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20241108004823.29419-9-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6b84e558

drivers/net/netkit.c

+2 −9
Original line number Diff line number Diff line
@@ -351,12 +351,7 @@ static int netkit_new_link(struct net *src_net, struct net_device *dev, 
		if (data[IFLA_NETKIT_PEER_INFO]) {

			attr = data[IFLA_NETKIT_PEER_INFO];

			ifmp = nla_data(attr);

			err = rtnl_nla_parse_ifinfomsg(peer_tb, attr, extack);

			if (err < 0)

				return err;

			err = netkit_validate(peer_tb, NULL, extack);

			if (err < 0)

				return err;

			rtnl_nla_parse_ifinfomsg(peer_tb, attr, extack);

			tbp = peer_tb;

		}

		if (data[IFLA_NETKIT_SCRUB])
@@ -391,9 +386,6 @@ static int netkit_new_link(struct net *src_net, struct net_device *dev, 
		return -EOPNOTSUPP;



	net = rtnl_link_get_net(src_net, tbp);

	if (IS_ERR(net))

		return PTR_ERR(net);



	peer = rtnl_create_link(net, ifname, ifname_assign_type,

				&netkit_link_ops, tbp, extack);

	if (IS_ERR(peer)) {
@@ -978,6 +970,7 @@ static struct rtnl_link_ops netkit_link_ops = { 
	.fill_info	= netkit_fill_info,

	.policy		= netkit_policy,

	.validate	= netkit_validate,

	.peer_type	= IFLA_NETKIT_PEER_INFO,

	.maxtype	= IFLA_NETKIT_MAX,

};