Skip to content

Commit 13b77b2

Browse files
q2venMartin KaFai Lau
authored andcommitted
bpf: Support bpf_setsockopt() for BPF_CGROUP_INET_SOCK_CREATE.
We will support flagging sk->sk_bypass_prot_mem via bpf_setsockopt() at the BPF_CGROUP_INET_SOCK_CREATE hook. BPF_CGROUP_INET_SOCK_CREATE is invoked by __cgroup_bpf_run_filter_sk() that passes a pointer to struct sock to the bpf prog as void *ctx. But there are no bpf_func_proto for bpf_setsockopt() that receives the ctx as a pointer to struct sock. Also, bpf_getsockopt() will be necessary for a cgroup with multiple bpf progs running. Let's add new bpf_setsockopt() and bpf_getsockopt() variants for BPF_CGROUP_INET_SOCK_CREATE. Note that inet_create() is not under lock_sock() and has the same semantics with bpf_lsm_unlocked_sockopt_hooks. Signed-off-by: Kuniyuki Iwashima <[email protected]> Signed-off-by: Martin KaFai Lau <[email protected]> Acked-by: Roman Gushchin <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 543cf9b commit 13b77b2

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed

net/core/filter.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5733,6 +5733,40 @@ static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = {
57335733
.arg5_type = ARG_CONST_SIZE,
57345734
};
57355735

5736+
BPF_CALL_5(bpf_sock_create_setsockopt, struct sock *, sk, int, level,
5737+
int, optname, char *, optval, int, optlen)
5738+
{
5739+
return __bpf_setsockopt(sk, level, optname, optval, optlen);
5740+
}
5741+
5742+
static const struct bpf_func_proto bpf_sock_create_setsockopt_proto = {
5743+
.func = bpf_sock_create_setsockopt,
5744+
.gpl_only = false,
5745+
.ret_type = RET_INTEGER,
5746+
.arg1_type = ARG_PTR_TO_CTX,
5747+
.arg2_type = ARG_ANYTHING,
5748+
.arg3_type = ARG_ANYTHING,
5749+
.arg4_type = ARG_PTR_TO_MEM | MEM_RDONLY,
5750+
.arg5_type = ARG_CONST_SIZE,
5751+
};
5752+
5753+
BPF_CALL_5(bpf_sock_create_getsockopt, struct sock *, sk, int, level,
5754+
int, optname, char *, optval, int, optlen)
5755+
{
5756+
return __bpf_getsockopt(sk, level, optname, optval, optlen);
5757+
}
5758+
5759+
static const struct bpf_func_proto bpf_sock_create_getsockopt_proto = {
5760+
.func = bpf_sock_create_getsockopt,
5761+
.gpl_only = false,
5762+
.ret_type = RET_INTEGER,
5763+
.arg1_type = ARG_PTR_TO_CTX,
5764+
.arg2_type = ARG_ANYTHING,
5765+
.arg3_type = ARG_ANYTHING,
5766+
.arg4_type = ARG_PTR_TO_UNINIT_MEM,
5767+
.arg5_type = ARG_CONST_SIZE,
5768+
};
5769+
57365770
BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
57375771
int, level, int, optname, char *, optval, int, optlen)
57385772
{
@@ -8062,6 +8096,20 @@ sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
80628096
return &bpf_sk_storage_get_cg_sock_proto;
80638097
case BPF_FUNC_ktime_get_coarse_ns:
80648098
return &bpf_ktime_get_coarse_ns_proto;
8099+
case BPF_FUNC_setsockopt:
8100+
switch (prog->expected_attach_type) {
8101+
case BPF_CGROUP_INET_SOCK_CREATE:
8102+
return &bpf_sock_create_setsockopt_proto;
8103+
default:
8104+
return NULL;
8105+
}
8106+
case BPF_FUNC_getsockopt:
8107+
switch (prog->expected_attach_type) {
8108+
case BPF_CGROUP_INET_SOCK_CREATE:
8109+
return &bpf_sock_create_getsockopt_proto;
8110+
default:
8111+
return NULL;
8112+
}
80658113
default:
80668114
return bpf_base_func_proto(func_id, prog);
80678115
}

0 commit comments

Comments
 (0)