diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-03 06:48:39 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 06:48:39 +0300 |
| commit | 12d4309636d30770b54985be05ac512131f328b8 (patch) | |
| tree | 011745b348dfea74709648487aed31bb6f670329 /include/linux | |
| parent | 1d6119baf0610f813eb9d9580eb4fd16de5b4ceb (diff) | |
| parent | 42984d7c1e563bf92e6ca7a0fd89f8e933f2162e (diff) | |
| download | linux-12d4309636d30770b54985be05ac512131f328b8.tar.xz | |
Merge branch 'bpf-persistent'
Daniel Borkmann says:
====================
BPF updates
This set adds support for persistent maps/progs. Please see
individual patches for further details. A man-page update
to bpf(2) will be sent later on, also a iproute2 patch for
support in tc.
v1 -> v2:
- Reworked most of patch 4 and 5
- Rebased to latest net-next
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bpf.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 75718fa28260..de464e6683b6 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -167,11 +167,18 @@ struct bpf_prog *bpf_prog_get(u32 ufd); void bpf_prog_put(struct bpf_prog *prog); void bpf_prog_put_rcu(struct bpf_prog *prog); -struct bpf_map *bpf_map_get(struct fd f); +struct bpf_map *bpf_map_get(u32 ufd); +struct bpf_map *__bpf_map_get(struct fd f); void bpf_map_put(struct bpf_map *map); extern int sysctl_unprivileged_bpf_disabled; +int bpf_map_new_fd(struct bpf_map *map); +int bpf_prog_new_fd(struct bpf_prog *prog); + +int bpf_obj_pin_user(u32 ufd, const char __user *pathname); +int bpf_obj_get_user(const char __user *pathname); + /* verify correctness of eBPF program */ int bpf_check(struct bpf_prog **fp, union bpf_attr *attr); #else |