Commit 0cb34dc2 authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo

tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h

The tools version of this header is out of date; update it to the latest
version from the kernel headers.
Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Link: http://lkml.kernel.org/r/20161209024620.31660-2-joe@ovn.org
[ Sync it harder, after merging with what was in net-next via perf/urgent via torvalds/master to get BPG_PROG_(AT|DE)TACH, etc ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e216874c
...@@ -73,6 +73,8 @@ enum bpf_cmd { ...@@ -73,6 +73,8 @@ enum bpf_cmd {
BPF_PROG_LOAD, BPF_PROG_LOAD,
BPF_OBJ_PIN, BPF_OBJ_PIN,
BPF_OBJ_GET, BPF_OBJ_GET,
BPF_PROG_ATTACH,
BPF_PROG_DETACH,
}; };
enum bpf_map_type { enum bpf_map_type {
...@@ -85,6 +87,8 @@ enum bpf_map_type { ...@@ -85,6 +87,8 @@ enum bpf_map_type {
BPF_MAP_TYPE_PERCPU_ARRAY, BPF_MAP_TYPE_PERCPU_ARRAY,
BPF_MAP_TYPE_STACK_TRACE, BPF_MAP_TYPE_STACK_TRACE,
BPF_MAP_TYPE_CGROUP_ARRAY, BPF_MAP_TYPE_CGROUP_ARRAY,
BPF_MAP_TYPE_LRU_HASH,
BPF_MAP_TYPE_LRU_PERCPU_HASH,
}; };
enum bpf_prog_type { enum bpf_prog_type {
...@@ -95,8 +99,23 @@ enum bpf_prog_type { ...@@ -95,8 +99,23 @@ enum bpf_prog_type {
BPF_PROG_TYPE_SCHED_ACT, BPF_PROG_TYPE_SCHED_ACT,
BPF_PROG_TYPE_TRACEPOINT, BPF_PROG_TYPE_TRACEPOINT,
BPF_PROG_TYPE_XDP, BPF_PROG_TYPE_XDP,
BPF_PROG_TYPE_PERF_EVENT,
BPF_PROG_TYPE_CGROUP_SKB,
BPF_PROG_TYPE_CGROUP_SOCK,
BPF_PROG_TYPE_LWT_IN,
BPF_PROG_TYPE_LWT_OUT,
BPF_PROG_TYPE_LWT_XMIT,
}; };
enum bpf_attach_type {
BPF_CGROUP_INET_INGRESS,
BPF_CGROUP_INET_EGRESS,
BPF_CGROUP_INET_SOCK_CREATE,
__MAX_BPF_ATTACH_TYPE
};
#define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
#define BPF_PSEUDO_MAP_FD 1 #define BPF_PSEUDO_MAP_FD 1
/* flags for BPF_MAP_UPDATE_ELEM command */ /* flags for BPF_MAP_UPDATE_ELEM command */
...@@ -105,6 +124,13 @@ enum bpf_prog_type { ...@@ -105,6 +124,13 @@ enum bpf_prog_type {
#define BPF_EXIST 2 /* update existing element */ #define BPF_EXIST 2 /* update existing element */
#define BPF_F_NO_PREALLOC (1U << 0) #define BPF_F_NO_PREALLOC (1U << 0)
/* Instead of having one common LRU list in the
* BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
* which can scale and perform better.
* Note, the LRU nodes (including free nodes) cannot be moved
* across different LRU lists.
*/
#define BPF_F_NO_COMMON_LRU (1U << 1)
union bpf_attr { union bpf_attr {
struct { /* anonymous struct used by BPF_MAP_CREATE command */ struct { /* anonymous struct used by BPF_MAP_CREATE command */
...@@ -140,48 +166,62 @@ union bpf_attr { ...@@ -140,48 +166,62 @@ union bpf_attr {
__aligned_u64 pathname; __aligned_u64 pathname;
__u32 bpf_fd; __u32 bpf_fd;
}; };
struct { /* anonymous struct used by BPF_PROG_ATTACH/DETACH commands */
__u32 target_fd; /* container object to attach to */
__u32 attach_bpf_fd; /* eBPF program to attach */
__u32 attach_type;
};
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
/* integer value in 'imm' field of BPF_CALL instruction selects which helper /* BPF helper function descriptions:
* function eBPF program intends to call *
*/ * void *bpf_map_lookup_elem(&map, &key)
enum bpf_func_id { * Return: Map value or NULL
BPF_FUNC_unspec, *
BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */ * int bpf_map_update_elem(&map, &key, &value, flags)
BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */ * Return: 0 on success or negative error
BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ *
BPF_FUNC_probe_read, /* int bpf_probe_read(void *dst, int size, void *src) */ * int bpf_map_delete_elem(&map, &key)
BPF_FUNC_ktime_get_ns, /* u64 bpf_ktime_get_ns(void) */ * Return: 0 on success or negative error
BPF_FUNC_trace_printk, /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */ *
BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ * int bpf_probe_read(void *dst, int size, void *src)
BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ * Return: 0 on success or negative error
*
/** * u64 bpf_ktime_get_ns(void)
* skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet * Return: current ktime
*
* int bpf_trace_printk(const char *fmt, int fmt_size, ...)
* Return: length of buffer written or negative error
*
* u32 bpf_prandom_u32(void)
* Return: random value
*
* u32 bpf_raw_smp_processor_id(void)
* Return: SMP processor ID
*
* int bpf_skb_store_bytes(skb, offset, from, len, flags)
* store bytes into packet
* @skb: pointer to skb * @skb: pointer to skb
* @offset: offset within packet from skb->mac_header * @offset: offset within packet from skb->mac_header
* @from: pointer where to copy bytes from * @from: pointer where to copy bytes from
* @len: number of bytes to store into packet * @len: number of bytes to store into packet
* @flags: bit 0 - if true, recompute skb->csum * @flags: bit 0 - if true, recompute skb->csum
* other bits - reserved * other bits - reserved
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_skb_store_bytes, * int bpf_l3_csum_replace(skb, offset, from, to, flags)
* recompute IP checksum
/**
* l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
* @skb: pointer to skb * @skb: pointer to skb
* @offset: offset within packet where IP checksum is located * @offset: offset within packet where IP checksum is located
* @from: old value of header field * @from: old value of header field
* @to: new value of header field * @to: new value of header field
* @flags: bits 0-3 - size of header field * @flags: bits 0-3 - size of header field
* other bits - reserved * other bits - reserved
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_l3_csum_replace, * int bpf_l4_csum_replace(skb, offset, from, to, flags)
* recompute TCP/UDP checksum
/**
* l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
* @skb: pointer to skb * @skb: pointer to skb
* @offset: offset within packet where TCP/UDP checksum is located * @offset: offset within packet where TCP/UDP checksum is located
* @from: old value of header field * @from: old value of header field
...@@ -189,99 +229,79 @@ enum bpf_func_id { ...@@ -189,99 +229,79 @@ enum bpf_func_id {
* @flags: bits 0-3 - size of header field * @flags: bits 0-3 - size of header field
* bit 4 - is pseudo header * bit 4 - is pseudo header
* other bits - reserved * other bits - reserved
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_l4_csum_replace, * int bpf_tail_call(ctx, prog_array_map, index)
* jump into another BPF program
/**
* bpf_tail_call(ctx, prog_array_map, index) - jump into another BPF program
* @ctx: context pointer passed to next program * @ctx: context pointer passed to next program
* @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY
* @index: index inside array that selects specific program to run * @index: index inside array that selects specific program to run
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_tail_call, * int bpf_clone_redirect(skb, ifindex, flags)
* redirect to another netdev
/**
* bpf_clone_redirect(skb, ifindex, flags) - redirect to another netdev
* @skb: pointer to skb * @skb: pointer to skb
* @ifindex: ifindex of the net device * @ifindex: ifindex of the net device
* @flags: bit 0 - if set, redirect to ingress instead of egress * @flags: bit 0 - if set, redirect to ingress instead of egress
* other bits - reserved * other bits - reserved
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_clone_redirect,
/**
* u64 bpf_get_current_pid_tgid(void) * u64 bpf_get_current_pid_tgid(void)
* Return: current->tgid << 32 | current->pid * Return: current->tgid << 32 | current->pid
*/ *
BPF_FUNC_get_current_pid_tgid,
/**
* u64 bpf_get_current_uid_gid(void) * u64 bpf_get_current_uid_gid(void)
* Return: current_gid << 32 | current_uid * Return: current_gid << 32 | current_uid
*/ *
BPF_FUNC_get_current_uid_gid, * int bpf_get_current_comm(char *buf, int size_of_buf)
/**
* bpf_get_current_comm(char *buf, int size_of_buf)
* stores current->comm into buf * stores current->comm into buf
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_get_current_comm, * u32 bpf_get_cgroup_classid(skb)
* retrieve a proc's classid
/**
* bpf_get_cgroup_classid(skb) - retrieve a proc's classid
* @skb: pointer to skb * @skb: pointer to skb
* Return: classid if != 0 * Return: classid if != 0
*/ *
BPF_FUNC_get_cgroup_classid, * int bpf_skb_vlan_push(skb, vlan_proto, vlan_tci)
BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */ * Return: 0 on success or negative error
BPF_FUNC_skb_vlan_pop, /* bpf_skb_vlan_pop(skb) */ *
* int bpf_skb_vlan_pop(skb)
/** * Return: 0 on success or negative error
* bpf_skb_[gs]et_tunnel_key(skb, key, size, flags) *
* int bpf_skb_get_tunnel_key(skb, key, size, flags)
* int bpf_skb_set_tunnel_key(skb, key, size, flags)
* retrieve or populate tunnel metadata * retrieve or populate tunnel metadata
* @skb: pointer to skb * @skb: pointer to skb
* @key: pointer to 'struct bpf_tunnel_key' * @key: pointer to 'struct bpf_tunnel_key'
* @size: size of 'struct bpf_tunnel_key' * @size: size of 'struct bpf_tunnel_key'
* @flags: room for future extensions * @flags: room for future extensions
* Retrun: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_skb_get_tunnel_key, * u64 bpf_perf_event_read(&map, index)
BPF_FUNC_skb_set_tunnel_key, * Return: Number events read or error code
BPF_FUNC_perf_event_read, /* u64 bpf_perf_event_read(&map, index) */ *
/** * int bpf_redirect(ifindex, flags)
* bpf_redirect(ifindex, flags) - redirect to another netdev * redirect to another netdev
* @ifindex: ifindex of the net device * @ifindex: ifindex of the net device
* @flags: bit 0 - if set, redirect to ingress instead of egress * @flags: bit 0 - if set, redirect to ingress instead of egress
* other bits - reserved * other bits - reserved
* Return: TC_ACT_REDIRECT * Return: TC_ACT_REDIRECT
*/ *
BPF_FUNC_redirect, * u32 bpf_get_route_realm(skb)
* retrieve a dst's tclassid
/**
* bpf_get_route_realm(skb) - retrieve a dst's tclassid
* @skb: pointer to skb * @skb: pointer to skb
* Return: realm if != 0 * Return: realm if != 0
*/ *
BPF_FUNC_get_route_realm, * int bpf_perf_event_output(ctx, map, index, data, size)
* output perf raw sample
/**
* bpf_perf_event_output(ctx, map, index, data, size) - output perf raw sample
* @ctx: struct pt_regs* * @ctx: struct pt_regs*
* @map: pointer to perf_event_array map * @map: pointer to perf_event_array map
* @index: index of event in the map * @index: index of event in the map
* @data: data on stack to be output as raw data * @data: data on stack to be output as raw data
* @size: size of data * @size: size of data
* Return: 0 on success * Return: 0 on success or negative error
*/ *
BPF_FUNC_perf_event_output, * int bpf_get_stackid(ctx, map, flags)
BPF_FUNC_skb_load_bytes, * walk user or kernel stack and return id
/**
* bpf_get_stackid(ctx, map, flags) - walk user or kernel stack and return id
* @ctx: struct pt_regs* * @ctx: struct pt_regs*
* @map: pointer to stack_trace map * @map: pointer to stack_trace map
* @flags: bits 0-7 - numer of stack frames to skip * @flags: bits 0-7 - numer of stack frames to skip
...@@ -291,55 +311,48 @@ enum bpf_func_id { ...@@ -291,55 +311,48 @@ enum bpf_func_id {
* discard old * discard old
* other bits - reserved * other bits - reserved
* Return: >= 0 stackid on success or negative error * Return: >= 0 stackid on success or negative error
*/ *
BPF_FUNC_get_stackid, * s64 bpf_csum_diff(from, from_size, to, to_size, seed)
* calculate csum diff
/**
* bpf_csum_diff(from, from_size, to, to_size, seed) - calculate csum diff
* @from: raw from buffer * @from: raw from buffer
* @from_size: length of from buffer * @from_size: length of from buffer
* @to: raw to buffer * @to: raw to buffer
* @to_size: length of to buffer * @to_size: length of to buffer
* @seed: optional seed * @seed: optional seed
* Return: csum result * Return: csum result or negative error code
*/ *
BPF_FUNC_csum_diff, * int bpf_skb_get_tunnel_opt(skb, opt, size)
* retrieve tunnel options metadata
/**
* bpf_skb_[gs]et_tunnel_opt(skb, opt, size)
* retrieve or populate tunnel options metadata
* @skb: pointer to skb * @skb: pointer to skb
* @opt: pointer to raw tunnel option data * @opt: pointer to raw tunnel option data
* @size: size of @opt * @size: size of @opt
* Return: 0 on success for set, option size for get * Return: option size
*/ *
BPF_FUNC_skb_get_tunnel_opt, * int bpf_skb_set_tunnel_opt(skb, opt, size)
BPF_FUNC_skb_set_tunnel_opt, * populate tunnel options metadata
* @skb: pointer to skb
/** * @opt: pointer to raw tunnel option data
* bpf_skb_change_proto(skb, proto, flags) * @size: size of @opt
* Change protocol of the skb. Currently supported is * Return: 0 on success or negative error
* v4 -> v6, v6 -> v4 transitions. The helper will also *
* resize the skb. eBPF program is expected to fill the * int bpf_skb_change_proto(skb, proto, flags)
* new headers via skb_store_bytes and lX_csum_replace. * Change protocol of the skb. Currently supported is v4 -> v6,
* v6 -> v4 transitions. The helper will also resize the skb. eBPF
* program is expected to fill the new headers via skb_store_bytes
* and lX_csum_replace.
* @skb: pointer to skb * @skb: pointer to skb
* @proto: new skb->protocol type * @proto: new skb->protocol type
* @flags: reserved * @flags: reserved
* Return: 0 on success or negative error * Return: 0 on success or negative error
*/ *
BPF_FUNC_skb_change_proto, * int bpf_skb_change_type(skb, type)
/**
* bpf_skb_change_type(skb, type)
* Change packet type of skb. * Change packet type of skb.
* @skb: pointer to skb * @skb: pointer to skb
* @type: new skb->pkt_type type * @type: new skb->pkt_type type
* Return: 0 on success or negative error * Return: 0 on success or negative error
*/ *
BPF_FUNC_skb_change_type, * int bpf_skb_under_cgroup(skb, map, index)
* Check cgroup2 membership of skb
/**
* bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb
* @skb: pointer to skb * @skb: pointer to skb
* @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
* @index: index of the cgroup in the bpf_map * @index: index of the cgroup in the bpf_map
...@@ -347,36 +360,133 @@ enum bpf_func_id { ...@@ -347,36 +360,133 @@ enum bpf_func_id {
* == 0 skb failed the cgroup2 descendant test * == 0 skb failed the cgroup2 descendant test
* == 1 skb succeeded the cgroup2 descendant test * == 1 skb succeeded the cgroup2 descendant test
* < 0 error * < 0 error
*/ *
BPF_FUNC_skb_under_cgroup, * u32 bpf_get_hash_recalc(skb)
/**
* bpf_get_hash_recalc(skb)
* Retrieve and possibly recalculate skb->hash. * Retrieve and possibly recalculate skb->hash.
* @skb: pointer to skb * @skb: pointer to skb
* Return: hash * Return: hash
*/ *
BPF_FUNC_get_hash_recalc,
/**
* u64 bpf_get_current_task(void) * u64 bpf_get_current_task(void)
* Returns current task_struct * Returns current task_struct
* Return: current * Return: current
*/ *
BPF_FUNC_get_current_task, * int bpf_probe_write_user(void *dst, void *src, int len)
/**
* bpf_probe_write_user(void *dst, void *src, int len)
* safely attempt to write to a location * safely attempt to write to a location
* @dst: destination address in userspace * @dst: destination address in userspace
* @src: source address on stack * @src: source address on stack
* @len: number of bytes to copy * @len: number of bytes to copy
* Return: 0 on success or negative error * Return: 0 on success or negative error
*
* int bpf_current_task_under_cgroup(map, index)
* Check cgroup2 membership of current task
* @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
* @index: index of the cgroup in the bpf_map
* Return:
* == 0 current failed the cgroup2 descendant test
* == 1 current succeeded the cgroup2 descendant test
* < 0 error
*
* int bpf_skb_change_tail(skb, len, flags)
* The helper will resize the skb to the given new size, to be used f.e.
* with control messages.
* @skb: pointer to skb
* @len: new skb length
* @flags: reserved
* Return: 0 on success or negative error
*
* int bpf_skb_pull_data(skb, len)
* The helper will pull in non-linear data in case the skb is non-linear
* and not all of len are part of the linear section. Only needed for
* read/write with direct packet access.
* @skb: pointer to skb
* @len: len to make read/writeable
* Return: 0 on success or negative error
*
* s64 bpf_csum_update(skb, csum)
* Adds csum into skb->csum in case of CHECKSUM_COMPLETE.
* @skb: pointer to skb
* @csum: csum to add
* Return: csum on success or negative error
*
* void bpf_set_hash_invalid(skb)
* Invalidate current skb->hash.
* @skb: pointer to skb
*
* int bpf_get_numa_node_id()
* Return: Id of current NUMA node.
*
* int bpf_skb_change_head()
* Grows headroom of skb and adjusts MAC header offset accordingly.
* Will extends/reallocae as required automatically.
* May change skb data pointer and will thus invalidate any check
* performed for direct packet access.
* @skb: pointer to skb
* @len: length of header to be pushed in front
* @flags: Flags (unused for now)
* Return: 0 on success or negative error
*
* int bpf_xdp_adjust_head(xdp_md, delta)
* Adjust the xdp_md.data by delta
* @xdp_md: pointer to xdp_md
* @delta: An positive/negative integer to be added to xdp_md.data
* Return: 0 on success or negative on error
*/ */
BPF_FUNC_probe_write_user, #define __BPF_FUNC_MAPPER(FN) \
FN(unspec), \
FN(map_lookup_elem), \
FN(map_update_elem), \
FN(map_delete_elem), \
FN(probe_read), \
FN(ktime_get_ns), \
FN(trace_printk), \
FN(get_prandom_u32), \
FN(get_smp_processor_id), \
FN(skb_store_bytes), \
FN(l3_csum_replace), \
FN(l4_csum_replace), \
FN(tail_call), \
FN(clone_redirect), \
FN(get_current_pid_tgid), \
FN(get_current_uid_gid), \
FN(get_current_comm), \
FN(get_cgroup_classid), \
FN(skb_vlan_push), \
FN(skb_vlan_pop), \
FN(skb_get_tunnel_key), \
FN(skb_set_tunnel_key), \
FN(perf_event_read), \
FN(redirect), \
FN(get_route_realm), \
FN(perf_event_output), \
FN(skb_load_bytes), \
FN(get_stackid), \
FN(csum_diff), \
FN(skb_get_tunnel_opt), \
FN(skb_set_tunnel_opt), \
FN(skb_change_proto), \
FN(skb_change_type), \
FN(skb_under_cgroup), \
FN(get_hash_recalc), \
FN(get_current_task), \
FN(probe_write_user), \
FN(current_task_under_cgroup), \
FN(skb_change_tail), \
FN(skb_pull_data), \
FN(csum_update), \
FN(set_hash_invalid), \
FN(get_numa_node_id), \
FN(skb_change_head), \
FN(xdp_adjust_head),
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
* function eBPF program intends to call
*/
#define __BPF_ENUM_FN(x) BPF_FUNC_ ## x
enum bpf_func_id {
__BPF_FUNC_MAPPER(__BPF_ENUM_FN)
__BPF_FUNC_MAX_ID, __BPF_FUNC_MAX_ID,
}; };
#undef __BPF_ENUM_FN
/* All flags used by eBPF helper functions, placed here. */ /* All flags used by eBPF helper functions, placed here. */
...@@ -450,6 +560,31 @@ struct bpf_tunnel_key { ...@@ -450,6 +560,31 @@ struct bpf_tunnel_key {
__u32 tunnel_label; __u32 tunnel_label;
}; };
/* Generic BPF return codes which all BPF program types may support.
* The values are binary compatible with their TC_ACT_* counter-part to
* provide backwards compatibility with existing SCHED_CLS and SCHED_ACT
* programs.
*
* XDP is handled seprately, see XDP_*.
*/
enum bpf_ret_code {
BPF_OK = 0,
/* 1 reserved */
BPF_DROP = 2,
/* 3-6 reserved */
BPF_REDIRECT = 7,
/* >127 are reserved for prog type specific return codes */
};
struct bpf_sock {
__u32 bound_dev_if;
__u32 family;
__u32 type;
__u32 protocol;
};
#define XDP_PACKET_HEADROOM 256
/* User return codes for XDP prog type. /* User return codes for XDP prog type.
* A valid XDP program must return one of these defined values. All other * A valid XDP program must return one of these defined values. All other
* return codes are reserved for future use. Unknown return codes will result * return codes are reserved for future use. Unknown return codes will result
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment