ipv6: bring NLM_DONE out to a separate recv() again
Subsystems (3)
Jakub Kicinski
maintainerPATCH 1/1 ipv6: bring NLM_DONE out to a separate recv() again
Commit under Fixes optimized the number of recv() calls needed during RTM_GETROUTE dumps, but we got multiple reports of applications hanging on recv() calls. Applications expect that a route dump will be terminated with a recv() reading an individual NLM_DONE message.
Coalescing NLM_DONE is perfectly legal in netlink, but even tho reporters fixed the code in respective projects, chances are it will take time for those applications to get updated. So revert to old behavior (for now)?
This is an IPv6 version of commit 460b0d33cf10 ("inet: bring NLM_DONE out to a separate recv() again").
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- net/ipv6/ip6_fib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ip6_fib.c +2 -1
@@ -2514,7 +2514,8 @@ int __init fib6_init(void) goto out_kmem_cache_create; ret =rtnl_register_module (THIS_MODULE ,PF_INET6 ,RTM_GETROUTE ,NULL , - inet6_dump_fib,RTNL_FLAG_DUMP_UNLOCKED ); + inet6_dump_fib,RTNL_FLAG_DUMP_UNLOCKED | +RTNL_FLAG_DUMP_SPLIT_NLM_DONE );if (ret) goto out_unregister_subsys;
Signature · 1 line
2.45.2
Quoted 36 lines · Jakub Kicinski
Commit under Fixes optimized the number of
recv()calls needed duringRTM_GETROUTEdumps, but we got multiple reports of applications hanging onrecv()calls. Applications expect that a route dump will be terminated with arecv()reading an individualNLM_DONEmessage.Coalescing
NLM_DONEis perfectly legal in netlink, but even tho reporters fixed the code in respective projects, chances are it will take time for those applications to get updated. So revert to old behavior (for now)?This is an IPv6 version of commit
460b0d33cf10("inet: bringNLM_DONEout to a separaterecv()again").Reported-by Maciej Żenczykowski <[email protected]>Link https://lore.kernel.org/all/CANP3RGc1RG71oPEBXNx_WZFP9AyphJefdO4paczN92n__ds4ow@mail.gmail.com open hereReported-by Stefano Brivio <[email protected]>Reported-by Ilya Maximets <[email protected]>Fixes 5fc68320c1fb ("ipv6: remove RTNL protection from inet6_dump_fib()")Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]--- net/ipv6/ip6_fib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/ipv6/ip6_fib.c +0
-0
net/ipv6/ip6_fib.c int __init fib6_init(void) · line 2521
Quoted 9 lines
net/ipv6/ip6_fib.c +2
-1@@ -2514,7 +2514,8 @@ int __init fib6_init(void) goto out_kmem_cache_create; ret =rtnl_register_module (THIS_MODULE ,PF_INET6 ,RTM_GETROUTE ,NULL , - inet6_dump_fib,RTNL_FLAG_DUMP_UNLOCKED ); + inet6_dump_fib,RTNL_FLAG_DUMP_UNLOCKED | +RTNL_FLAG_DUMP_SPLIT_NLM_DONE );if (ret) goto out_unregister_subsys;
Thanks, Jakub! LGTM.
Libreswan in OVS tests is working fine with this change on top of 6.10-rc4. The rest of the test suite is also working fine (except for FTP conntrack, but that's an unrelated issue).
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Tue, 18 Jun 2024 12:39:14 -0700 you wrote:
Commit under Fixes optimized the number of
recv()calls needed duringRTM_GETROUTEdumps, but we got multiple reports of applications hanging onrecv()calls. Applications expect that a route dump will be terminated with arecv()reading an individualNLM_DONEmessage.
Quoted 7 lines
Coalescing
NLM_DONEis perfectly legal in netlink, but even tho reporters fixed the code in respective projects, chances are it will take time for those applications to get updated. So revert to old behavior (for now)?[...]
Here is the summary with links:
- [net] ipv6: bring NLM_DONE out to a separate recv() again
https://git.kernel.org/netdev/net/c/02a176d42a88
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html