Commit 5ffb7ac0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rtnetlink-convert-rtnl_newlink-to-per-netns-rtnl' 

Kuniyuki Iwashima says:

====================
rtnetlink: Convert rtnl_newlink() to per-netns RTNL.

Patch 1 - 3 removes __rtnl_link_unregister and protect link_ops by
its dedicated mutex to move synchronize_srcu() out of RTNL scope.

Patch 4 introduces struct rtnl_nets and helper functions to acquire
multiple per-netns RTNL in rtnl_newlink().

Patch 5 - 8 are to prefetch the peer device's netns in rtnl_newlink().

Patch 9 converts rtnl_newlink() to per-netns RTNL.

Patch 10 pushes RTNL down to rtnl_dellink() and rtnl_setlink(), but
the conversion will not be completed unless we support cases with
peer/upper/lower devices.

I confirmed v3 survived ./rtnetlink.sh; rmmod netdevsim.ko; without
lockdep splat.

v3: https://lore.kernel.org/20241107022900.70287-1-kuniyu@amazon.com
v2: https://lore.kernel.org/20241106022432.13065-1-kuniyu@amazon.com
v1: https://lore.kernel.org/20241105020514.41963-1-kuniyu@amazon.com
====================

Link: https://patch.msgid.link/20241108004823.29419-1-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7a3bcd39 636af13f

drivers/net/can/vxcan.c

+3 −9
Original line number Diff line number Diff line
@@ -188,14 +188,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 


	/* register peer device */

	if (data && data[VXCAN_INFO_PEER]) {

		struct nlattr *nla_peer;

		struct nlattr *nla_peer = data[VXCAN_INFO_PEER];



		nla_peer = data[VXCAN_INFO_PEER];

		ifmp = nla_data(nla_peer);

		err = rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack);

		if (err < 0)

			return err;



		rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack);

		tbp = peer_tb;

	}
@@ -208,9 +204,6 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
	}



	peer_net = rtnl_link_get_net(net, tbp);

	if (IS_ERR(peer_net))

		return PTR_ERR(peer_net);



	peer = rtnl_create_link(peer_net, ifname, name_assign_type,

				&vxcan_link_ops, tbp, extack);

	if (IS_ERR(peer)) {
@@ -302,6 +295,7 @@ static struct rtnl_link_ops vxcan_link_ops = { 
	.newlink	= vxcan_newlink,

	.dellink	= vxcan_dellink,

	.policy		= vxcan_policy,

	.peer_type	= VXCAN_INFO_PEER,

	.maxtype	= VXCAN_INFO_MAX,

	.get_link_net	= vxcan_get_link_net,

};

drivers/net/dummy.c

+8 −9
Original line number Diff line number Diff line
@@ -168,22 +168,21 @@ static int __init dummy_init_module(void) 
{

	int i, err = 0;



	down_write(&pernet_ops_rwsem);

	rtnl_lock();

	err = __rtnl_link_register(&dummy_link_ops);

	err = rtnl_link_register(&dummy_link_ops);

	if (err < 0)

		goto out;

		return err;



	rtnl_net_lock(&init_net);



	for (i = 0; i < numdummies && !err; i++) {

		err = dummy_init_one();

		cond_resched();

	}

	if (err < 0)

		__rtnl_link_unregister(&dummy_link_ops);



out:

	rtnl_unlock();

	up_write(&pernet_ops_rwsem);

	rtnl_net_unlock(&init_net);



	if (err < 0)

		rtnl_link_unregister(&dummy_link_ops);



	return err;

}

drivers/net/ifb.c

+8 −9
Original line number Diff line number Diff line
@@ -426,22 +426,21 @@ static int __init ifb_init_module(void) 
{

	int i, err;



	down_write(&pernet_ops_rwsem);

	rtnl_lock();

	err = __rtnl_link_register(&ifb_link_ops);

	err = rtnl_link_register(&ifb_link_ops);

	if (err < 0)

		goto out;

		return err;



	rtnl_net_lock(&init_net);



	for (i = 0; i < numifbs && !err; i++) {

		err = ifb_init_one(i);

		cond_resched();

	}

	if (err)

		__rtnl_link_unregister(&ifb_link_ops);



out:

	rtnl_unlock();

	up_write(&pernet_ops_rwsem);

	rtnl_net_unlock(&init_net);



	if (err)

		rtnl_link_unregister(&ifb_link_ops);



	return err;

}

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,

};

drivers/net/veth.c

+4 −14
Original line number Diff line number Diff line
@@ -1781,19 +1781,11 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, 
	/*

	 * create and register peer first

	 */

	if (data != NULL && data[VETH_INFO_PEER] != NULL) {

		struct nlattr *nla_peer;

	if (data && data[VETH_INFO_PEER]) {

		struct nlattr *nla_peer = data[VETH_INFO_PEER];



		nla_peer = data[VETH_INFO_PEER];

		ifmp = nla_data(nla_peer);

		err = 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;



		rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack);

		tbp = peer_tb;

	} else {

		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);

	if (IS_ERR(net))

		return PTR_ERR(net);



	peer = rtnl_create_link(net, ifname, name_assign_type,

				&veth_link_ops, tbp, extack);

	if (IS_ERR(peer)) {
@@ -1952,6 +1941,7 @@ static struct rtnl_link_ops veth_link_ops = { 
	.newlink	= veth_newlink,

	.dellink	= veth_dellink,

	.policy		= veth_policy,

	.peer_type	= VETH_INFO_PEER,

	.maxtype	= VETH_INFO_MAX,

	.get_link_net	= veth_get_link_net,

	.get_num_tx_queues	= veth_get_num_queues,