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

ipv4: Use rtnl_register_many(). 



We will remove rtnl_register() in favour of rtnl_register_many().

When it succeeds, rtnl_register_many() guarantees all rtnetlink types
in the passed array are supported, and there is no chance that a part
of message types is not supported.

Let's use rtnl_register_many() instead.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241014201828.91221-7-kuniyu@amazon.com


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

net/core/fib_rules.c

+10 −7
Original line number Diff line number Diff line
@@ -1291,13 +1291,18 @@ static struct pernet_operations fib_rules_net_ops = { 
	.exit = fib_rules_net_exit,

};



static const struct rtnl_msg_handler fib_rules_rtnl_msg_handlers[] __initconst = {

	{.msgtype = RTM_NEWRULE, .doit = fib_nl_newrule},

	{.msgtype = RTM_DELRULE, .doit = fib_nl_delrule},

	{.msgtype = RTM_GETRULE, .dumpit = fib_nl_dumprule,

	 .flags = RTNL_FLAG_DUMP_UNLOCKED},

};



static int __init fib_rules_init(void)

{

	int err;

	rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule,

		      RTNL_FLAG_DUMP_UNLOCKED);



	rtnl_register_many(fib_rules_rtnl_msg_handlers);



	err = register_pernet_subsys(&fib_rules_net_ops);

	if (err < 0)
@@ -1312,9 +1317,7 @@ static int __init fib_rules_init(void) 
fail_unregister:

	unregister_pernet_subsys(&fib_rules_net_ops);

fail:

	rtnl_unregister(PF_UNSPEC, RTM_NEWRULE);

	rtnl_unregister(PF_UNSPEC, RTM_DELRULE);

	rtnl_unregister(PF_UNSPEC, RTM_GETRULE);

	rtnl_unregister_many(fib_rules_rtnl_msg_handlers);

	return err;

}

net/ipv4/devinet.c

+11 −7
Original line number Diff line number Diff line
@@ -2797,6 +2797,16 @@ static struct rtnl_af_ops inet_af_ops __read_mostly = { 
	.set_link_af	  = inet_set_link_af,

};



static const struct rtnl_msg_handler devinet_rtnl_msg_handlers[] __initconst = {

	{.protocol = PF_INET, .msgtype = RTM_NEWADDR, .doit = inet_rtm_newaddr},

	{.protocol = PF_INET, .msgtype = RTM_DELADDR, .doit = inet_rtm_deladdr},

	{.protocol = PF_INET, .msgtype = RTM_GETADDR, .dumpit = inet_dump_ifaddr,

	 .flags = RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE},

	{.protocol = PF_INET, .msgtype = RTM_GETNETCONF,

	 .doit = inet_netconf_get_devconf, .dumpit = inet_netconf_dump_devconf,

	 .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},

};



void __init devinet_init(void)

{

	register_pernet_subsys(&devinet_ops);
@@ -2804,11 +2814,5 @@ void __init devinet_init(void) 


	rtnl_af_register(&inet_af_ops);



	rtnl_register(PF_INET, RTM_NEWADDR, inet_rtm_newaddr, NULL, 0);

	rtnl_register(PF_INET, RTM_DELADDR, inet_rtm_deladdr, NULL, 0);

	rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr,

		      RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE);

	rtnl_register(PF_INET, RTM_GETNETCONF, inet_netconf_get_devconf,

		      inet_netconf_dump_devconf,

		      RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED);

	rtnl_register_many(devinet_rtnl_msg_handlers);

}

net/ipv4/fib_frontend.c

+10 −4
Original line number Diff line number Diff line
@@ -1649,6 +1649,15 @@ static struct pernet_operations fib_net_ops = { 
	.exit_batch = fib_net_exit_batch,

};



static const struct rtnl_msg_handler fib_rtnl_msg_handlers[] __initconst = {

	{.protocol = PF_INET, .msgtype = RTM_NEWROUTE,

	 .doit = inet_rtm_newroute},

	{.protocol = PF_INET, .msgtype = RTM_DELROUTE,

	 .doit = inet_rtm_delroute},

	{.protocol = PF_INET, .msgtype = RTM_GETROUTE, .dumpit = inet_dump_fib,

	 .flags = RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE},

};



void __init ip_fib_init(void)

{

	fib_trie_init();
@@ -1658,8 +1667,5 @@ void __init ip_fib_init(void) 
	register_netdevice_notifier(&fib_netdev_notifier);

	register_inetaddr_notifier(&fib_inetaddr_notifier);



	rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL, 0);

	rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL, 0);

	rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib,

		      RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE);

	rtnl_register_many(fib_rtnl_msg_handlers);

}

net/ipv4/nexthop.c

+18 −13
Original line number Diff line number Diff line
@@ -4042,25 +4042,30 @@ static struct pernet_operations nexthop_net_ops = { 
	.exit_batch_rtnl = nexthop_net_exit_batch_rtnl,

};



static const struct rtnl_msg_handler nexthop_rtnl_msg_handlers[] __initconst = {

	{.msgtype = RTM_NEWNEXTHOP, .doit = rtm_new_nexthop},

	{.msgtype = RTM_DELNEXTHOP, .doit = rtm_del_nexthop},

	{.msgtype = RTM_GETNEXTHOP, .doit = rtm_get_nexthop,

	 .dumpit = rtm_dump_nexthop},

	{.msgtype = RTM_GETNEXTHOPBUCKET, .doit = rtm_get_nexthop_bucket,

	 .dumpit = rtm_dump_nexthop_bucket},

	{.protocol = PF_INET, .msgtype = RTM_NEWNEXTHOP,

	 .doit = rtm_new_nexthop},

	{.protocol = PF_INET, .msgtype = RTM_GETNEXTHOP,

	 .dumpit = rtm_dump_nexthop},

	{.protocol = PF_INET6, .msgtype = RTM_NEWNEXTHOP,

	 .doit = rtm_new_nexthop},

	{.protocol = PF_INET6, .msgtype = RTM_GETNEXTHOP,

	 .dumpit = rtm_dump_nexthop},

};



static int __init nexthop_init(void)

{

	register_pernet_subsys(&nexthop_net_ops);



	register_netdevice_notifier(&nh_netdev_notifier);



	rtnl_register(PF_UNSPEC, RTM_NEWNEXTHOP, rtm_new_nexthop, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_DELNEXTHOP, rtm_del_nexthop, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_GETNEXTHOP, rtm_get_nexthop,

		      rtm_dump_nexthop, 0);



	rtnl_register(PF_INET, RTM_NEWNEXTHOP, rtm_new_nexthop, NULL, 0);

	rtnl_register(PF_INET, RTM_GETNEXTHOP, NULL, rtm_dump_nexthop, 0);



	rtnl_register(PF_INET6, RTM_NEWNEXTHOP, rtm_new_nexthop, NULL, 0);

	rtnl_register(PF_INET6, RTM_GETNEXTHOP, NULL, rtm_dump_nexthop, 0);



	rtnl_register(PF_UNSPEC, RTM_GETNEXTHOPBUCKET, rtm_get_nexthop_bucket,

		      rtm_dump_nexthop_bucket, 0);

	rtnl_register_many(nexthop_rtnl_msg_handlers);



	return 0;

}

net/ipv4/route.c

+6 −2
Original line number Diff line number Diff line
@@ -3632,6 +3632,11 @@ static __net_initdata struct pernet_operations ipv4_inetpeer_ops = { 
struct ip_rt_acct __percpu *ip_rt_acct __read_mostly;

#endif /* CONFIG_IP_ROUTE_CLASSID */



static const struct rtnl_msg_handler ip_rt_rtnl_msg_handlers[] __initconst = {

	{.protocol = PF_INET, .msgtype = RTM_GETROUTE,

	 .doit = inet_rtm_getroute, .flags = RTNL_FLAG_DOIT_UNLOCKED},

};



int __init ip_rt_init(void)

{

	void *idents_hash;
@@ -3689,8 +3694,7 @@ int __init ip_rt_init(void) 
	xfrm_init();

	xfrm4_init();

#endif

	rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL,

		      RTNL_FLAG_DOIT_UNLOCKED);

	rtnl_register_many(ip_rt_rtnl_msg_handlers);



#ifdef CONFIG_SYSCTL

	register_pernet_subsys(&sysctl_route_ops);