bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
Subsystems (5)
v3 cover bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
We'd like to be able to identify netns from setsockopt hooks to be able to do the enforcement of some options only in the "initial" netns (to give users the ability to create clear/isolated sandboxes if needed without any enforcement by doing unshare(net)).
v3:
- remove extra 'ctx->skb == NULL' check (Martin KaFai Lau)
- rework test to make sure the helper is really called, not just verified
v2:
- add missing CONFIG_NET
Stanislav Fomichev (2):
bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT selftests/bpf: verify bpf_get_netns_cookie in
BPF_PROG_TYPE_CGROUP_SOCKOPT
kernel/bpf/cgroup.c | 18 ++++++++++++++++++ tools/testing/selftests/bpf/progs/sockopt_sk.c | 16 ++++++++++++++++ 2 files changed, 34 insertions(+)
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
PATCH v3 1/2 bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
This is similar to existing BPF_PROG_TYPE_CGROUP_SOCK and BPF_PROG_TYPE_CGROUP_SOCK_ADDR.
--- kernel/bpf/cgroup.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
kernel/bpf/cgroup.c +18 -0
@@ -1846,11 +1846,29 @@ const struct bpf_verifier_ops cg_sysctl_verifier_ops = {const struct bpf_prog_ops cg_sysctl_prog_ops = { }; +#ifdef CONFIG_NET +BPF_CALL_1(bpf_get_netns_cookie_sockopt, struct bpf_sockopt_kern *, ctx) +{ +const struct net *net = ctx ?sock_net (ctx->sk) : &init_net; + +return net->net_cookie; +} + +static const struct bpf_func_proto bpf_get_netns_cookie_sockopt_proto = { + .func = bpf_get_netns_cookie_sockopt, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX_OR_NULL , +}; +#endif +static const struct bpf_func_proto *cg_sockopt_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {switch (func_id) {#ifdef CONFIG_NET +case BPF_FUNC_get_netns_cookie: +return &bpf_get_netns_cookie_sockopt_proto;case BPF_FUNC_sk_storage_get:return &bpf_sk_storage_get_proto;case BPF_FUNC_sk_storage_delete:
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
PATCH v3 2/2 selftests/bpf: verify bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
In reply to Stanislav FomichevAdd extra calls to sockopt_sk.c.
--- tools/testing/selftests/bpf/progs/sockopt_sk.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/testing/selftests/bpf/progs/sockopt_sk.c +16 -0
@@ -33,6 +33,14 @@ int _getsockopt(struct bpf_sockopt *ctx)__u8 *optval = ctx->optval;struct sockopt_sk *storage; +/* Make sure bpf_get_netns_cookie is callable. +*/ +if (bpf_get_netns_cookie (NULL ) ==0 ) +return 0 ; + +if (bpf_get_netns_cookie (ctx) ==0 ) +return 0 ; +if (ctx->level ==SOL_IP && ctx->optname ==IP_TOS ) {/* Not interested in SOL_IP:IP_TOS; * let next BPF program in the cgroup chain or kernel
@@ -123,6 +131,14 @@ int _setsockopt(struct bpf_sockopt *ctx)__u8 *optval = ctx->optval;struct sockopt_sk *storage; +/* Make sure bpf_get_netns_cookie is callable. +*/ +if (bpf_get_netns_cookie (NULL ) ==0 ) +return 0 ; + +if (bpf_get_netns_cookie (ctx) ==0 ) +return 0 ; +if (ctx->level ==SOL_IP && ctx->optname ==IP_TOS ) {/* Not interested in SOL_IP:IP_TOS; * let next BPF program in the cgroup chain or kernel
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
Quoted 9 lines · Stanislav Fomichev
We'd like to be able to identify netns from setsockopt hooks to be able to do the enforcement of some options only in the "initial" netns (to give users the ability to create clear/isolated sandboxes if needed without any enforcement by doing unshare(net)).
v3:
- remove extra 'ctx->skb== NULL' check (Martin KaFai Lau)
- rework test to make sure the helper is really called, not just verified