forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code

Browse source 
This gets rid of CONFIG_BPF_SYSCALL ifdefs in the socket filter code,
now that the BPF internal header can deal with it.

While going over it, I also changed eBPF related functions to a sk_filter
prefix to be more consistent with the rest of the file.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2015-03-01 12:31:45 +01:00 • committed by David S. Miller
commit d4052c4aea
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
net/core/filter.c
View file

@ -1093,7 +1093,6 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
} }
EXPORT_SYMBOL_GPL(sk_attach_filter); EXPORT_SYMBOL_GPL(sk_attach_filter);
#ifdef CONFIG_BPF_SYSCALL
int sk_attach_bpf(u32 ufd, struct sock *sk) int sk_attach_bpf(u32 ufd, struct sock *sk)
{ {
struct sk_filter *fp, *old_fp; struct sk_filter *fp, *old_fp;
@ -1107,7 +1106,6 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)
return PTR_ERR(prog); return PTR_ERR(prog);
if (prog->aux->prog_type != BPF_PROG_TYPE_SOCKET_FILTER) { if (prog->aux->prog_type != BPF_PROG_TYPE_SOCKET_FILTER) {
/* valid fd, but invalid program type */
bpf_prog_put(prog); bpf_prog_put(prog);
return -EINVAL; return -EINVAL;
} }
@ -1117,8 +1115,8 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)
bpf_prog_put(prog); bpf_prog_put(prog);
return -ENOMEM; return -ENOMEM;
} }
fp->prog = prog;
fp->prog = prog;
atomic_set(&fp->refcnt, 0); atomic_set(&fp->refcnt, 0);
if (!sk_filter_charge(sk, fp)) { if (!sk_filter_charge(sk, fp)) {
@ -1136,10 +1134,8 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)
return 0; return 0;
} }
/* allow socket filters to call static const struct bpf_func_proto *
* bpf_map_lookup_elem(), bpf_map_update_elem(), bpf_map_delete_elem() sk_filter_func_proto(enum bpf_func_id func_id)
*/
static const struct bpf_func_proto *sock_filter_func_proto(enum bpf_func_id func_id)
{ {
switch (func_id) { switch (func_id) {
case BPF_FUNC_map_lookup_elem: case BPF_FUNC_map_lookup_elem:
@ -1153,34 +1149,30 @@ static const struct bpf_func_proto *sock_filter_func_proto(enum bpf_func_id func
} }
} }
static bool sock_filter_is_valid_access(int off, int size, enum bpf_access_type type) static bool sk_filter_is_valid_access(int off, int size,
enum bpf_access_type type)
{ {
/* skb fields cannot be accessed yet */ /* skb fields cannot be accessed yet */
return false; return false;
} }
static const struct bpf_verifier_ops sock_filter_ops = { static const struct bpf_verifier_ops sk_filter_ops = {
.get_func_proto = sock_filter_func_proto, .get_func_proto = sk_filter_func_proto,
.is_valid_access = sock_filter_is_valid_access, .is_valid_access = sk_filter_is_valid_access,
}; };
static struct bpf_prog_type_list sock_filter_type __read_mostly = { static struct bpf_prog_type_list sk_filter_type __read_mostly = {
.ops = &sock_filter_ops, .ops = &sk_filter_ops,
.type = BPF_PROG_TYPE_SOCKET_FILTER, .type = BPF_PROG_TYPE_SOCKET_FILTER,
}; };
static int __init register_sock_filter_ops(void) static int __init register_sk_filter_ops(void)
{ {
bpf_register_prog_type(&sock_filter_type); bpf_register_prog_type(&sk_filter_type);
return 0; return 0;
} }
late_initcall(register_sock_filter_ops); late_initcall(register_sk_filter_ops);
#else
int sk_attach_bpf(u32 ufd, struct sock *sk)
{
return -EOPNOTSUPP;
}
#endif
int sk_detach_filter(struct sock *sk) int sk_detach_filter(struct sock *sk)
{ {
int ret = -ENOENT; int ret = -ENOENT;