Skip to content

Commit 720946f

Browse files
q2venKernel Patches Daemon
authored andcommitted
bpf: Support bpf_setsockopt() for BPF_CGROUP_INET_SOCK_CREATE.
We will support flagging SK_MEMCG_EXCLUSIVE 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]>
1 parent bbf03e1 commit 720946f

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
@@ -5723,6 +5723,40 @@ static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = {
57235723
.arg5_type = ARG_CONST_SIZE,
57245724
};
57255725

5726+
BPF_CALL_5(bpf_sock_create_setsockopt, struct sock *, sk, int, level,
5727+
int, optname, char *, optval, int, optlen)
5728+
{
5729+
return __bpf_setsockopt(sk, level, optname, optval, optlen);
5730+
}
5731+
5732+
static const struct bpf_func_proto bpf_sock_create_setsockopt_proto = {
5733+
.func = bpf_sock_create_setsockopt,
5734+
.gpl_only = false,
5735+
.ret_type = RET_INTEGER,
5736+
.arg1_type = ARG_PTR_TO_CTX,
5737+
.arg2_type = ARG_ANYTHING,
5738+
.arg3_type = ARG_ANYTHING,
5739+
.arg4_type = ARG_PTR_TO_MEM | MEM_RDONLY,
5740+
.arg5_type = ARG_CONST_SIZE,
5741+
};
5742+
5743+
BPF_CALL_5(bpf_sock_create_getsockopt, struct sock *, sk, int, level,
5744+
int, optname, char *, optval, int, optlen)
5745+
{
5746+
return __bpf_getsockopt(sk, level, optname, optval, optlen);
5747+
}
5748+
5749+
static const struct bpf_func_proto bpf_sock_create_getsockopt_proto = {
5750+
.func = bpf_sock_create_getsockopt,
5751+
.gpl_only = false,
5752+
.ret_type = RET_INTEGER,
5753+
.arg1_type = ARG_PTR_TO_CTX,
5754+
.arg2_type = ARG_ANYTHING,
5755+
.arg3_type = ARG_ANYTHING,
5756+
.arg4_type = ARG_PTR_TO_UNINIT_MEM,
5757+
.arg5_type = ARG_CONST_SIZE,
5758+
};
5759+
57265760
BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
57275761
int, level, int, optname, char *, optval, int, optlen)
57285762
{
@@ -8051,6 +8085,20 @@ sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
80518085
return &bpf_sk_storage_get_cg_sock_proto;
80528086
case BPF_FUNC_ktime_get_coarse_ns:
80538087
return &bpf_ktime_get_coarse_ns_proto;
8088+
case BPF_FUNC_setsockopt:
8089+
switch (prog->expected_attach_type) {
8090+
case BPF_CGROUP_INET_SOCK_CREATE:
8091+
return &bpf_sock_create_setsockopt_proto;
8092+
default:
8093+
return NULL;
8094+
}
8095+
case BPF_FUNC_getsockopt:
8096+
switch (prog->expected_attach_type) {
8097+
case BPF_CGROUP_INET_SOCK_CREATE:
8098+
return &bpf_sock_create_getsockopt_proto;
8099+
default:
8100+
return NULL;
8101+
}
80548102
default:
80558103
return bpf_base_func_proto(func_id, prog);
80568104
}

0 commit comments

Comments
 (0)