dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

net: sched: Use rtnl_register_many().

Browse Source 
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: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://patch.msgid.link/20241014201828.91221-5-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kuniyuki Iwashima
2024-10-14 13:18:21 -07:00
committed by Jakub Kicinski
parent d0d14aef50
commit cc72bb0303
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/sched/act_api.c
View File

@@ -2243,13 +2243,16 @@ out_module_put:
return skb->len;
}
static const struct rtnl_msg_handler tc_action_rtnl_msg_handlers[] __initconst = {
{.msgtype = RTM_NEWACTION, .doit = tc_ctl_action},
{.msgtype = RTM_DELACTION, .doit = tc_ctl_action},
{.msgtype = RTM_GETACTION, .doit = tc_ctl_action,
.dumpit = tc_dump_action},
};
static int __init tc_action_init(void)
{
rtnl_register(PF_UNSPEC, RTM_NEWACTION, tc_ctl_action, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_DELACTION, tc_ctl_action, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_GETACTION, tc_ctl_action, tc_dump_action,
0);
rtnl_register_many(tc_action_rtnl_msg_handlers);
return 0;
}

25
net/sched/cls_api.c
View File

@@ -4055,6 +4055,19 @@ static struct pernet_operations tcf_net_ops = {
.size = sizeof(struct tcf_net),
};
static const struct rtnl_msg_handler tc_filter_rtnl_msg_handlers[] __initconst = {
{.msgtype = RTM_NEWTFILTER, .doit = tc_new_tfilter,
.flags = RTNL_FLAG_DOIT_UNLOCKED},
{.msgtype = RTM_DELTFILTER, .doit = tc_del_tfilter,
.flags = RTNL_FLAG_DOIT_UNLOCKED},
{.msgtype = RTM_GETTFILTER, .doit = tc_get_tfilter,
.dumpit = tc_dump_tfilter, .flags = RTNL_FLAG_DOIT_UNLOCKED},
{.msgtype = RTM_NEWCHAIN, .doit = tc_ctl_chain},
{.msgtype = RTM_DELCHAIN, .doit = tc_ctl_chain},
{.msgtype = RTM_GETCHAIN, .doit = tc_ctl_chain,
.dumpit = tc_dump_chain},
};
static int __init tc_filter_init(void)
{
int err;
@@ -4068,17 +4081,7 @@ static int __init tc_filter_init(void)
goto err_register_pernet_subsys;
xa_init_flags(&tcf_exts_miss_cookies_xa, XA_FLAGS_ALLOC1);
rtnl_register(PF_UNSPEC, RTM_NEWTFILTER, tc_new_tfilter, NULL,
RTNL_FLAG_DOIT_UNLOCKED);
rtnl_register(PF_UNSPEC, RTM_DELTFILTER, tc_del_tfilter, NULL,
RTNL_FLAG_DOIT_UNLOCKED);
rtnl_register(PF_UNSPEC, RTM_GETTFILTER, tc_get_tfilter,
tc_dump_tfilter, RTNL_FLAG_DOIT_UNLOCKED);
rtnl_register(PF_UNSPEC, RTM_NEWCHAIN, tc_ctl_chain, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_DELCHAIN, tc_ctl_chain, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_GETCHAIN, tc_ctl_chain,
tc_dump_chain, 0);
rtnl_register_many(tc_filter_rtnl_msg_handlers);
return 0;

20
net/sched/sch_api.c
View File

@@ -2420,6 +2420,17 @@ static struct pernet_operations psched_net_ops = {
DEFINE_STATIC_KEY_FALSE(tc_skip_wrapper);
#endif
static const struct rtnl_msg_handler psched_rtnl_msg_handlers[] __initconst = {
{.msgtype = RTM_NEWQDISC, .doit = tc_modify_qdisc},
{.msgtype = RTM_DELQDISC, .doit = tc_get_qdisc},
{.msgtype = RTM_GETQDISC, .doit = tc_get_qdisc,
.dumpit = tc_dump_qdisc},
{.msgtype = RTM_NEWTCLASS, .doit = tc_ctl_tclass},
{.msgtype = RTM_DELTCLASS, .doit = tc_ctl_tclass},
{.msgtype = RTM_GETTCLASS, .doit = tc_ctl_tclass,
.dumpit = tc_dump_tclass},
};
static int __init pktsched_init(void)
{
int err;
@@ -2438,14 +2449,7 @@ static int __init pktsched_init(void)
register_qdisc(&mq_qdisc_ops);
register_qdisc(&noqueue_qdisc_ops);
rtnl_register(PF_UNSPEC, RTM_NEWQDISC, tc_modify_qdisc, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_DELQDISC, tc_get_qdisc, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_GETQDISC, tc_get_qdisc, tc_dump_qdisc,
0);
rtnl_register(PF_UNSPEC, RTM_NEWTCLASS, tc_ctl_tclass, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_DELTCLASS, tc_ctl_tclass, NULL, 0);
rtnl_register(PF_UNSPEC, RTM_GETTCLASS, tc_ctl_tclass, tc_dump_tclass,
0);
rtnl_register_many(psched_rtnl_msg_handlers);
tc_wrapper_init();