From: Jakub Sitnicki Date: Wed, 14 Jul 2021 15:47:50 +0000 (+0200) Subject: bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats X-Git-Tag: v5.10.79~2124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b5b0afd8d97b0e98e5dc91526414e9d27c08027;p=platform%2Fkernel%2Flinux-rpi.git bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats [ Upstream commit 54ea2f49fd9400dd698c25450be3352b5613b3b4 ] The 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") Signed-off-by: Jakub Sitnicki Signed-off-by: Daniel Borkmann Reviewed-by: Cong Wang Acked-by: John Fastabend Link: https://lore.kernel.org/bpf/20210714154750.528206-1-jakub@cloudflare.com Signed-off-by: Sasha Levin --- diff --git a/net/ipv4/udp_bpf.c b/net/ipv4/udp_bpf.c index 7a94791..69c9663 100644 --- a/net/ipv4/udp_bpf.c +++ b/net/ipv4/udp_bpf.c @@ -39,7 +39,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); struct proto *udp_bpf_get_proto(struct sock *sk, struct sk_psock *psock) {