diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-17 01:34:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-17 01:34:01 +0100 |
commit | 3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb (patch) | |
tree | 388024d2ddbdcb9991ef4b472dfac31e425b807e /tools/include | |
parent | cxgb4: Remove redundant code in t4_uld_clean_up() (diff) | |
parent | Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mc... (diff) | |
download | linux-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.tar.xz linux-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'tools/include')
-rw-r--r-- | tools/include/uapi/linux/bpf.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index e07fd5a324e6..0539a0ceef38 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -123,6 +123,12 @@ enum bpf_attach_type { #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE +/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command + * to the given target_fd cgroup the descendent cgroup will be able to + * override effective bpf program that was inherited from this cgroup + */ +#define BPF_F_ALLOW_OVERRIDE (1U << 0) + #define BPF_PSEUDO_MAP_FD 1 /* flags for BPF_MAP_UPDATE_ELEM command */ @@ -178,6 +184,7 @@ union bpf_attr { __u32 target_fd; /* container object to attach to */ __u32 attach_bpf_fd; /* eBPF program to attach */ __u32 attach_type; + __u32 attach_flags; }; } __attribute__((aligned(8))); |