| From b042033226704e98bb329fc39a0fa76859e74dd5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 14 Jul 2021 17:47:50 +0200 |
| Subject: bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats |
| |
| From: Jakub Sitnicki <jakub@cloudflare.com> |
| |
| [ 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 <jakub@cloudflare.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Reviewed-by: Cong Wang <cong.wang@bytedance.com> |
| Acked-by: John Fastabend <john.fastabend@gmail.com> |
| Link: https://lore.kernel.org/bpf/20210714154750.528206-1-jakub@cloudflare.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/ipv4/udp_bpf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/ipv4/udp_bpf.c b/net/ipv4/udp_bpf.c |
| index 954c4591a6fd..725b6df4b2a2 100644 |
| --- a/net/ipv4/udp_bpf.c |
| +++ b/net/ipv4/udp_bpf.c |
| @@ -101,7 +101,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) |
| { |
| -- |
| 2.30.2 |
| |
