Skip to contentSkip to conversation

bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats

PATCH Applied Jakub Sitnicki 3 participants 3 messages Jul 14, 2021 – Jul 15, 2021

Subsystems (4)
lore
Share & tools
lore

Jakub Sitnicki

author maintainer
#0 lore raw

PATCH v2 1/1 bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

To get the correct inuse_idx value move the core_initcall that initializes the udp proto handlers to late_initcall. This way it is initialized after UDP has the chance to assign the inuse_idx value from the register protocol handler.

Fixes edc6741cc660 ("bpf: Add sockmap hooks for UDP sockets")

---

v2:
- Fixed "Fixes" tag (Cong Wang)

 net/ipv4/udp_bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/udp_bpf.c +1 -1
index 45b8782aec0c..9f5a5cdc38e6 100644
@@ -134,7 +134,7 @@ static int __init udp_bpf_v4_build_proto(void)
 	udp_bpf_rebuild_protos(&udp_bpf_prots[UDP_BPF_IPV4], &udp_prot);
 	return 0;
 }
-core_initcall(udp_bpf_v4_build_proto);
+late_initcall(udp_bpf_v4_build_proto);
 
 int udp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
 {
Signature · 1 line
2.31.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Jakub Sitnicki

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

Quoted 8 lines

To get the correct inuse_idx value move the core_initcall that initializes the udp proto handlers to late_initcall. This way it is initialized after UDP has the chance to assign the inuse_idx value from the register protocol handler.

Fixes edc6741cc660 ("bpf: Add sockmap hooks for UDP sockets")

Thanks for the update!

#2 lore raw
In reply to Jakub Sitnicki
This patch was applied to bpf/bpf.git (refs/heads/master):

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

Quoted 6 lines · On Wed, 14 Jul 2021 17:47:50 +0200 you wrote:

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

Quoted 6 lines

To get the correct inuse_idx value move the core_initcall that initializes the udp proto handlers to late_initcall. This way it is initialized after UDP has the chance to assign the inuse_idx value from the register protocol handler.

[...]

Here is the summary with links:
- [bpf,v2] bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats

    https://git.kernel.org/bpf/bpf/c/54ea2f49fd94

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html