| From 5a33683654f4c64bd45012c99faa8eb364f6b134 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 12 Jul 2021 12:55:46 -0700 |
| Subject: bpf, sockmap, tcp: sk_prot needs inuse_idx set for proc stats |
| |
| From: John Fastabend <john.fastabend@gmail.com> |
| |
| [ Upstream commit 228a4a7ba8e99bb9ef980b62f71e3be33f4aae69 ] |
| |
| 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 TCP proto handlers to late_initcall. This way it is initialized after |
| TCP has the chance to assign the inuse_idx value from the register protocol |
| handler. |
| |
| Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface") |
| Suggested-by: Jakub Sitnicki <jakub@cloudflare.com> |
| Signed-off-by: John Fastabend <john.fastabend@gmail.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Reviewed-by: Cong Wang <cong.wang@bytedance.com> |
| Link: https://lore.kernel.org/bpf/20210712195546.423990-3-john.fastabend@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/ipv4/tcp_bpf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c |
| index ad9d17923fc5..b65201ba4d93 100644 |
| --- a/net/ipv4/tcp_bpf.c |
| +++ b/net/ipv4/tcp_bpf.c |
| @@ -486,7 +486,7 @@ static int __init tcp_bpf_v4_build_proto(void) |
| tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV4], &tcp_prot); |
| return 0; |
| } |
| -core_initcall(tcp_bpf_v4_build_proto); |
| +late_initcall(tcp_bpf_v4_build_proto); |
| |
| static int tcp_bpf_assert_proto_ops(struct proto *ops) |
| { |
| -- |
| 2.30.2 |
| |