[bpf-next,v3,1/2] bpf: add get_netns_cookie helper to tc programs

Commit Message

Mahe Tardy Oct. 7, 2024, 9:59 a.m. UTC

This is needed in the context of Cilium and Tetragon to retrieve netns
cookie from hostns when traffic leaves Pod, so that we can correlate
skb->sk's netns cookie.

Signed-off-by: Mahe Tardy <[e-mail]>
---
 net/core/filter.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

--
2.34.1

Comments

[e-mail] Oct. 8, 2024, 9:40 p.m. UTC | #1

Hello:

This series was applied to bpf/bpf-next.git (net)
by Martin KaFai Lau <[e-mail]>:

On Mon,  7 Oct 2024 09:59:57 +0000 you wrote:
> This is needed in the context of Cilium and Tetragon to retrieve netns
> cookie from hostns when traffic leaves Pod, so that we can correlate
> skb->sk's netns cookie.
> 
> Signed-off-by: Mahe Tardy <[e-mail]>
> ---
>  net/core/filter.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> [...]

Here is the summary with links:
  - [bpf-next,v3,1/2] bpf: add get_netns_cookie helper to tc programs
    https://git.kernel.org/bpf/bpf-next/c/eb62f49de7ec
  - [bpf-next,v3,2/2] selftests/bpf: add tcx netns cookie tests
    https://git.kernel.org/bpf/bpf-next/c/693fe954d61d

You are awesome, thank you!

Patch

diff --git a/net/core/filter.c b/net/core/filter.c
index cd3524cb326b..944bbe12a039 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5138,6 +5138,17 @@  static u64 __bpf_get_netns_cookie(struct sock *sk)
 	return net->net_cookie;
 }

+BPF_CALL_1(bpf_get_netns_cookie, struct sk_buff *, skb)
+{
+	return __bpf_get_netns_cookie(skb && skb->sk ? skb->sk : NULL);
+}
+
+static const struct bpf_func_proto bpf_get_netns_cookie_proto = {
+	.func           = bpf_get_netns_cookie,
+	.ret_type       = RET_INTEGER,
+	.arg1_type      = ARG_PTR_TO_CTX_OR_NULL,
+};
+
 BPF_CALL_1(bpf_get_netns_cookie_sock, struct sock *, ctx)
 {
 	return __bpf_get_netns_cookie(ctx);
@@ -8209,6 +8220,8 @@  tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
 		return &bpf_skb_under_cgroup_proto;
 	case BPF_FUNC_get_socket_cookie:
 		return &bpf_get_socket_cookie_proto;
+	case BPF_FUNC_get_netns_cookie:
+		return &bpf_get_netns_cookie_proto;
 	case BPF_FUNC_get_socket_uid:
 		return &bpf_get_socket_uid_proto;
 	case BPF_FUNC_fib_lookup: