fib: rules: no longer hold RTNL in fib_nl_dumprule()
Subsystems (3)
PATCH 1/1 fib: rules: no longer hold RTNL in fib_nl_dumprule()
- fib rules are already RCU protected, RTNL is not needed to get them.
- Fix return value at the end of a dump,
so that NLMSG_DONE can be appended to current skb, saving one recvmsg() system call.
--- net/core/fib_rules.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
net/core/fib_rules.c +9 -8
@@ -1142,10 +1142,10 @@ static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)const struct nlmsghdr *nlh = cb->nlh;struct net *net =sock_net (skb->sk);struct fib_rules_ops *ops; -int idx =0 , family; +int err, idx =0 , family;if (cb->strict_check) { -int err =fib_valid_dumprule_req (nlh, cb->extack); + err =fib_valid_dumprule_req (nlh, cb->extack);if (err <0 )return err;
@@ -1158,17 +1158,17 @@ static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)if (ops ==NULL )return -EAFNOSUPPORT ; -dump_rules (skb, cb, ops); - -return skb->len; +return dump_rules (skb, cb, ops); } + err =0 ;rcu_read_lock ();list_for_each_entry_rcu (ops, &net->rules_ops, list) {if (idx < cb->args[0 ] || !try_module_get (ops->owner)) goto skip; -if (dump_rules (skb, cb, ops) <0 ) + err =dump_rules (skb, cb, ops); +if (err <0 )break ; cb->args[1 ] =0 ;
@@ -1178,7 +1178,7 @@ static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)rcu_read_unlock (); cb->args[0 ] = idx; -return skb->len; +return err; } static void notify_rule_change(int event, struct fib_rule *rule,
@@ -1293,7 +1293,8 @@ 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,0 ); +rtnl_register (PF_UNSPEC ,RTM_GETRULE ,NULL , fib_nl_dumprule, +RTNL_FLAG_DUMP_UNLOCKED ); err =register_pernet_subsys (&fib_rules_net_ops);if (err <0 )
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Quoted 12 lines · Eric Dumazet
- fib rules are already RCU protected, RTNL is not needed to get them.
- Fix return value at the end of a dump,
so thatNLMSG_DONEcan be appended to current skb, saving onerecvmsg()system call.Signed-off-by Eric Dumazet <[email protected]>--- net/core/fib_rules.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 11 Apr 2024 13:33:40 +0000 you wrote:
- fib rules are already RCU protected, RTNL is not needed to get them.
- Fix return value at the end of a dump,
so thatNLMSG_DONEcan be appended to current skb, saving onerecvmsg()system call.[...]
Here is the summary with links:
- [net-next] fib: rules: no longer hold RTNL in fib_nl_dumprule()
https://git.kernel.org/netdev/net-next/c/32affa5578f0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html