* [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf
@ 2016-12-09 2:46 Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Joe Stringer
` (7 more replies)
0 siblings, 8 replies; 27+ messages in thread
From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw)
To: linux-kernel; +Cc: netdev, wangnan0, ast, daniel, acme
(Was "libbpf: Synchronize implementations")
Update tools/lib/bpf to provide the remaining bpf wrapper pieces needed by the
samples/bpf/ code, then get rid of all of the duplicate BPF libraries in
samples/bpf/libbpf.[ch].
---
v3: Add ack for first patch.
Split out second patch from v2 into separate changes for remaining diff.
Add patches to switch samples/bpf over to using tools/lib/.
v2: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html
Don't shift non-bpf code into libbpf.
Drop the patch to synchronize ELF definitions with tc.
v1: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html
First post.
Joe Stringer (7):
tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h
tools lib bpf: use __u32 from linux/types.h
tools lib bpf: Add flags to bpf_create_map()
samples/bpf: Make samples more libbpf-centric
samples/bpf: Switch over to libbpf
samples/bpf: Remove perf_event_open() declaration
samples/bpf: Move open_raw_sock to separate header
samples/bpf/Makefile | 61 +++++----
samples/bpf/README.rst | 4 +-
samples/bpf/bpf_load.c | 20 ++-
samples/bpf/fds_example.c | 10 +-
samples/bpf/lathist_user.c | 3 +-
samples/bpf/libbpf.c | 155 ----------------------
samples/bpf/libbpf.h | 25 +---
samples/bpf/map_perf_test_user.c | 1 +
samples/bpf/offwaketime_user.c | 10 +-
samples/bpf/sampleip_user.c | 8 +-
samples/bpf/sock_example.c | 11 +-
samples/bpf/sock_example.h | 35 +++++
samples/bpf/sockex1_user.c | 9 +-
samples/bpf/sockex2_user.c | 7 +-
samples/bpf/sockex3_user.c | 7 +-
samples/bpf/spintest_user.c | 10 +-
samples/bpf/tc_l2_redirect_user.c | 4 +-
samples/bpf/test_cgrp2_array_pin.c | 4 +-
samples/bpf/test_current_task_under_cgroup_user.c | 10 +-
samples/bpf/test_maps.c | 142 ++++++++++----------
samples/bpf/test_overhead_user.c | 2 +
samples/bpf/test_probe_write_user_user.c | 4 +-
samples/bpf/test_verifier.c | 8 +-
samples/bpf/trace_event_user.c | 24 ++--
samples/bpf/trace_output_user.c | 6 +-
samples/bpf/tracex1_user.c | 2 +
samples/bpf/tracex2_user.c | 12 +-
samples/bpf/tracex3_user.c | 6 +-
samples/bpf/tracex4_user.c | 6 +-
samples/bpf/tracex5_user.c | 2 +
samples/bpf/tracex6_user.c | 7 +-
samples/bpf/xdp1_user.c | 4 +-
tools/include/uapi/linux/bpf.h | 51 +++++++
tools/lib/bpf/Makefile | 2 +
tools/lib/bpf/bpf.c | 7 +-
tools/lib/bpf/bpf.h | 6 +-
tools/lib/bpf/libbpf.c | 3 +-
37 files changed, 332 insertions(+), 356 deletions(-)
delete mode 100644 samples/bpf/libbpf.c
create mode 100644 samples/bpf/sock_example.h
--
2.10.2
^ permalink raw reply [flat|nested] 27+ messages in thread* [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-20 19:26 ` [tip:perf/urgent] " tip-bot for Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h Joe Stringer ` (6 subsequent siblings) 7 siblings, 1 reply; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev The tools version of this header is out of date; update it to the latest version from the kernel headers. Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Wang Nan <wangnan0@huawei.com> --- v3: Add ack. v2: No change. --- tools/include/uapi/linux/bpf.h | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 9e5fc168c8a3..f09c70b97eca 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -95,6 +95,7 @@ enum bpf_prog_type { BPF_PROG_TYPE_SCHED_ACT, BPF_PROG_TYPE_TRACEPOINT, BPF_PROG_TYPE_XDP, + BPF_PROG_TYPE_PERF_EVENT, }; #define BPF_PSEUDO_MAP_FD 1 @@ -375,6 +376,56 @@ enum bpf_func_id { */ BPF_FUNC_probe_write_user, + /** + * 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 + */ + BPF_FUNC_current_task_under_cgroup, + + /** + * 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 + */ + BPF_FUNC_skb_change_tail, + + /** + * 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 + */ + BPF_FUNC_skb_pull_data, + + /** + * 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 + */ + BPF_FUNC_csum_update, + + /** + * bpf_set_hash_invalid(skb) + * Invalidate current skb>hash. + * @skb: pointer to skb + */ + BPF_FUNC_set_hash_invalid, + __BPF_FUNC_MAX_ID, }; -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [tip:perf/urgent] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h 2016-12-09 2:46 ` [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Joe Stringer @ 2016-12-20 19:26 ` tip-bot for Joe Stringer 0 siblings, 0 replies; 27+ messages in thread From: tip-bot for Joe Stringer @ 2016-12-20 19:26 UTC (permalink / raw) To: linux-tip-commits Cc: linux-kernel, tglx, daniel, mingo, wangnan0, ast, acme, joe, hpa Commit-ID: 0cb34dc2a37290f4069c5b01735c9725dc0a1b5c Gitweb: http://git.kernel.org/tip/0cb34dc2a37290f4069c5b01735c9725dc0a1b5c Author: Joe Stringer <joe@ovn.org> AuthorDate: Thu, 8 Dec 2016 18:46:14 -0800 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 15 Dec 2016 16:25:46 -0300 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: Joe Stringer <joe@ovn.org> Acked-by: Wang 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: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/include/uapi/linux/bpf.h | 593 +++++++++++++++++++++++++---------------- 1 file changed, 364 insertions(+), 229 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 9e5fc16..0eb0e87 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -73,6 +73,8 @@ enum bpf_cmd { BPF_PROG_LOAD, BPF_OBJ_PIN, BPF_OBJ_GET, + BPF_PROG_ATTACH, + BPF_PROG_DETACH, }; enum bpf_map_type { @@ -85,6 +87,8 @@ enum bpf_map_type { BPF_MAP_TYPE_PERCPU_ARRAY, BPF_MAP_TYPE_STACK_TRACE, BPF_MAP_TYPE_CGROUP_ARRAY, + BPF_MAP_TYPE_LRU_HASH, + BPF_MAP_TYPE_LRU_PERCPU_HASH, }; enum bpf_prog_type { @@ -95,8 +99,23 @@ enum bpf_prog_type { BPF_PROG_TYPE_SCHED_ACT, BPF_PROG_TYPE_TRACEPOINT, 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 /* flags for BPF_MAP_UPDATE_ELEM command */ @@ -105,6 +124,13 @@ enum bpf_prog_type { #define BPF_EXIST 2 /* update existing element */ #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 { struct { /* anonymous struct used by BPF_MAP_CREATE command */ @@ -140,243 +166,327 @@ union bpf_attr { __aligned_u64 pathname; __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))); +/* BPF helper function descriptions: + * + * void *bpf_map_lookup_elem(&map, &key) + * Return: Map value or NULL + * + * int bpf_map_update_elem(&map, &key, &value, flags) + * Return: 0 on success or negative error + * + * int bpf_map_delete_elem(&map, &key) + * Return: 0 on success or negative error + * + * int bpf_probe_read(void *dst, int size, void *src) + * Return: 0 on success or negative error + * + * u64 bpf_ktime_get_ns(void) + * 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 + * @offset: offset within packet from skb->mac_header + * @from: pointer where to copy bytes from + * @len: number of bytes to store into packet + * @flags: bit 0 - if true, recompute skb->csum + * other bits - reserved + * Return: 0 on success or negative error + * + * int bpf_l3_csum_replace(skb, offset, from, to, flags) + * recompute IP checksum + * @skb: pointer to skb + * @offset: offset within packet where IP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * other bits - reserved + * Return: 0 on success or negative error + * + * int bpf_l4_csum_replace(skb, offset, from, to, flags) + * recompute TCP/UDP checksum + * @skb: pointer to skb + * @offset: offset within packet where TCP/UDP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * bit 4 - is pseudo header + * other bits - reserved + * Return: 0 on success or negative error + * + * int bpf_tail_call(ctx, prog_array_map, index) + * jump into another BPF program + * @ctx: context pointer passed to next program + * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY + * @index: index inside array that selects specific program to run + * Return: 0 on success or negative error + * + * int bpf_clone_redirect(skb, ifindex, flags) + * redirect to another netdev + * @skb: pointer to skb + * @ifindex: ifindex of the net device + * @flags: bit 0 - if set, redirect to ingress instead of egress + * other bits - reserved + * Return: 0 on success or negative error + * + * u64 bpf_get_current_pid_tgid(void) + * Return: current->tgid << 32 | current->pid + * + * u64 bpf_get_current_uid_gid(void) + * Return: current_gid << 32 | current_uid + * + * int bpf_get_current_comm(char *buf, int size_of_buf) + * stores current->comm into buf + * Return: 0 on success or negative error + * + * u32 bpf_get_cgroup_classid(skb) + * retrieve a proc's classid + * @skb: pointer to skb + * Return: classid if != 0 + * + * int bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) + * Return: 0 on success or negative error + * + * int bpf_skb_vlan_pop(skb) + * Return: 0 on success or negative error + * + * 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 + * @skb: pointer to skb + * @key: pointer to 'struct bpf_tunnel_key' + * @size: size of 'struct bpf_tunnel_key' + * @flags: room for future extensions + * Return: 0 on success or negative error + * + * u64 bpf_perf_event_read(&map, index) + * Return: Number events read or error code + * + * int bpf_redirect(ifindex, flags) + * redirect to another netdev + * @ifindex: ifindex of the net device + * @flags: bit 0 - if set, redirect to ingress instead of egress + * other bits - reserved + * Return: TC_ACT_REDIRECT + * + * u32 bpf_get_route_realm(skb) + * retrieve a dst's tclassid + * @skb: pointer to skb + * Return: realm if != 0 + * + * int bpf_perf_event_output(ctx, map, index, data, size) + * output perf raw sample + * @ctx: struct pt_regs* + * @map: pointer to perf_event_array map + * @index: index of event in the map + * @data: data on stack to be output as raw data + * @size: size of data + * Return: 0 on success or negative error + * + * int bpf_get_stackid(ctx, map, flags) + * walk user or kernel stack and return id + * @ctx: struct pt_regs* + * @map: pointer to stack_trace map + * @flags: bits 0-7 - numer of stack frames to skip + * bit 8 - collect user stack instead of kernel + * bit 9 - compare stacks by hash only + * bit 10 - if two different stacks hash into the same stackid + * discard old + * other bits - reserved + * Return: >= 0 stackid on success or negative error + * + * s64 bpf_csum_diff(from, from_size, to, to_size, seed) + * calculate csum diff + * @from: raw from buffer + * @from_size: length of from buffer + * @to: raw to buffer + * @to_size: length of to buffer + * @seed: optional seed + * Return: csum result or negative error code + * + * int bpf_skb_get_tunnel_opt(skb, opt, size) + * retrieve tunnel options metadata + * @skb: pointer to skb + * @opt: pointer to raw tunnel option data + * @size: size of @opt + * Return: option size + * + * int bpf_skb_set_tunnel_opt(skb, opt, size) + * populate tunnel options metadata + * @skb: pointer to skb + * @opt: pointer to raw tunnel option data + * @size: size of @opt + * Return: 0 on success or negative error + * + * int bpf_skb_change_proto(skb, proto, flags) + * 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 + * @proto: new skb->protocol type + * @flags: reserved + * Return: 0 on success or negative error + * + * int bpf_skb_change_type(skb, type) + * Change packet type of skb. + * @skb: pointer to skb + * @type: new skb->pkt_type type + * Return: 0 on success or negative error + * + * int bpf_skb_under_cgroup(skb, map, index) + * Check cgroup2 membership of skb + * @skb: pointer to skb + * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type + * @index: index of the cgroup in the bpf_map + * Return: + * == 0 skb failed the cgroup2 descendant test + * == 1 skb succeeded the cgroup2 descendant test + * < 0 error + * + * u32 bpf_get_hash_recalc(skb) + * Retrieve and possibly recalculate skb->hash. + * @skb: pointer to skb + * Return: hash + * + * u64 bpf_get_current_task(void) + * Returns current task_struct + * Return: current + * + * int bpf_probe_write_user(void *dst, void *src, int len) + * safely attempt to write to a location + * @dst: destination address in userspace + * @src: source address on stack + * @len: number of bytes to copy + * 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 + */ +#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_unspec, - BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */ - BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */ - 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) */ - BPF_FUNC_ktime_get_ns, /* u64 bpf_ktime_get_ns(void) */ - BPF_FUNC_trace_printk, /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */ - BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ - BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ - - /** - * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet - * @skb: pointer to skb - * @offset: offset within packet from skb->mac_header - * @from: pointer where to copy bytes from - * @len: number of bytes to store into packet - * @flags: bit 0 - if true, recompute skb->csum - * other bits - reserved - * Return: 0 on success - */ - BPF_FUNC_skb_store_bytes, - - /** - * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum - * @skb: pointer to skb - * @offset: offset within packet where IP checksum is located - * @from: old value of header field - * @to: new value of header field - * @flags: bits 0-3 - size of header field - * other bits - reserved - * Return: 0 on success - */ - BPF_FUNC_l3_csum_replace, - - /** - * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum - * @skb: pointer to skb - * @offset: offset within packet where TCP/UDP checksum is located - * @from: old value of header field - * @to: new value of header field - * @flags: bits 0-3 - size of header field - * bit 4 - is pseudo header - * other bits - reserved - * Return: 0 on success - */ - BPF_FUNC_l4_csum_replace, - - /** - * bpf_tail_call(ctx, prog_array_map, index) - jump into another BPF program - * @ctx: context pointer passed to next program - * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY - * @index: index inside array that selects specific program to run - * Return: 0 on success - */ - BPF_FUNC_tail_call, - - /** - * bpf_clone_redirect(skb, ifindex, flags) - redirect to another netdev - * @skb: pointer to skb - * @ifindex: ifindex of the net device - * @flags: bit 0 - if set, redirect to ingress instead of egress - * other bits - reserved - * Return: 0 on success - */ - BPF_FUNC_clone_redirect, - - /** - * u64 bpf_get_current_pid_tgid(void) - * Return: current->tgid << 32 | current->pid - */ - BPF_FUNC_get_current_pid_tgid, - - /** - * u64 bpf_get_current_uid_gid(void) - * Return: current_gid << 32 | current_uid - */ - BPF_FUNC_get_current_uid_gid, - - /** - * bpf_get_current_comm(char *buf, int size_of_buf) - * stores current->comm into buf - * Return: 0 on success - */ - BPF_FUNC_get_current_comm, - - /** - * bpf_get_cgroup_classid(skb) - retrieve a proc's classid - * @skb: pointer to skb - * Return: classid if != 0 - */ - BPF_FUNC_get_cgroup_classid, - BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */ - BPF_FUNC_skb_vlan_pop, /* bpf_skb_vlan_pop(skb) */ - - /** - * bpf_skb_[gs]et_tunnel_key(skb, key, size, flags) - * retrieve or populate tunnel metadata - * @skb: pointer to skb - * @key: pointer to 'struct bpf_tunnel_key' - * @size: size of 'struct bpf_tunnel_key' - * @flags: room for future extensions - * Retrun: 0 on success - */ - BPF_FUNC_skb_get_tunnel_key, - BPF_FUNC_skb_set_tunnel_key, - BPF_FUNC_perf_event_read, /* u64 bpf_perf_event_read(&map, index) */ - /** - * bpf_redirect(ifindex, flags) - redirect to another netdev - * @ifindex: ifindex of the net device - * @flags: bit 0 - if set, redirect to ingress instead of egress - * other bits - reserved - * Return: TC_ACT_REDIRECT - */ - BPF_FUNC_redirect, - - /** - * bpf_get_route_realm(skb) - retrieve a dst's tclassid - * @skb: pointer to skb - * Return: realm if != 0 - */ - BPF_FUNC_get_route_realm, - - /** - * bpf_perf_event_output(ctx, map, index, data, size) - output perf raw sample - * @ctx: struct pt_regs* - * @map: pointer to perf_event_array map - * @index: index of event in the map - * @data: data on stack to be output as raw data - * @size: size of data - * Return: 0 on success - */ - BPF_FUNC_perf_event_output, - BPF_FUNC_skb_load_bytes, - - /** - * bpf_get_stackid(ctx, map, flags) - walk user or kernel stack and return id - * @ctx: struct pt_regs* - * @map: pointer to stack_trace map - * @flags: bits 0-7 - numer of stack frames to skip - * bit 8 - collect user stack instead of kernel - * bit 9 - compare stacks by hash only - * bit 10 - if two different stacks hash into the same stackid - * discard old - * other bits - reserved - * Return: >= 0 stackid on success or negative error - */ - BPF_FUNC_get_stackid, - - /** - * bpf_csum_diff(from, from_size, to, to_size, seed) - calculate csum diff - * @from: raw from buffer - * @from_size: length of from buffer - * @to: raw to buffer - * @to_size: length of to buffer - * @seed: optional seed - * Return: csum result - */ - BPF_FUNC_csum_diff, - - /** - * bpf_skb_[gs]et_tunnel_opt(skb, opt, size) - * retrieve or populate tunnel options metadata - * @skb: pointer to skb - * @opt: pointer to raw tunnel option data - * @size: size of @opt - * Return: 0 on success for set, option size for get - */ - BPF_FUNC_skb_get_tunnel_opt, - BPF_FUNC_skb_set_tunnel_opt, - - /** - * bpf_skb_change_proto(skb, proto, flags) - * 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 - * @proto: new skb->protocol type - * @flags: reserved - * Return: 0 on success or negative error - */ - BPF_FUNC_skb_change_proto, - - /** - * bpf_skb_change_type(skb, type) - * Change packet type of skb. - * @skb: pointer to skb - * @type: new skb->pkt_type type - * Return: 0 on success or negative error - */ - BPF_FUNC_skb_change_type, - - /** - * bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb - * @skb: pointer to skb - * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type - * @index: index of the cgroup in the bpf_map - * Return: - * == 0 skb failed the cgroup2 descendant test - * == 1 skb succeeded the cgroup2 descendant test - * < 0 error - */ - BPF_FUNC_skb_under_cgroup, - - /** - * bpf_get_hash_recalc(skb) - * Retrieve and possibly recalculate skb->hash. - * @skb: pointer to skb - * Return: hash - */ - BPF_FUNC_get_hash_recalc, - - /** - * u64 bpf_get_current_task(void) - * Returns current task_struct - * Return: current - */ - BPF_FUNC_get_current_task, - - /** - * bpf_probe_write_user(void *dst, void *src, int len) - * safely attempt to write to a location - * @dst: destination address in userspace - * @src: source address on stack - * @len: number of bytes to copy - * Return: 0 on success or negative error - */ - BPF_FUNC_probe_write_user, - + __BPF_FUNC_MAPPER(__BPF_ENUM_FN) __BPF_FUNC_MAX_ID, }; +#undef __BPF_ENUM_FN /* All flags used by eBPF helper functions, placed here. */ @@ -450,6 +560,31 @@ struct bpf_tunnel_key { __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. * 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 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-09 3:28 ` Wangnan (F) 2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() Joe Stringer ` (5 subsequent siblings) 7 siblings, 2 replies; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev Fixes the following issue when building without access to 'u32' type: ./tools/lib/bpf/bpf.h:27:23: error: unknown type name ‘u32’ Signed-off-by: Joe Stringer <joe@ovn.org> --- v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf" --- tools/lib/bpf/bpf.c | 4 ++-- tools/lib/bpf/bpf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 8143536b462a..89e8e8e5b60e 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -70,7 +70,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, size_t log_buf_sz) + __u32 kern_version, char *log_buf, size_t log_buf_sz) { int fd; union bpf_attr attr; @@ -98,7 +98,7 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, } int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags) + __u64 flags) { union bpf_attr attr; diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 253c3dbb06b4..61130170a6ad 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -30,11 +30,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, #define BPF_LOG_BUF_SIZE 65536 int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, + __u32 kern_version, char *log_buf, size_t log_buf_sz); int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags); + __u64 flags); int bpf_map_lookup_elem(int fd, void *key, void *value); int bpf_map_delete_elem(int fd, void *key); -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h 2016-12-09 2:46 ` [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h Joe Stringer @ 2016-12-09 3:28 ` Wangnan (F) 2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer 1 sibling, 0 replies; 27+ messages in thread From: Wangnan (F) @ 2016-12-09 3:28 UTC (permalink / raw) To: Joe Stringer, linux-kernel; +Cc: ast, daniel, acme, netdev On 2016/12/9 10:46, Joe Stringer wrote: > Fixes the following issue when building without access to 'u32' type: > > ./tools/lib/bpf/bpf.h:27:23: error: unknown type name ‘u32’ > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf" > --- > tools/lib/bpf/bpf.c | 4 ++-- > tools/lib/bpf/bpf.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Acked-by: Wang Nan <wangnan0@huawei.com> > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > index 8143536b462a..89e8e8e5b60e 100644 > --- a/tools/lib/bpf/bpf.c > +++ b/tools/lib/bpf/bpf.c > @@ -70,7 +70,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, > > int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, > size_t insns_cnt, char *license, > - u32 kern_version, char *log_buf, size_t log_buf_sz) > + __u32 kern_version, char *log_buf, size_t log_buf_sz) > { > int fd; > union bpf_attr attr; > @@ -98,7 +98,7 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, > } > > int bpf_map_update_elem(int fd, void *key, void *value, > - u64 flags) > + __u64 flags) > { > union bpf_attr attr; > > diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h > index 253c3dbb06b4..61130170a6ad 100644 > --- a/tools/lib/bpf/bpf.h > +++ b/tools/lib/bpf/bpf.h > @@ -30,11 +30,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, > #define BPF_LOG_BUF_SIZE 65536 > int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, > size_t insns_cnt, char *license, > - u32 kern_version, char *log_buf, > + __u32 kern_version, char *log_buf, > size_t log_buf_sz); > > int bpf_map_update_elem(int fd, void *key, void *value, > - u64 flags); > + __u64 flags); > > int bpf_map_lookup_elem(int fd, void *key, void *value); > int bpf_map_delete_elem(int fd, void *key); ^ permalink raw reply [flat|nested] 27+ messages in thread
* [tip:perf/urgent] tools lib bpf: use __u32 from linux/types.h 2016-12-09 2:46 ` [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h Joe Stringer 2016-12-09 3:28 ` Wangnan (F) @ 2016-12-20 19:27 ` tip-bot for Joe Stringer 1 sibling, 0 replies; 27+ messages in thread From: tip-bot for Joe Stringer @ 2016-12-20 19:27 UTC (permalink / raw) To: linux-tip-commits Cc: acme, ast, wangnan0, tglx, hpa, mingo, linux-kernel, joe, daniel Commit-ID: 83d994d02bf4594d6bfa9b2b67befb6cff7f9380 Gitweb: http://git.kernel.org/tip/83d994d02bf4594d6bfa9b2b67befb6cff7f9380 Author: Joe Stringer <joe@ovn.org> AuthorDate: Thu, 8 Dec 2016 18:46:15 -0800 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 15 Dec 2016 16:25:46 -0300 tools lib bpf: use __u32 from linux/types.h Fixes the following issue when building without access to 'u32' type: ./tools/lib/bpf/bpf.h:27:23: error: unknown type name ‘u32’ Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Wang Nan <wangnan0@huawei.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Link: http://lkml.kernel.org/r/20161209024620.31660-3-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/lib/bpf/bpf.c | 4 ++-- tools/lib/bpf/bpf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 8143536..89e8e8e 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -70,7 +70,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, size_t log_buf_sz) + __u32 kern_version, char *log_buf, size_t log_buf_sz) { int fd; union bpf_attr attr; @@ -98,7 +98,7 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, } int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags) + __u64 flags) { union bpf_attr attr; diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 253c3db..6113017 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -30,11 +30,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, #define BPF_LOG_BUF_SIZE 65536 int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, + __u32 kern_version, char *log_buf, size_t log_buf_sz); int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags); + __u64 flags); int bpf_map_lookup_elem(int fd, void *key, void *value); int bpf_map_delete_elem(int fd, void *key); ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-09 3:36 ` Wangnan (F) 2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 4/7] samples/bpf: Make samples more libbpf-centric Joe Stringer ` (4 subsequent siblings) 7 siblings, 2 replies; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev The map_flags argument to bpf_create_map() was previously not exposed. By exposing it, users can access flags such as whether or not to preallocate the map. Signed-off-by: Joe Stringer <joe@ovn.org> --- v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf". --- tools/lib/bpf/bpf.c | 3 ++- tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 89e8e8e5b60e..d0afb26c2e0f 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -54,7 +54,7 @@ static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, } int bpf_create_map(enum bpf_map_type map_type, int key_size, - int value_size, int max_entries) + int value_size, int max_entries, __u32 map_flags) { union bpf_attr attr; @@ -64,6 +64,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, attr.key_size = key_size; attr.value_size = value_size; attr.max_entries = max_entries; + attr.map_flags = map_flags; return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); } diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 61130170a6ad..7fcdce16fd62 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -24,7 +24,7 @@ #include <linux/bpf.h> int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, - int max_entries); + int max_entries, __u32 map_flags); /* Recommend log buffer size */ #define BPF_LOG_BUF_SIZE 65536 diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 2e974593f3e8..84e6b35da4bd 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -854,7 +854,8 @@ bpf_object__create_maps(struct bpf_object *obj) *pfd = bpf_create_map(def->type, def->key_size, def->value_size, - def->max_entries); + def->max_entries, + 0); if (*pfd < 0) { size_t j; int err = *pfd; -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() 2016-12-09 2:46 ` [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() Joe Stringer @ 2016-12-09 3:36 ` Wangnan (F) 2016-12-09 14:27 ` Arnaldo Carvalho de Melo 2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer 1 sibling, 1 reply; 27+ messages in thread From: Wangnan (F) @ 2016-12-09 3:36 UTC (permalink / raw) To: Joe Stringer, linux-kernel; +Cc: ast, daniel, acme, netdev On 2016/12/9 10:46, Joe Stringer wrote: > The map_flags argument to bpf_create_map() was previously not exposed. > By exposing it, users can access flags such as whether or not to > preallocate the map. > > Signed-off-by: Joe Stringer <joe@ovn.org> Please mention commit 6c90598174322b8888029e40dd84a4eb01f56afe in commit message: Commit 6c905981743 ("bpf: pre-allocate hash map elements") introduces map_flags to bpf_attr for BPF_MAP_CREATE command. Expose this new parameter in libbpf. Acked-by: Wang Nan <wangnan0@huawei.com> > --- > v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf". > --- > tools/lib/bpf/bpf.c | 3 ++- > tools/lib/bpf/bpf.h | 2 +- > tools/lib/bpf/libbpf.c | 3 ++- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > index 89e8e8e5b60e..d0afb26c2e0f 100644 > --- a/tools/lib/bpf/bpf.c > +++ b/tools/lib/bpf/bpf.c > @@ -54,7 +54,7 @@ static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, > } > > int bpf_create_map(enum bpf_map_type map_type, int key_size, > - int value_size, int max_entries) > + int value_size, int max_entries, __u32 map_flags) > { > union bpf_attr attr; > > @@ -64,6 +64,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, > attr.key_size = key_size; > attr.value_size = value_size; > attr.max_entries = max_entries; > + attr.map_flags = map_flags; > > return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); > } > diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h > index 61130170a6ad..7fcdce16fd62 100644 > --- a/tools/lib/bpf/bpf.h > +++ b/tools/lib/bpf/bpf.h > @@ -24,7 +24,7 @@ > #include <linux/bpf.h> > > int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, > - int max_entries); > + int max_entries, __u32 map_flags); > > /* Recommend log buffer size */ > #define BPF_LOG_BUF_SIZE 65536 > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index 2e974593f3e8..84e6b35da4bd 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -854,7 +854,8 @@ bpf_object__create_maps(struct bpf_object *obj) > *pfd = bpf_create_map(def->type, > def->key_size, > def->value_size, > - def->max_entries); > + def->max_entries, > + 0); > if (*pfd < 0) { > size_t j; > int err = *pfd; ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() 2016-12-09 3:36 ` Wangnan (F) @ 2016-12-09 14:27 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-09 14:27 UTC (permalink / raw) To: Wangnan (F); +Cc: Joe Stringer, linux-kernel, ast, daniel, netdev Em Fri, Dec 09, 2016 at 11:36:18AM +0800, Wangnan (F) escreveu: > > > On 2016/12/9 10:46, Joe Stringer wrote: > > The map_flags argument to bpf_create_map() was previously not exposed. > > By exposing it, users can access flags such as whether or not to > > preallocate the map. > > > > Signed-off-by: Joe Stringer <joe@ovn.org> > > Please mention commit 6c90598174322b8888029e40dd84a4eb01f56afe in > commit message: > > Commit 6c905981743 ("bpf: pre-allocate hash map elements") introduces > map_flags to bpf_attr for BPF_MAP_CREATE command. Expose this new > parameter in libbpf. will do it, thanks. - Arnaldo > Acked-by: Wang Nan <wangnan0@huawei.com> > > > --- > > v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf". > > --- > > tools/lib/bpf/bpf.c | 3 ++- > > tools/lib/bpf/bpf.h | 2 +- > > tools/lib/bpf/libbpf.c | 3 ++- > > 3 files changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > > index 89e8e8e5b60e..d0afb26c2e0f 100644 > > --- a/tools/lib/bpf/bpf.c > > +++ b/tools/lib/bpf/bpf.c > > @@ -54,7 +54,7 @@ static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, > > } > > int bpf_create_map(enum bpf_map_type map_type, int key_size, > > - int value_size, int max_entries) > > + int value_size, int max_entries, __u32 map_flags) > > { > > union bpf_attr attr; > > @@ -64,6 +64,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, > > attr.key_size = key_size; > > attr.value_size = value_size; > > attr.max_entries = max_entries; > > + attr.map_flags = map_flags; > > return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); > > } > > diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h > > index 61130170a6ad..7fcdce16fd62 100644 > > --- a/tools/lib/bpf/bpf.h > > +++ b/tools/lib/bpf/bpf.h > > @@ -24,7 +24,7 @@ > > #include <linux/bpf.h> > > int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, > > - int max_entries); > > + int max_entries, __u32 map_flags); > > /* Recommend log buffer size */ > > #define BPF_LOG_BUF_SIZE 65536 > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > > index 2e974593f3e8..84e6b35da4bd 100644 > > --- a/tools/lib/bpf/libbpf.c > > +++ b/tools/lib/bpf/libbpf.c > > @@ -854,7 +854,8 @@ bpf_object__create_maps(struct bpf_object *obj) > > *pfd = bpf_create_map(def->type, > > def->key_size, > > def->value_size, > > - def->max_entries); > > + def->max_entries, > > + 0); > > if (*pfd < 0) { > > size_t j; > > int err = *pfd; > ^ permalink raw reply [flat|nested] 27+ messages in thread
* [tip:perf/urgent] tools lib bpf: Add flags to bpf_create_map() 2016-12-09 2:46 ` [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() Joe Stringer 2016-12-09 3:36 ` Wangnan (F) @ 2016-12-20 19:27 ` tip-bot for Joe Stringer 1 sibling, 0 replies; 27+ messages in thread From: tip-bot for Joe Stringer @ 2016-12-20 19:27 UTC (permalink / raw) To: linux-tip-commits Cc: hpa, daniel, ast, acme, linux-kernel, wangnan0, mingo, joe, tglx Commit-ID: a5580c7f7a6d078696458d283df5d6547ad1c740 Gitweb: http://git.kernel.org/tip/a5580c7f7a6d078696458d283df5d6547ad1c740 Author: Joe Stringer <joe@ovn.org> AuthorDate: Thu, 8 Dec 2016 18:46:16 -0800 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 15 Dec 2016 16:25:47 -0300 tools lib bpf: Add flags to bpf_create_map() Commit 6c905981743 ("bpf: pre-allocate hash map elements") introduces map_flags to bpf_attr for BPF_MAP_CREATE command. Expose this new parameter in libbpf. By exposing it, users can access flags such as whether or not to preallocate the map. Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Wang Nan <wangnan0@huawei.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Link: http://lkml.kernel.org/r/20161209024620.31660-4-joe@ovn.org [ Added clarifying comment made by Wang Nan ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/lib/bpf/bpf.c | 3 ++- tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 89e8e8e..d0afb26 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -54,7 +54,7 @@ static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, } int bpf_create_map(enum bpf_map_type map_type, int key_size, - int value_size, int max_entries) + int value_size, int max_entries, __u32 map_flags) { union bpf_attr attr; @@ -64,6 +64,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, attr.key_size = key_size; attr.value_size = value_size; attr.max_entries = max_entries; + attr.map_flags = map_flags; return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); } diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 6113017..7fcdce1 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -24,7 +24,7 @@ #include <linux/bpf.h> int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, - int max_entries); + int max_entries, __u32 map_flags); /* Recommend log buffer size */ #define BPF_LOG_BUF_SIZE 65536 diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 2e97459..84e6b35 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -854,7 +854,8 @@ bpf_object__create_maps(struct bpf_object *obj) *pfd = bpf_create_map(def->type, def->key_size, def->value_size, - def->max_entries); + def->max_entries, + 0); if (*pfd < 0) { size_t j; int err = *pfd; ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 4/7] samples/bpf: Make samples more libbpf-centric 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer ` (2 preceding siblings ...) 2016-12-09 2:46 ` [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf Joe Stringer ` (3 subsequent siblings) 7 siblings, 0 replies; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev Switch all of the sample code to use the function names from tools/lib/bpf so that they're consistent with that, and to declare their own log buffers. This allow the next commit to be purely devoted to getting rid of the duplicate library in samples/bpf. Signed-off-by: Joe Stringer <joe@ovn.org> --- samples/bpf/bpf_load.c | 17 ++- samples/bpf/fds_example.c | 9 +- samples/bpf/lathist_user.c | 3 +- samples/bpf/libbpf.c | 23 ++-- samples/bpf/libbpf.h | 18 +-- samples/bpf/map_perf_test_user.c | 1 + samples/bpf/offwaketime_user.c | 10 +- samples/bpf/sampleip_user.c | 5 +- samples/bpf/sock_example.c | 10 +- samples/bpf/sockex1_user.c | 8 +- samples/bpf/sockex2_user.c | 6 +- samples/bpf/sockex3_user.c | 6 +- samples/bpf/spintest_user.c | 10 +- samples/bpf/tc_l2_redirect_user.c | 4 +- samples/bpf/test_cgrp2_array_pin.c | 4 +- samples/bpf/test_current_task_under_cgroup_user.c | 10 +- samples/bpf/test_maps.c | 142 +++++++++++----------- samples/bpf/test_overhead_user.c | 2 + samples/bpf/test_probe_write_user_user.c | 4 +- samples/bpf/test_verifier.c | 8 +- samples/bpf/trace_event_user.c | 15 +-- samples/bpf/trace_output_user.c | 3 +- samples/bpf/tracex1_user.c | 2 + samples/bpf/tracex2_user.c | 12 +- samples/bpf/tracex3_user.c | 6 +- samples/bpf/tracex4_user.c | 6 +- samples/bpf/tracex5_user.c | 2 + samples/bpf/tracex6_user.c | 4 +- samples/bpf/xdp1_user.c | 4 +- 29 files changed, 200 insertions(+), 154 deletions(-) diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index 97913e109b14..f8e3c58a0897 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -18,7 +18,6 @@ #include <poll.h> #include <ctype.h> #include "libbpf.h" -#include "bpf_helpers.h" #include "bpf_load.h" #define DEBUGFS "/sys/kernel/debug/tracing/" @@ -26,17 +25,26 @@ static char license[128]; static int kern_version; static bool processed_sec[128]; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; int map_fd[MAX_MAPS]; int prog_fd[MAX_PROGS]; int event_fd[MAX_PROGS]; int prog_cnt; int prog_array_fd = -1; +struct bpf_map_def { + unsigned int type; + unsigned int key_size; + unsigned int value_size; + unsigned int max_entries; + unsigned int map_flags; +}; + static int populate_prog_array(const char *event, int prog_fd) { int ind = atoi(event), err; - err = bpf_update_elem(prog_array_fd, &ind, &prog_fd, BPF_ANY); + err = bpf_map_update_elem(prog_array_fd, &ind, &prog_fd, BPF_ANY); if (err < 0) { printf("failed to store prog_fd in prog_array\n"); return -1; @@ -77,9 +85,10 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) return -1; } - fd = bpf_prog_load(prog_type, prog, size, license, kern_version); + fd = bpf_load_program(prog_type, prog, size, license, kern_version, + NULL, 0); if (fd < 0) { - printf("bpf_prog_load() err=%d\n%s", errno, bpf_log_buf); + printf("bpf_load_program() err=%d\n%s", errno, bpf_log_buf); return -1; } diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index 625e797be6ef..4ffd8f340496 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -58,8 +58,9 @@ static int bpf_prog_create(const char *object) assert(!load_bpf_file((char *)object)); return prog_fd[0]; } else { - return bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, - insns, sizeof(insns), "GPL", 0); + return bpf_load_program(BPF_PROG_TYPE_SOCKET_FILTER, + insns, sizeof(insns), "GPL", 0, NULL, + 0); } } @@ -83,12 +84,12 @@ static int bpf_do_map(const char *file, uint32_t flags, uint32_t key, } if ((flags & BPF_F_KEY_VAL) == BPF_F_KEY_VAL) { - ret = bpf_update_elem(fd, &key, &value, 0); + ret = bpf_map_update_elem(fd, &key, &value, 0); printf("bpf: fd:%d u->(%u:%u) ret:(%d,%s)\n", fd, key, value, ret, strerror(errno)); assert(ret == 0); } else if (flags & BPF_F_KEY) { - ret = bpf_lookup_elem(fd, &key, &value); + ret = bpf_map_lookup_elem(fd, &key, &value); printf("bpf: fd:%d l->(%u):%u ret:(%d,%s)\n", fd, key, value, ret, strerror(errno)); assert(ret == 0); diff --git a/samples/bpf/lathist_user.c b/samples/bpf/lathist_user.c index 65da8c1576de..bcdee00816b2 100644 --- a/samples/bpf/lathist_user.c +++ b/samples/bpf/lathist_user.c @@ -23,6 +23,7 @@ struct cpu_hist { }; static struct cpu_hist cpu_hist[MAX_CPU]; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; static void stars(char *str, long val, long max, int width) { @@ -73,7 +74,7 @@ static void get_data(int fd) for (c = 0; c < MAX_CPU; c++) { for (i = 0; i < MAX_ENTRIES; i++) { key = c * MAX_ENTRIES + i; - bpf_lookup_elem(fd, &key, &value); + bpf_map_lookup_elem(fd, &key, &value); cpu_hist[c].data[i] = value; if (value > cpu_hist[c].max) diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c index 9969e35550c3..e5c5a69996fc 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/libbpf.c @@ -32,7 +32,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, return syscall(__NR_bpf, BPF_MAP_CREATE, &attr, sizeof(attr)); } -int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags) +int bpf_map_update_elem(int fd, void *key, void *value, unsigned long long flags) { union bpf_attr attr = { .map_fd = fd, @@ -44,7 +44,7 @@ int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags) return syscall(__NR_bpf, BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr)); } -int bpf_lookup_elem(int fd, void *key, void *value) +int bpf_map_lookup_elem(int fd, void *key, void *value) { union bpf_attr attr = { .map_fd = fd, @@ -55,7 +55,7 @@ int bpf_lookup_elem(int fd, void *key, void *value) return syscall(__NR_bpf, BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr)); } -int bpf_delete_elem(int fd, void *key) +int bpf_map_delete_elem(int fd, void *key) { union bpf_attr attr = { .map_fd = fd, @@ -65,7 +65,7 @@ int bpf_delete_elem(int fd, void *key) return syscall(__NR_bpf, BPF_MAP_DELETE_ELEM, &attr, sizeof(attr)); } -int bpf_get_next_key(int fd, void *key, void *next_key) +int bpf_map_get_next_key(int fd, void *key, void *next_key) { union bpf_attr attr = { .map_fd = fd, @@ -78,19 +78,18 @@ int bpf_get_next_key(int fd, void *key, void *next_key) #define ROUND_UP(x, n) (((x) + (n) - 1u) & ~((n) - 1u)) -char bpf_log_buf[LOG_BUF_SIZE]; - -int bpf_prog_load(enum bpf_prog_type prog_type, - const struct bpf_insn *insns, int prog_len, - const char *license, int kern_version) +int bpf_load_program(enum bpf_prog_type prog_type, + const struct bpf_insn *insns, int prog_len, + const char *license, int kern_version, + char *log_buf, size_t log_buf_sz) { union bpf_attr attr = { .prog_type = prog_type, .insns = ptr_to_u64((void *) insns), .insn_cnt = prog_len / sizeof(struct bpf_insn), .license = ptr_to_u64((void *) license), - .log_buf = ptr_to_u64(bpf_log_buf), - .log_size = LOG_BUF_SIZE, + .log_buf = ptr_to_u64(log_buf), + .log_size = log_buf_sz, .log_level = 1, }; @@ -99,7 +98,7 @@ int bpf_prog_load(enum bpf_prog_type prog_type, */ attr.kern_version = kern_version; - bpf_log_buf[0] = 0; + log_buf[0] = 0; return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); } diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index ac6edb61b64a..1325152be4cd 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -6,20 +6,20 @@ struct bpf_insn; int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, int max_entries, int map_flags); -int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags); -int bpf_lookup_elem(int fd, void *key, void *value); -int bpf_delete_elem(int fd, void *key); -int bpf_get_next_key(int fd, void *key, void *next_key); +int bpf_map_update_elem(int fd, void *key, void *value, unsigned long long flags); +int bpf_map_lookup_elem(int fd, void *key, void *value); +int bpf_map_delete_elem(int fd, void *key); +int bpf_map_get_next_key(int fd, void *key, void *next_key); -int bpf_prog_load(enum bpf_prog_type prog_type, - const struct bpf_insn *insns, int insn_len, - const char *license, int kern_version); +int bpf_load_program(enum bpf_prog_type prog_type, + const struct bpf_insn *insns, int insn_len, + const char *license, int kern_version, + char *log_buf, size_t log_buf_sz); int bpf_obj_pin(int fd, const char *pathname); int bpf_obj_get(const char *pathname); -#define LOG_BUF_SIZE 65536 -extern char bpf_log_buf[LOG_BUF_SIZE]; +#define BPF_LOG_BUF_SIZE 65536 /* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */ diff --git a/samples/bpf/map_perf_test_user.c b/samples/bpf/map_perf_test_user.c index 3147377e8fd3..62ed870590cc 100644 --- a/samples/bpf/map_perf_test_user.c +++ b/samples/bpf/map_perf_test_user.c @@ -37,6 +37,7 @@ static __u64 time_get_ns(void) #define PERCPU_HASH_KMALLOC (1 << 3) static int test_flags = ~0; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; static void test_hash_prealloc(int cpu) { diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c index 6f002a9c24fa..dd2598b1fabc 100644 --- a/samples/bpf/offwaketime_user.c +++ b/samples/bpf/offwaketime_user.c @@ -20,6 +20,8 @@ #define PRINT_RAW_ADDR 0 +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static void print_ksym(__u64 addr) { struct ksym *sym; @@ -49,14 +51,14 @@ static void print_stack(struct key_t *key, __u64 count) int i; printf("%s;", key->target); - if (bpf_lookup_elem(map_fd[3], &key->tret, ip) != 0) { + if (bpf_map_lookup_elem(map_fd[3], &key->tret, ip) != 0) { printf("---;"); } else { for (i = PERF_MAX_STACK_DEPTH - 1; i >= 0; i--) print_ksym(ip[i]); } printf("-;"); - if (bpf_lookup_elem(map_fd[3], &key->wret, ip) != 0) { + if (bpf_map_lookup_elem(map_fd[3], &key->wret, ip) != 0) { printf("---;"); } else { for (i = 0; i < PERF_MAX_STACK_DEPTH; i++) @@ -77,8 +79,8 @@ static void print_stacks(int fd) struct key_t key = {}, next_key; __u64 value; - while (bpf_get_next_key(fd, &key, &next_key) == 0) { - bpf_lookup_elem(fd, &next_key, &value); + while (bpf_map_get_next_key(fd, &key, &next_key) == 0) { + bpf_map_lookup_elem(fd, &next_key, &value); print_stack(&next_key, value); key = next_key; } diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index 260a6bdd6413..09ab620b324c 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -28,6 +28,7 @@ #define PAGE_OFFSET 0xffff880000000000 static int nr_cpus; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; static void usage(void) { @@ -95,8 +96,8 @@ static void print_ip_map(int fd) /* fetch IPs and counts */ key = 0, i = 0; - while (bpf_get_next_key(fd, &key, &next_key) == 0) { - bpf_lookup_elem(fd, &next_key, &value); + while (bpf_map_get_next_key(fd, &key, &next_key) == 0) { + bpf_map_lookup_elem(fd, &next_key, &value); counts[i].ip = next_key; counts[i++].count = value; key = next_key; diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 28b60baa9fa8..7ab636c30154 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -55,8 +55,8 @@ static int test_sock(void) BPF_EXIT_INSN(), }; - prog_fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, prog, sizeof(prog), - "GPL", 0); + prog_fd = bpf_load_program(BPF_PROG_TYPE_SOCKET_FILTER, prog, sizeof(prog), + "GPL", 0, NULL, 0); if (prog_fd < 0) { printf("failed to load prog '%s'\n", strerror(errno)); goto cleanup; @@ -72,13 +72,13 @@ static int test_sock(void) for (i = 0; i < 10; i++) { key = IPPROTO_TCP; - assert(bpf_lookup_elem(map_fd, &key, &tcp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd, &key, &tcp_cnt) == 0); key = IPPROTO_UDP; - assert(bpf_lookup_elem(map_fd, &key, &udp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd, &key, &udp_cnt) == 0); key = IPPROTO_ICMP; - assert(bpf_lookup_elem(map_fd, &key, &icmp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd, &key, &icmp_cnt) == 0); printf("TCP %lld UDP %lld ICMP %lld packets\n", tcp_cnt, udp_cnt, icmp_cnt); diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c index 678ce4693551..2956d893d732 100644 --- a/samples/bpf/sockex1_user.c +++ b/samples/bpf/sockex1_user.c @@ -6,6 +6,8 @@ #include <unistd.h> #include <arpa/inet.h> +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + int main(int ac, char **argv) { char filename[256]; @@ -32,13 +34,13 @@ int main(int ac, char **argv) int key; key = IPPROTO_TCP; - assert(bpf_lookup_elem(map_fd[0], &key, &tcp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd[0], &key, &tcp_cnt) == 0); key = IPPROTO_UDP; - assert(bpf_lookup_elem(map_fd[0], &key, &udp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd[0], &key, &udp_cnt) == 0); key = IPPROTO_ICMP; - assert(bpf_lookup_elem(map_fd[0], &key, &icmp_cnt) == 0); + assert(bpf_map_lookup_elem(map_fd[0], &key, &icmp_cnt) == 0); printf("TCP %lld UDP %lld ICMP %lld bytes\n", tcp_cnt, udp_cnt, icmp_cnt); diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c index 8a4085c2d117..c43958a67cca 100644 --- a/samples/bpf/sockex2_user.c +++ b/samples/bpf/sockex2_user.c @@ -7,6 +7,8 @@ #include <arpa/inet.h> #include <sys/resource.h> +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + struct pair { __u64 packets; __u64 bytes; @@ -39,8 +41,8 @@ int main(int ac, char **argv) int key = 0, next_key; struct pair value; - while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) { - bpf_lookup_elem(map_fd[0], &next_key, &value); + while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) { + bpf_map_lookup_elem(map_fd[0], &next_key, &value); printf("ip %s bytes %lld packets %lld\n", inet_ntoa((struct in_addr){htonl(next_key)}), value.bytes, value.packets); diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 3fcfd8c4b2a3..2cb9011ea440 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -7,6 +7,8 @@ #include <arpa/inet.h> #include <sys/resource.h> +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + struct bpf_flow_keys { __be32 src; __be32 dst; @@ -54,8 +56,8 @@ int main(int argc, char **argv) sleep(1); printf("IP src.port -> dst.port bytes packets\n"); - while (bpf_get_next_key(map_fd[2], &key, &next_key) == 0) { - bpf_lookup_elem(map_fd[2], &next_key, &value); + while (bpf_map_get_next_key(map_fd[2], &key, &next_key) == 0) { + bpf_map_lookup_elem(map_fd[2], &next_key, &value); printf("%s.%05d -> %s.%05d %12lld %12lld\n", inet_ntoa((struct in_addr){htonl(next_key.src)}), next_key.port16[0], diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c index 311ede532230..8950a3d27a92 100644 --- a/samples/bpf/spintest_user.c +++ b/samples/bpf/spintest_user.c @@ -7,6 +7,8 @@ #include "libbpf.h" #include "bpf_load.h" +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + int main(int ac, char **argv) { struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; @@ -31,8 +33,8 @@ int main(int ac, char **argv) for (i = 0; i < 5; i++) { key = 0; printf("kprobing funcs:"); - while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) { - bpf_lookup_elem(map_fd[0], &next_key, &value); + while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) { + bpf_map_lookup_elem(map_fd[0], &next_key, &value); assert(next_key == value); sym = ksym_search(value); printf(" %s", sym->name); @@ -41,8 +43,8 @@ int main(int ac, char **argv) if (key) printf("\n"); key = 0; - while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) - bpf_delete_elem(map_fd[0], &next_key); + while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) + bpf_map_delete_elem(map_fd[0], &next_key); sleep(1); } diff --git a/samples/bpf/tc_l2_redirect_user.c b/samples/bpf/tc_l2_redirect_user.c index 4013c5337b91..28995a776560 100644 --- a/samples/bpf/tc_l2_redirect_user.c +++ b/samples/bpf/tc_l2_redirect_user.c @@ -60,9 +60,9 @@ int main(int argc, char **argv) } /* bpf_tunnel_key.remote_ipv4 expects host byte orders */ - ret = bpf_update_elem(array_fd, &array_key, &ifindex, 0); + ret = bpf_map_update_elem(array_fd, &array_key, &ifindex, 0); if (ret) { - perror("bpf_update_elem"); + perror("bpf_map_update_elem"); goto out; } diff --git a/samples/bpf/test_cgrp2_array_pin.c b/samples/bpf/test_cgrp2_array_pin.c index 70e86f7be69d..8a1b8b5d8def 100644 --- a/samples/bpf/test_cgrp2_array_pin.c +++ b/samples/bpf/test_cgrp2_array_pin.c @@ -85,9 +85,9 @@ int main(int argc, char **argv) } } - ret = bpf_update_elem(array_fd, &array_key, &cg2_fd, 0); + ret = bpf_map_update_elem(array_fd, &array_key, &cg2_fd, 0); if (ret) { - perror("bpf_update_elem"); + perror("bpf_map_update_elem"); goto out; } diff --git a/samples/bpf/test_current_task_under_cgroup_user.c b/samples/bpf/test_current_task_under_cgroup_user.c index 30b0bce884f9..054915324aeb 100644 --- a/samples/bpf/test_current_task_under_cgroup_user.c +++ b/samples/bpf/test_current_task_under_cgroup_user.c @@ -28,6 +28,8 @@ #define log_err(MSG, ...) fprintf(stderr, "(%s:%d: errno: %s) " MSG "\n", \ __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__) +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static int join_cgroup(char *path) { int fd, rc = 0; @@ -94,7 +96,7 @@ int main(int argc, char **argv) goto cleanup_cgroup_err; } - if (bpf_update_elem(map_fd[0], &idx, &cg2, BPF_ANY)) { + if (bpf_map_update_elem(map_fd[0], &idx, &cg2, BPF_ANY)) { log_err("Adding target cgroup to map"); goto cleanup_cgroup_err; } @@ -109,7 +111,7 @@ int main(int argc, char **argv) */ sync(); - bpf_lookup_elem(map_fd[1], &idx, &remote_pid); + bpf_map_lookup_elem(map_fd[1], &idx, &remote_pid); if (local_pid != remote_pid) { fprintf(stderr, @@ -123,10 +125,10 @@ int main(int argc, char **argv) goto leave_cgroup_err; remote_pid = 0; - bpf_update_elem(map_fd[1], &idx, &remote_pid, BPF_ANY); + bpf_map_update_elem(map_fd[1], &idx, &remote_pid, BPF_ANY); sync(); - bpf_lookup_elem(map_fd[1], &idx, &remote_pid); + bpf_map_lookup_elem(map_fd[1], &idx, &remote_pid); if (local_pid == remote_pid) { fprintf(stderr, "BPF cgroup negative test did not work\n"); diff --git a/samples/bpf/test_maps.c b/samples/bpf/test_maps.c index cce2b59751eb..2618394a3cc7 100644 --- a/samples/bpf/test_maps.c +++ b/samples/bpf/test_maps.c @@ -36,68 +36,68 @@ static void test_hashmap_sanity(int i, void *data) key = 1; value = 1234; /* insert key=1 element */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_ANY) == 0); value = 0; /* BPF_NOEXIST means: add new element if it doesn't exist */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && /* key=1 already exists */ errno == EEXIST); - assert(bpf_update_elem(map_fd, &key, &value, -1) == -1 && errno == EINVAL); + assert(bpf_map_update_elem(map_fd, &key, &value, -1) == -1 && errno == EINVAL); /* check that key=1 can be found */ - assert(bpf_lookup_elem(map_fd, &key, &value) == 0 && value == 1234); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == 0 && value == 1234); key = 2; /* check that key=2 is not found */ - assert(bpf_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); /* BPF_EXIST means: update existing element */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_EXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_EXIST) == -1 && /* key=2 is not there */ errno == ENOENT); /* insert key=2 element */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); /* key=1 and key=2 were inserted, check that key=0 cannot be inserted * due to max_entries limit */ key = 0; - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && errno == E2BIG); /* update existing element, thought the map is full */ key = 1; - assert(bpf_update_elem(map_fd, &key, &value, BPF_EXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_EXIST) == 0); key = 2; - assert(bpf_update_elem(map_fd, &key, &value, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_ANY) == 0); key = 1; - assert(bpf_update_elem(map_fd, &key, &value, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_ANY) == 0); /* check that key = 0 doesn't exist */ key = 0; - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == ENOENT); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == ENOENT); /* iterate over two elements */ - assert(bpf_get_next_key(map_fd, &key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &key, &next_key) == 0 && (next_key == 1 || next_key == 2)); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == 0 && (next_key == 1 || next_key == 2)); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == -1 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == -1 && errno == ENOENT); /* delete both elements */ key = 1; - assert(bpf_delete_elem(map_fd, &key) == 0); + assert(bpf_map_delete_elem(map_fd, &key) == 0); key = 2; - assert(bpf_delete_elem(map_fd, &key) == 0); - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == ENOENT); + assert(bpf_map_delete_elem(map_fd, &key) == 0); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == ENOENT); key = 0; /* check that map is empty */ - assert(bpf_get_next_key(map_fd, &key, &next_key) == -1 && + assert(bpf_map_get_next_key(map_fd, &key, &next_key) == -1 && errno == ENOENT); close(map_fd); } @@ -123,54 +123,54 @@ static void test_percpu_hashmap_sanity(int task, void *data) key = 1; /* insert key=1 element */ assert(!(expected_key_mask & key)); - assert(bpf_update_elem(map_fd, &key, value, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, value, BPF_ANY) == 0); expected_key_mask |= key; /* BPF_NOEXIST means: add new element if it doesn't exist */ - assert(bpf_update_elem(map_fd, &key, value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, value, BPF_NOEXIST) == -1 && /* key=1 already exists */ errno == EEXIST); /* -1 is an invalid flag */ - assert(bpf_update_elem(map_fd, &key, value, -1) == -1 && + assert(bpf_map_update_elem(map_fd, &key, value, -1) == -1 && errno == EINVAL); /* check that key=1 can be found. value could be 0 if the lookup * was run from a different cpu. */ value[0] = 1; - assert(bpf_lookup_elem(map_fd, &key, value) == 0 && value[0] == 100); + assert(bpf_map_lookup_elem(map_fd, &key, value) == 0 && value[0] == 100); key = 2; /* check that key=2 is not found */ - assert(bpf_lookup_elem(map_fd, &key, value) == -1 && errno == ENOENT); + assert(bpf_map_lookup_elem(map_fd, &key, value) == -1 && errno == ENOENT); /* BPF_EXIST means: update existing element */ - assert(bpf_update_elem(map_fd, &key, value, BPF_EXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, value, BPF_EXIST) == -1 && /* key=2 is not there */ errno == ENOENT); /* insert key=2 element */ assert(!(expected_key_mask & key)); - assert(bpf_update_elem(map_fd, &key, value, BPF_NOEXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, value, BPF_NOEXIST) == 0); expected_key_mask |= key; /* key=1 and key=2 were inserted, check that key=0 cannot be inserted * due to max_entries limit */ key = 0; - assert(bpf_update_elem(map_fd, &key, value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, value, BPF_NOEXIST) == -1 && errno == E2BIG); /* check that key = 0 doesn't exist */ - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == ENOENT); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == ENOENT); /* iterate over two elements */ - while (!bpf_get_next_key(map_fd, &key, &next_key)) { + while (!bpf_map_get_next_key(map_fd, &key, &next_key)) { assert((expected_key_mask & next_key) == next_key); expected_key_mask &= ~next_key; - assert(bpf_lookup_elem(map_fd, &next_key, value) == 0); + assert(bpf_map_lookup_elem(map_fd, &next_key, value) == 0); for (i = 0; i < nr_cpus; i++) assert(value[i] == i + 100); @@ -180,18 +180,18 @@ static void test_percpu_hashmap_sanity(int task, void *data) /* Update with BPF_EXIST */ key = 1; - assert(bpf_update_elem(map_fd, &key, value, BPF_EXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, value, BPF_EXIST) == 0); /* delete both elements */ key = 1; - assert(bpf_delete_elem(map_fd, &key) == 0); + assert(bpf_map_delete_elem(map_fd, &key) == 0); key = 2; - assert(bpf_delete_elem(map_fd, &key) == 0); - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == ENOENT); + assert(bpf_map_delete_elem(map_fd, &key) == 0); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == ENOENT); key = 0; /* check that map is empty */ - assert(bpf_get_next_key(map_fd, &key, &next_key) == -1 && + assert(bpf_map_get_next_key(map_fd, &key, &next_key) == -1 && errno == ENOENT); close(map_fd); } @@ -211,41 +211,41 @@ static void test_arraymap_sanity(int i, void *data) key = 1; value = 1234; /* insert key=1 element */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_ANY) == 0); value = 0; - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && errno == EEXIST); /* check that key=1 can be found */ - assert(bpf_lookup_elem(map_fd, &key, &value) == 0 && value == 1234); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == 0 && value == 1234); key = 0; /* check that key=0 is also found and zero initialized */ - assert(bpf_lookup_elem(map_fd, &key, &value) == 0 && value == 0); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == 0 && value == 0); /* key=0 and key=1 were inserted, check that key=2 cannot be inserted * due to max_entries limit */ key = 2; - assert(bpf_update_elem(map_fd, &key, &value, BPF_EXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_EXIST) == -1 && errno == E2BIG); /* check that key = 2 doesn't exist */ - assert(bpf_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); /* iterate over two elements */ - assert(bpf_get_next_key(map_fd, &key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &key, &next_key) == 0 && next_key == 0); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == 0 && next_key == 1); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == -1 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == -1 && errno == ENOENT); /* delete shouldn't succeed */ key = 1; - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == EINVAL); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == EINVAL); close(map_fd); } @@ -269,12 +269,12 @@ static void test_percpu_arraymap_many_keys(void) values[i] = i + 10; for (key = 0; key < nr_keys; key++) - assert(bpf_update_elem(map_fd, &key, values, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, values, BPF_ANY) == 0); for (key = 0; key < nr_keys; key++) { for (i = 0; i < nr_cpus; i++) values[i] = 0; - assert(bpf_lookup_elem(map_fd, &key, values) == 0); + assert(bpf_map_lookup_elem(map_fd, &key, values) == 0); for (i = 0; i < nr_cpus; i++) assert(values[i] == i + 10); } @@ -300,40 +300,40 @@ static void test_percpu_arraymap_sanity(int i, void *data) key = 1; /* insert key=1 element */ - assert(bpf_update_elem(map_fd, &key, values, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd, &key, values, BPF_ANY) == 0); values[0] = 0; - assert(bpf_update_elem(map_fd, &key, values, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, values, BPF_NOEXIST) == -1 && errno == EEXIST); /* check that key=1 can be found */ - assert(bpf_lookup_elem(map_fd, &key, values) == 0 && values[0] == 100); + assert(bpf_map_lookup_elem(map_fd, &key, values) == 0 && values[0] == 100); key = 0; /* check that key=0 is also found and zero initialized */ - assert(bpf_lookup_elem(map_fd, &key, values) == 0 && + assert(bpf_map_lookup_elem(map_fd, &key, values) == 0 && values[0] == 0 && values[nr_cpus - 1] == 0); /* check that key=2 cannot be inserted due to max_entries limit */ key = 2; - assert(bpf_update_elem(map_fd, &key, values, BPF_EXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, values, BPF_EXIST) == -1 && errno == E2BIG); /* check that key = 2 doesn't exist */ - assert(bpf_lookup_elem(map_fd, &key, values) == -1 && errno == ENOENT); + assert(bpf_map_lookup_elem(map_fd, &key, values) == -1 && errno == ENOENT); /* iterate over two elements */ - assert(bpf_get_next_key(map_fd, &key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &key, &next_key) == 0 && next_key == 0); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == 0 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == 0 && next_key == 1); - assert(bpf_get_next_key(map_fd, &next_key, &next_key) == -1 && + assert(bpf_map_get_next_key(map_fd, &next_key, &next_key) == -1 && errno == ENOENT); /* delete shouldn't succeed */ key = 1; - assert(bpf_delete_elem(map_fd, &key) == -1 && errno == EINVAL); + assert(bpf_map_delete_elem(map_fd, &key) == -1 && errno == EINVAL); close(map_fd); } @@ -359,21 +359,21 @@ static void test_map_large(void) for (i = 0; i < MAP_SIZE; i++) { key = (struct bigkey) {.c = i}; value = i; - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); } key.c = -1; - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && errno == E2BIG); /* iterate through all elements */ for (i = 0; i < MAP_SIZE; i++) - assert(bpf_get_next_key(map_fd, &key, &key) == 0); - assert(bpf_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); + assert(bpf_map_get_next_key(map_fd, &key, &key) == 0); + assert(bpf_map_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); key.c = 0; - assert(bpf_lookup_elem(map_fd, &key, &value) == 0 && value == 0); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == 0 && value == 0); key.a = 1; - assert(bpf_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); + assert(bpf_map_lookup_elem(map_fd, &key, &value) == -1 && errno == ENOENT); close(map_fd); } @@ -423,10 +423,10 @@ static void do_work(int fn, void *data) for (i = fn; i < MAP_SIZE; i += TASKS) { key = value = i; if (do_update) { - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); - assert(bpf_update_elem(map_fd, &key, &value, BPF_EXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == 0); + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_EXIST) == 0); } else { - assert(bpf_delete_elem(map_fd, &key) == 0); + assert(bpf_map_delete_elem(map_fd, &key) == 0); } } } @@ -454,19 +454,19 @@ static void test_map_parallel(void) run_parallel(TASKS, do_work, data); /* check that key=0 is already there */ - assert(bpf_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && + assert(bpf_map_update_elem(map_fd, &key, &value, BPF_NOEXIST) == -1 && errno == EEXIST); /* check that all elements were inserted */ key = -1; for (i = 0; i < MAP_SIZE; i++) - assert(bpf_get_next_key(map_fd, &key, &key) == 0); - assert(bpf_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); + assert(bpf_map_get_next_key(map_fd, &key, &key) == 0); + assert(bpf_map_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); /* another check for all elements */ for (i = 0; i < MAP_SIZE; i++) { key = MAP_SIZE - i - 1; - assert(bpf_lookup_elem(map_fd, &key, &value) == 0 && + assert(bpf_map_lookup_elem(map_fd, &key, &value) == 0 && value == key); } @@ -476,7 +476,7 @@ static void test_map_parallel(void) /* nothing should be left */ key = -1; - assert(bpf_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); + assert(bpf_map_get_next_key(map_fd, &key, &key) == -1 && errno == ENOENT); } static void run_all_tests(void) diff --git a/samples/bpf/test_overhead_user.c b/samples/bpf/test_overhead_user.c index d291167fd3c7..74b79af98ba2 100644 --- a/samples/bpf/test_overhead_user.c +++ b/samples/bpf/test_overhead_user.c @@ -24,6 +24,8 @@ #define MAX_CNT 1000000 +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static __u64 time_get_ns(void) { struct timespec ts; diff --git a/samples/bpf/test_probe_write_user_user.c b/samples/bpf/test_probe_write_user_user.c index a44bf347bedd..29af2160e4e2 100644 --- a/samples/bpf/test_probe_write_user_user.c +++ b/samples/bpf/test_probe_write_user_user.c @@ -9,6 +9,8 @@ #include <netinet/in.h> #include <arpa/inet.h> +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + int main(int ac, char **argv) { int serverfd, serverconnfd, clientfd; @@ -50,7 +52,7 @@ int main(int ac, char **argv) mapped_addr_in->sin_port = htons(5555); mapped_addr_in->sin_addr.s_addr = inet_addr("255.255.255.255"); - assert(!bpf_update_elem(map_fd[0], &mapped_addr, &serv_addr, BPF_ANY)); + assert(!bpf_map_update_elem(map_fd[0], &mapped_addr, &serv_addr, BPF_ANY)); assert(listen(serverfd, 5) == 0); diff --git a/samples/bpf/test_verifier.c b/samples/bpf/test_verifier.c index 369ffaad3799..2e85a8e2d696 100644 --- a/samples/bpf/test_verifier.c +++ b/samples/bpf/test_verifier.c @@ -24,6 +24,8 @@ #define MAX_FIXUPS 8 +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + struct bpf_test { const char *descr; struct bpf_insn insns[MAX_INSNS]; @@ -2466,9 +2468,9 @@ static int test(void) printf("#%d %s ", i, tests[i].descr); - prog_fd = bpf_prog_load(prog_type ?: BPF_PROG_TYPE_SOCKET_FILTER, - prog, prog_len * sizeof(struct bpf_insn), - "GPL", 0); + prog_fd = bpf_load_program(prog_type ?: BPF_PROG_TYPE_SOCKET_FILTER, + prog, prog_len * sizeof(struct bpf_insn), + "GPL", 0, NULL, 0); if (unpriv && tests[i].result_unpriv != UNDEF) expected_result = tests[i].result_unpriv; diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index 9a130d31ecf2..de8fd0266d78 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -24,6 +24,7 @@ #define SAMPLE_FREQ 50 static bool sys_read_seen, sys_write_seen; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; static void print_ksym(__u64 addr) { @@ -61,14 +62,14 @@ static void print_stack(struct key_t *key, __u64 count) int i; printf("%3lld %s;", count, key->comm); - if (bpf_lookup_elem(map_fd[1], &key->kernstack, ip) != 0) { + if (bpf_map_lookup_elem(map_fd[1], &key->kernstack, ip) != 0) { printf("---;"); } else { for (i = PERF_MAX_STACK_DEPTH - 1; i >= 0; i--) print_ksym(ip[i]); } printf("-;"); - if (bpf_lookup_elem(map_fd[1], &key->userstack, ip) != 0) { + if (bpf_map_lookup_elem(map_fd[1], &key->userstack, ip) != 0) { printf("---;"); } else { for (i = PERF_MAX_STACK_DEPTH - 1; i >= 0; i--) @@ -98,10 +99,10 @@ static void print_stacks(void) int fd = map_fd[0], stack_map = map_fd[1]; sys_read_seen = sys_write_seen = false; - while (bpf_get_next_key(fd, &key, &next_key) == 0) { - bpf_lookup_elem(fd, &next_key, &value); + while (bpf_map_get_next_key(fd, &key, &next_key) == 0) { + bpf_map_lookup_elem(fd, &next_key, &value); print_stack(&next_key, value); - bpf_delete_elem(fd, &next_key); + bpf_map_delete_elem(fd, &next_key); key = next_key; } @@ -111,8 +112,8 @@ static void print_stacks(void) } /* clear stack map */ - while (bpf_get_next_key(stack_map, &stackid, &next_id) == 0) { - bpf_delete_elem(stack_map, &next_id); + while (bpf_map_get_next_key(stack_map, &stackid, &next_id) == 0) { + bpf_map_delete_elem(stack_map, &next_id); stackid = next_id; } } diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c index 661a7d052f2c..9c38f7aa4515 100644 --- a/samples/bpf/trace_output_user.c +++ b/samples/bpf/trace_output_user.c @@ -27,6 +27,7 @@ static int pmu_fd; int page_size; int page_cnt = 8; volatile struct perf_event_mmap_page *header; +char bpf_log_buf[BPF_LOG_BUF_SIZE]; typedef void (*print_fn)(void *data, int size); @@ -162,7 +163,7 @@ static void test_bpf_perf_event(void) pmu_fd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); assert(pmu_fd >= 0); - assert(bpf_update_elem(map_fd[0], &key, &pmu_fd, BPF_ANY) == 0); + assert(bpf_map_update_elem(map_fd[0], &key, &pmu_fd, BPF_ANY) == 0); ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); } diff --git a/samples/bpf/tracex1_user.c b/samples/bpf/tracex1_user.c index 31a48183beea..aa60cc3ef38c 100644 --- a/samples/bpf/tracex1_user.c +++ b/samples/bpf/tracex1_user.c @@ -4,6 +4,8 @@ #include "libbpf.h" #include "bpf_load.h" +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + int main(int ac, char **argv) { FILE *f; diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c index ab5b19e68acf..5dd128cc5785 100644 --- a/samples/bpf/tracex2_user.c +++ b/samples/bpf/tracex2_user.c @@ -10,6 +10,8 @@ #define MAX_INDEX 64 #define MAX_STARS 38 +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static void stars(char *str, long val, long max, int width) { int i; @@ -46,12 +48,12 @@ static void print_hist_for_pid(int fd, void *task) long max_value = 0; int i, ind; - while (bpf_get_next_key(fd, &key, &next_key) == 0) { + while (bpf_map_get_next_key(fd, &key, &next_key) == 0) { if (memcmp(&next_key, task, SIZE)) { key = next_key; continue; } - bpf_lookup_elem(fd, &next_key, values); + bpf_map_lookup_elem(fd, &next_key, values); value = 0; for (i = 0; i < nr_cpus; i++) value += values[i]; @@ -81,7 +83,7 @@ static void print_hist(int fd) int task_cnt = 0; int i; - while (bpf_get_next_key(fd, &key, &next_key) == 0) { + while (bpf_map_get_next_key(fd, &key, &next_key) == 0) { int found = 0; for (i = 0; i < task_cnt; i++) @@ -134,8 +136,8 @@ int main(int ac, char **argv) for (i = 0; i < 5; i++) { key = 0; - while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) { - bpf_lookup_elem(map_fd[0], &next_key, &value); + while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) { + bpf_map_lookup_elem(map_fd[0], &next_key, &value); printf("location 0x%lx count %ld\n", next_key, value); key = next_key; } diff --git a/samples/bpf/tracex3_user.c b/samples/bpf/tracex3_user.c index 48716f7f0d8b..9c6ee595a882 100644 --- a/samples/bpf/tracex3_user.c +++ b/samples/bpf/tracex3_user.c @@ -18,6 +18,8 @@ #define SLOTS 100 +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static void clear_stats(int fd) { unsigned int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); @@ -26,7 +28,7 @@ static void clear_stats(int fd) memset(values, 0, sizeof(values)); for (key = 0; key < SLOTS; key++) - bpf_update_elem(fd, &key, values, BPF_ANY); + bpf_map_update_elem(fd, &key, values, BPF_ANY); } const char *color[] = { @@ -87,7 +89,7 @@ static void print_hist(int fd) int i; for (key = 0; key < SLOTS; key++) { - bpf_lookup_elem(fd, &key, values); + bpf_map_lookup_elem(fd, &key, values); value = 0; for (i = 0; i < nr_cpus; i++) value += values[i]; diff --git a/samples/bpf/tracex4_user.c b/samples/bpf/tracex4_user.c index bc4a3bdea6ed..8b2f98c6c99a 100644 --- a/samples/bpf/tracex4_user.c +++ b/samples/bpf/tracex4_user.c @@ -15,6 +15,8 @@ #include "libbpf.h" #include "bpf_load.h" +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + struct pair { long long val; __u64 ip; @@ -37,8 +39,8 @@ static void print_old_objects(int fd) key = write(1, "\e[1;1H\e[2J", 12); /* clear screen */ key = -1; - while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) { - bpf_lookup_elem(map_fd[0], &next_key, &v); + while (bpf_map_get_next_key(map_fd[0], &key, &next_key) == 0) { + bpf_map_lookup_elem(map_fd[0], &next_key, &v); key = next_key; if (val - v.val < 1000000000ll) /* object was allocated more then 1 sec ago */ diff --git a/samples/bpf/tracex5_user.c b/samples/bpf/tracex5_user.c index 36b5925bb137..035beea6b31c 100644 --- a/samples/bpf/tracex5_user.c +++ b/samples/bpf/tracex5_user.c @@ -8,6 +8,8 @@ #include "bpf_load.h" #include <sys/resource.h> +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + /* install fake seccomp program to enable seccomp code path inside the kernel, * so that our kprobe attached to seccomp_phase1() can be triggered */ diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c index 8ea4976cfcf1..7a3b4a4b19f3 100644 --- a/samples/bpf/tracex6_user.c +++ b/samples/bpf/tracex6_user.c @@ -13,6 +13,8 @@ #define SAMPLE_PERIOD 0x7fffffffffffffffULL +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static void test_bpf_perf_event(void) { int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); @@ -36,7 +38,7 @@ static void test_bpf_perf_event(void) goto exit; } - bpf_update_elem(map_fd[0], &i, &pmu_fd[i], BPF_ANY); + bpf_map_update_elem(map_fd[0], &i, &pmu_fd[i], BPF_ANY); ioctl(pmu_fd[i], PERF_EVENT_IOC_ENABLE, 0); } diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c index a5e109e398a1..7302322f26ff 100644 --- a/samples/bpf/xdp1_user.c +++ b/samples/bpf/xdp1_user.c @@ -18,6 +18,8 @@ #include "bpf_load.h" #include "libbpf.h" +char bpf_log_buf[BPF_LOG_BUF_SIZE]; + static int set_link_xdp_fd(int ifindex, int fd) { struct sockaddr_nl sa; @@ -134,7 +136,7 @@ static void poll_stats(int interval) for (key = 0; key < nr_keys; key++) { __u64 sum = 0; - assert(bpf_lookup_elem(map_fd[0], &key, values) == 0); + assert(bpf_map_lookup_elem(map_fd[0], &key, values) == 0); for (i = 0; i < nr_cpus; i++) sum += (values[i] - prev[key][i]); if (sum) -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer ` (3 preceding siblings ...) 2016-12-09 2:46 ` [PATCHv3 perf/core 4/7] samples/bpf: Make samples more libbpf-centric Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-09 5:04 ` Wangnan (F) 2016-12-09 2:46 ` [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration Joe Stringer ` (2 subsequent siblings) 7 siblings, 1 reply; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev Now that libbpf under tools/lib/bpf/* is synced with the version from samples/bpf, we can get rid most of the libbpf library here. Signed-off-by: Joe Stringer <joe@ovn.org> --- v3: First post. --- samples/bpf/Makefile | 60 +++++++++++++------------- samples/bpf/README.rst | 4 +- samples/bpf/libbpf.c | 111 ------------------------------------------------- samples/bpf/libbpf.h | 19 +-------- tools/lib/bpf/Makefile | 2 + 5 files changed, 38 insertions(+), 158 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 72c58675973e..c8f7ed37b2de 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -29,35 +29,38 @@ hostprogs-y += trace_event hostprogs-y += sampleip hostprogs-y += tc_l2_redirect -test_verifier-objs := test_verifier.o libbpf.o -test_maps-objs := test_maps.o libbpf.o -sock_example-objs := sock_example.o libbpf.o -fds_example-objs := bpf_load.o libbpf.o fds_example.o -sockex1-objs := bpf_load.o libbpf.o sockex1_user.o -sockex2-objs := bpf_load.o libbpf.o sockex2_user.o -sockex3-objs := bpf_load.o libbpf.o sockex3_user.o -tracex1-objs := bpf_load.o libbpf.o tracex1_user.o -tracex2-objs := bpf_load.o libbpf.o tracex2_user.o -tracex3-objs := bpf_load.o libbpf.o tracex3_user.o -tracex4-objs := bpf_load.o libbpf.o tracex4_user.o -tracex5-objs := bpf_load.o libbpf.o tracex5_user.o -tracex6-objs := bpf_load.o libbpf.o tracex6_user.o -test_probe_write_user-objs := bpf_load.o libbpf.o test_probe_write_user_user.o -trace_output-objs := bpf_load.o libbpf.o trace_output_user.o -lathist-objs := bpf_load.o libbpf.o lathist_user.o -offwaketime-objs := bpf_load.o libbpf.o offwaketime_user.o -spintest-objs := bpf_load.o libbpf.o spintest_user.o -map_perf_test-objs := bpf_load.o libbpf.o map_perf_test_user.o -test_overhead-objs := bpf_load.o libbpf.o test_overhead_user.o -test_cgrp2_array_pin-objs := libbpf.o test_cgrp2_array_pin.o -xdp1-objs := bpf_load.o libbpf.o xdp1_user.o +# Libbpf dependencies +LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o + +test_verifier-objs := test_verifier.o $(LIBBPF) +test_maps-objs := test_maps.o $(LIBBPF) +sock_example-objs := sock_example.o $(LIBBPF) +fds_example-objs := bpf_load.o $(LIBBPF) fds_example.o +sockex1-objs := bpf_load.o $(LIBBPF) sockex1_user.o +sockex2-objs := bpf_load.o $(LIBBPF) sockex2_user.o +sockex3-objs := bpf_load.o $(LIBBPF) sockex3_user.o +tracex1-objs := bpf_load.o $(LIBBPF) tracex1_user.o +tracex2-objs := bpf_load.o $(LIBBPF) tracex2_user.o +tracex3-objs := bpf_load.o $(LIBBPF) tracex3_user.o +tracex4-objs := bpf_load.o $(LIBBPF) tracex4_user.o +tracex5-objs := bpf_load.o $(LIBBPF) tracex5_user.o +tracex6-objs := bpf_load.o $(LIBBPF) tracex6_user.o +test_probe_write_user-objs := bpf_load.o $(LIBBPF) test_probe_write_user_user.o +trace_output-objs := bpf_load.o $(LIBBPF) trace_output_user.o +lathist-objs := bpf_load.o $(LIBBPF) lathist_user.o +offwaketime-objs := bpf_load.o $(LIBBPF) offwaketime_user.o +spintest-objs := bpf_load.o $(LIBBPF) spintest_user.o +map_perf_test-objs := bpf_load.o $(LIBBPF) map_perf_test_user.o +test_overhead-objs := bpf_load.o $(LIBBPF) test_overhead_user.o +test_cgrp2_array_pin-objs := $(LIBBPF) test_cgrp2_array_pin.o +xdp1-objs := bpf_load.o $(LIBBPF) xdp1_user.o # reuse xdp1 source intentionally -xdp2-objs := bpf_load.o libbpf.o xdp1_user.o -test_current_task_under_cgroup-objs := bpf_load.o libbpf.o \ +xdp2-objs := bpf_load.o $(LIBBPF) xdp1_user.o +test_current_task_under_cgroup-objs := bpf_load.o $(LIBBPF) \ test_current_task_under_cgroup_user.o -trace_event-objs := bpf_load.o libbpf.o trace_event_user.o -sampleip-objs := bpf_load.o libbpf.o sampleip_user.o -tc_l2_redirect-objs := bpf_load.o libbpf.o tc_l2_redirect_user.o +trace_event-objs := bpf_load.o $(LIBBPF) trace_event_user.o +sampleip-objs := bpf_load.o $(LIBBPF) sampleip_user.o +tc_l2_redirect-objs := bpf_load.o $(LIBBPF) tc_l2_redirect_user.o # Tell kbuild to always build the programs always := $(hostprogs-y) @@ -89,7 +92,7 @@ always += test_current_task_under_cgroup_kern.o always += trace_event_kern.o always += sampleip_kern.o -HOSTCFLAGS += -I$(objtree)/usr/include +HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable HOSTLOADLIBES_fds_example += -lelf @@ -123,6 +126,7 @@ CLANG ?= clang # Trick to allow make to be run from this directory all: + $(MAKE) -C ../../ tools/lib/bpf/ $(MAKE) -C ../../ $$PWD/ clean: diff --git a/samples/bpf/README.rst b/samples/bpf/README.rst index a43eae3f0551..79f9a58f1872 100644 --- a/samples/bpf/README.rst +++ b/samples/bpf/README.rst @@ -1,8 +1,8 @@ eBPF sample programs ==================== -This directory contains a mini eBPF library, test stubs, verifier -test-suite and examples for using eBPF. +This directory contains a test stubs, verifier test-suite and examples +for using eBPF. The examples use libbpf from tools/lib/bpf. Build dependencies ================== diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c index e5c5a69996fc..d9af876b4a2c 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/libbpf.c @@ -4,8 +4,6 @@ #include <linux/unistd.h> #include <unistd.h> #include <string.h> -#include <linux/netlink.h> -#include <linux/bpf.h> #include <errno.h> #include <net/ethernet.h> #include <net/if.h> @@ -13,115 +11,6 @@ #include <arpa/inet.h> #include "libbpf.h" -static __u64 ptr_to_u64(void *ptr) -{ - return (__u64) (unsigned long) ptr; -} - -int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, - int max_entries, int map_flags) -{ - union bpf_attr attr = { - .map_type = map_type, - .key_size = key_size, - .value_size = value_size, - .max_entries = max_entries, - .map_flags = map_flags, - }; - - return syscall(__NR_bpf, BPF_MAP_CREATE, &attr, sizeof(attr)); -} - -int bpf_map_update_elem(int fd, void *key, void *value, unsigned long long flags) -{ - union bpf_attr attr = { - .map_fd = fd, - .key = ptr_to_u64(key), - .value = ptr_to_u64(value), - .flags = flags, - }; - - return syscall(__NR_bpf, BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr)); -} - -int bpf_map_lookup_elem(int fd, void *key, void *value) -{ - union bpf_attr attr = { - .map_fd = fd, - .key = ptr_to_u64(key), - .value = ptr_to_u64(value), - }; - - return syscall(__NR_bpf, BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr)); -} - -int bpf_map_delete_elem(int fd, void *key) -{ - union bpf_attr attr = { - .map_fd = fd, - .key = ptr_to_u64(key), - }; - - return syscall(__NR_bpf, BPF_MAP_DELETE_ELEM, &attr, sizeof(attr)); -} - -int bpf_map_get_next_key(int fd, void *key, void *next_key) -{ - union bpf_attr attr = { - .map_fd = fd, - .key = ptr_to_u64(key), - .next_key = ptr_to_u64(next_key), - }; - - return syscall(__NR_bpf, BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr)); -} - -#define ROUND_UP(x, n) (((x) + (n) - 1u) & ~((n) - 1u)) - -int bpf_load_program(enum bpf_prog_type prog_type, - const struct bpf_insn *insns, int prog_len, - const char *license, int kern_version, - char *log_buf, size_t log_buf_sz) -{ - union bpf_attr attr = { - .prog_type = prog_type, - .insns = ptr_to_u64((void *) insns), - .insn_cnt = prog_len / sizeof(struct bpf_insn), - .license = ptr_to_u64((void *) license), - .log_buf = ptr_to_u64(log_buf), - .log_size = log_buf_sz, - .log_level = 1, - }; - - /* assign one field outside of struct init to make sure any - * padding is zero initialized - */ - attr.kern_version = kern_version; - - log_buf[0] = 0; - - return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); -} - -int bpf_obj_pin(int fd, const char *pathname) -{ - union bpf_attr attr = { - .pathname = ptr_to_u64((void *)pathname), - .bpf_fd = fd, - }; - - return syscall(__NR_bpf, BPF_OBJ_PIN, &attr, sizeof(attr)); -} - -int bpf_obj_get(const char *pathname) -{ - union bpf_attr attr = { - .pathname = ptr_to_u64((void *)pathname), - }; - - return syscall(__NR_bpf, BPF_OBJ_GET, &attr, sizeof(attr)); -} - int open_raw_sock(const char *name) { struct sockaddr_ll sll; diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index 1325152be4cd..cc815624aacf 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -2,24 +2,9 @@ #ifndef __LIBBPF_H #define __LIBBPF_H -struct bpf_insn; - -int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, - int max_entries, int map_flags); -int bpf_map_update_elem(int fd, void *key, void *value, unsigned long long flags); -int bpf_map_lookup_elem(int fd, void *key, void *value); -int bpf_map_delete_elem(int fd, void *key); -int bpf_map_get_next_key(int fd, void *key, void *next_key); - -int bpf_load_program(enum bpf_prog_type prog_type, - const struct bpf_insn *insns, int insn_len, - const char *license, int kern_version, - char *log_buf, size_t log_buf_sz); +#include <bpf/bpf.h> -int bpf_obj_pin(int fd, const char *pathname); -int bpf_obj_get(const char *pathname); - -#define BPF_LOG_BUF_SIZE 65536 +struct bpf_insn; /* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */ diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 62d89d50fcbd..616bd55f3be8 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -149,6 +149,8 @@ CMD_TARGETS = $(LIB_FILE) TARGETS = $(CMD_TARGETS) +libbpf: all + all: fixdep $(VERSION_FILES) all_cmd all_cmd: $(CMD_TARGETS) -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf 2016-12-09 2:46 ` [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf Joe Stringer @ 2016-12-09 5:04 ` Wangnan (F) 2016-12-09 5:18 ` Wangnan (F) 0 siblings, 1 reply; 27+ messages in thread From: Wangnan (F) @ 2016-12-09 5:04 UTC (permalink / raw) To: Joe Stringer, linux-kernel; +Cc: ast, daniel, acme, netdev On 2016/12/9 10:46, Joe Stringer wrote: > Now that libbpf under tools/lib/bpf/* is synced with the version from > samples/bpf, we can get rid most of the libbpf library here. > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > v3: First post. > --- > samples/bpf/Makefile | 60 +++++++++++++------------- > samples/bpf/README.rst | 4 +- > samples/bpf/libbpf.c | 111 ------------------------------------------------- > samples/bpf/libbpf.h | 19 +-------- > tools/lib/bpf/Makefile | 2 + > 5 files changed, 38 insertions(+), 158 deletions(-) > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index 72c58675973e..c8f7ed37b2de 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -29,35 +29,38 @@ hostprogs-y += trace_event > hostprogs-y += sampleip > hostprogs-y += tc_l2_redirect > > -test_verifier-objs := test_verifier.o libbpf.o > -test_maps-objs := test_maps.o libbpf.o > -sock_example-objs := sock_example.o libbpf.o > -fds_example-objs := bpf_load.o libbpf.o fds_example.o > -sockex1-objs := bpf_load.o libbpf.o sockex1_user.o > -sockex2-objs := bpf_load.o libbpf.o sockex2_user.o > -sockex3-objs := bpf_load.o libbpf.o sockex3_user.o > -tracex1-objs := bpf_load.o libbpf.o tracex1_user.o > -tracex2-objs := bpf_load.o libbpf.o tracex2_user.o > -tracex3-objs := bpf_load.o libbpf.o tracex3_user.o > -tracex4-objs := bpf_load.o libbpf.o tracex4_user.o > -tracex5-objs := bpf_load.o libbpf.o tracex5_user.o > -tracex6-objs := bpf_load.o libbpf.o tracex6_user.o > -test_probe_write_user-objs := bpf_load.o libbpf.o test_probe_write_user_user.o > -trace_output-objs := bpf_load.o libbpf.o trace_output_user.o > -lathist-objs := bpf_load.o libbpf.o lathist_user.o > -offwaketime-objs := bpf_load.o libbpf.o offwaketime_user.o > -spintest-objs := bpf_load.o libbpf.o spintest_user.o > -map_perf_test-objs := bpf_load.o libbpf.o map_perf_test_user.o > -test_overhead-objs := bpf_load.o libbpf.o test_overhead_user.o > -test_cgrp2_array_pin-objs := libbpf.o test_cgrp2_array_pin.o > -xdp1-objs := bpf_load.o libbpf.o xdp1_user.o > +# Libbpf dependencies > +LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o > + > +test_verifier-objs := test_verifier.o $(LIBBPF) > +test_maps-objs := test_maps.o $(LIBBPF) > +sock_example-objs := sock_example.o $(LIBBPF) > +fds_example-objs := bpf_load.o $(LIBBPF) fds_example.o > +sockex1-objs := bpf_load.o $(LIBBPF) sockex1_user.o > +sockex2-objs := bpf_load.o $(LIBBPF) sockex2_user.o > +sockex3-objs := bpf_load.o $(LIBBPF) sockex3_user.o > +tracex1-objs := bpf_load.o $(LIBBPF) tracex1_user.o > +tracex2-objs := bpf_load.o $(LIBBPF) tracex2_user.o > +tracex3-objs := bpf_load.o $(LIBBPF) tracex3_user.o > +tracex4-objs := bpf_load.o $(LIBBPF) tracex4_user.o > +tracex5-objs := bpf_load.o $(LIBBPF) tracex5_user.o > +tracex6-objs := bpf_load.o $(LIBBPF) tracex6_user.o > +test_probe_write_user-objs := bpf_load.o $(LIBBPF) test_probe_write_user_user.o > +trace_output-objs := bpf_load.o $(LIBBPF) trace_output_user.o > +lathist-objs := bpf_load.o $(LIBBPF) lathist_user.o > +offwaketime-objs := bpf_load.o $(LIBBPF) offwaketime_user.o > +spintest-objs := bpf_load.o $(LIBBPF) spintest_user.o > +map_perf_test-objs := bpf_load.o $(LIBBPF) map_perf_test_user.o > +test_overhead-objs := bpf_load.o $(LIBBPF) test_overhead_user.o > +test_cgrp2_array_pin-objs := $(LIBBPF) test_cgrp2_array_pin.o > +xdp1-objs := bpf_load.o $(LIBBPF) xdp1_user.o > # reuse xdp1 source intentionally > -xdp2-objs := bpf_load.o libbpf.o xdp1_user.o > -test_current_task_under_cgroup-objs := bpf_load.o libbpf.o \ > +xdp2-objs := bpf_load.o $(LIBBPF) xdp1_user.o > +test_current_task_under_cgroup-objs := bpf_load.o $(LIBBPF) \ > test_current_task_under_cgroup_user.o > -trace_event-objs := bpf_load.o libbpf.o trace_event_user.o > -sampleip-objs := bpf_load.o libbpf.o sampleip_user.o > -tc_l2_redirect-objs := bpf_load.o libbpf.o tc_l2_redirect_user.o > +trace_event-objs := bpf_load.o $(LIBBPF) trace_event_user.o > +sampleip-objs := bpf_load.o $(LIBBPF) sampleip_user.o > +tc_l2_redirect-objs := bpf_load.o $(LIBBPF) tc_l2_redirect_user.o > > # Tell kbuild to always build the programs > always := $(hostprogs-y) > @@ -89,7 +92,7 @@ always += test_current_task_under_cgroup_kern.o > always += trace_event_kern.o > always += sampleip_kern.o > > -HOSTCFLAGS += -I$(objtree)/usr/include > +HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ > Should use srctree like this: +HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/lib/ Or you will see following failure when doing off-tree build: $ mkdir buildkernel $ cd buildkernel $ make -C ../ O=`pwd` menuconfig $ make -j64 $ make samples/bpf/ CHK include/config/kernel.release Using .. as source for kernel GEN ./Makefile CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL ../scripts/checksyscalls.sh HOSTCC samples/bpf/test_verifier.o In file included from ../samples/bpf/test_verifier.c:20:0: ../samples/bpf/libbpf.h:5:21: fatal error: bpf/bpf.h: No such file or directory #include <bpf/bpf.h> ^ compilation terminated. make[3]: *** [samples/bpf/test_verifier.o] Error 1 make[2]: *** [samples/bpf/] Error 2 make[1]: *** [sub-make] Error 2 make: *** [__sub-make] Error 2 > HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable > HOSTLOADLIBES_fds_example += -lelf > @@ -123,6 +126,7 @@ CLANG ?= clang > > # Trick to allow make to be run from this directory > all: > + $(MAKE) -C ../../ tools/lib/bpf/ > $(MAKE) -C ../../ $$PWD/ > > clean: [SNIP] > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index 62d89d50fcbd..616bd55f3be8 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -149,6 +149,8 @@ CMD_TARGETS = $(LIB_FILE) > > TARGETS = $(CMD_TARGETS) > > +libbpf: all > + Why we need this? I tested this patch without it and it seems to work, and this line causes an extra error: $ pwd /home/wn/kernel/tools/lib/bpf $ make libbpf ... gcc -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DHAVE_ELF_GETPHDRNUM_SUPPORT -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked -Wredundant-decls -Wshadow -Wstrict-aliasing=3 -Wstrict-prototypes -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat -Werror -Wall -fPIC -I. -I/home/wn/kernel-hydrogen/tools/include -I/home/wn/kernel-hydrogen/tools/arch/x86/include/uapi -I/home/wn/kernel-hydrogen/tools/include/uapi libbpf.c all -o libbpf gcc: error: all: No such file or directory make: *** [libbpf] Error 1 Thank you. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf 2016-12-09 5:04 ` Wangnan (F) @ 2016-12-09 5:18 ` Wangnan (F) 2016-12-09 17:59 ` Joe Stringer 0 siblings, 1 reply; 27+ messages in thread From: Wangnan (F) @ 2016-12-09 5:18 UTC (permalink / raw) To: Joe Stringer, linux-kernel; +Cc: ast, daniel, acme, netdev On 2016/12/9 13:04, Wangnan (F) wrote: > > > On 2016/12/9 10:46, Joe Stringer wrote: > > [SNIP] > >> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile >> index 62d89d50fcbd..616bd55f3be8 100644 >> --- a/tools/lib/bpf/Makefile >> +++ b/tools/lib/bpf/Makefile >> @@ -149,6 +149,8 @@ CMD_TARGETS = $(LIB_FILE) >> TARGETS = $(CMD_TARGETS) >> +libbpf: all >> + > > Why we need this? I tested this patch without it and it seems to work, > and > this line causes an extra error: > $ pwd > /home/wn/kernel/tools/lib/bpf > $ make libbpf > ... > gcc -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DHAVE_ELF_GETPHDRNUM_SUPPORT > -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security > -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes > -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked > -Wredundant-decls -Wshadow -Wstrict-aliasing=3 -Wstrict-prototypes > -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat > -Werror -Wall -fPIC -I. -I/home/wn/kernel-hydrogen/tools/include > -I/home/wn/kernel-hydrogen/tools/arch/x86/include/uapi > -I/home/wn/kernel-hydrogen/tools/include/uapi libbpf.c all -o libbpf > gcc: error: all: No such file or directory > make: *** [libbpf] Error 1 > > Thank you. It is not 'caused' by your patch. 'make libbpf' fails without your change because it tries to build an executable from libbpf.c, but main() is missing. I think libbpf should never be used as a make target. Your new dependency looks strange. Thank you. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf 2016-12-09 5:18 ` Wangnan (F) @ 2016-12-09 17:59 ` Joe Stringer 0 siblings, 0 replies; 27+ messages in thread From: Joe Stringer @ 2016-12-09 17:59 UTC (permalink / raw) To: Wangnan (F); +Cc: LKML, ast, Daniel Borkmann, Arnaldo Carvalho de Melo, netdev On 8 December 2016 at 21:18, Wangnan (F) <wangnan0@huawei.com> wrote: > > > On 2016/12/9 13:04, Wangnan (F) wrote: >> >> >> >> On 2016/12/9 10:46, Joe Stringer wrote: >> >> [SNIP] >> >>> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile >>> index 62d89d50fcbd..616bd55f3be8 100644 >>> --- a/tools/lib/bpf/Makefile >>> +++ b/tools/lib/bpf/Makefile >>> @@ -149,6 +149,8 @@ CMD_TARGETS = $(LIB_FILE) >>> TARGETS = $(CMD_TARGETS) >>> +libbpf: all >>> + >> >> >> Why we need this? I tested this patch without it and it seems to work, and >> this line causes an extra error: >> $ pwd >> /home/wn/kernel/tools/lib/bpf >> $ make libbpf >> ... >> gcc -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DHAVE_ELF_GETPHDRNUM_SUPPORT >> -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security >> -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes >> -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked >> -Wredundant-decls -Wshadow -Wstrict-aliasing=3 -Wstrict-prototypes >> -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat -Werror >> -Wall -fPIC -I. -I/home/wn/kernel-hydrogen/tools/include >> -I/home/wn/kernel-hydrogen/tools/arch/x86/include/uapi >> -I/home/wn/kernel-hydrogen/tools/include/uapi libbpf.c all -o libbpf >> gcc: error: all: No such file or directory >> make: *** [libbpf] Error 1 >> >> Thank you. > > > It is not 'caused' by your patch. 'make libbpf' fails without > your change because it tries to build an executable from > libbpf.c, but main() is missing. > > I think libbpf should never be used as a make target. Your > new dependency looks strange. Thanks for the feedback, I sent a patch to address this on top of perf/core: https://lkml.org/lkml/2016/12/9/518 ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer ` (4 preceding siblings ...) 2016-12-09 2:46 ` [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-09 14:59 ` Arnaldo Carvalho de Melo 2016-12-20 19:32 ` [tip:perf/urgent] " tip-bot for Joe Stringer 2016-12-09 2:46 ` [PATCHv3 perf/core 7/7] samples/bpf: Move open_raw_sock to separate header Joe Stringer 2016-12-09 15:09 ` [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Arnaldo Carvalho de Melo 7 siblings, 2 replies; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev This declaration was made in samples/bpf/libbpf.c for convenience, but there's already one in tools/perf/perf-sys.h. Reuse that one. Signed-off-by: Joe Stringer <joe@ovn.org> --- v3: First post. --- samples/bpf/Makefile | 3 ++- samples/bpf/bpf_load.c | 3 ++- samples/bpf/libbpf.c | 7 ------- samples/bpf/libbpf.h | 3 --- samples/bpf/sampleip_user.c | 3 ++- samples/bpf/trace_event_user.c | 9 +++++---- samples/bpf/trace_output_user.c | 3 ++- samples/bpf/tracex6_user.c | 3 ++- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index c8f7ed37b2de..0adc47e67e65 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -92,7 +92,8 @@ always += test_current_task_under_cgroup_kern.o always += trace_event_kern.o always += sampleip_kern.o -HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ +HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ \ + -I$(objtree)/tools/include -I$(objtree)/tools/perf HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable HOSTLOADLIBES_fds_example += -lelf diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index f8e3c58a0897..d683bd278171 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -19,6 +19,7 @@ #include <ctype.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define DEBUGFS "/sys/kernel/debug/tracing/" @@ -168,7 +169,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) id = atoi(buf); attr.config = id; - efd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); + efd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); if (efd < 0) { printf("event %d fd %d err %s\n", id, efd, strerror(errno)); return -1; diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c index d9af876b4a2c..bee473a494f1 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/libbpf.c @@ -34,10 +34,3 @@ int open_raw_sock(const char *name) return sock; } - -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, - int group_fd, unsigned long flags) -{ - return syscall(__NR_perf_event_open, attr, pid, cpu, - group_fd, flags); -} diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index cc815624aacf..09aedc320009 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -188,7 +188,4 @@ struct bpf_insn; /* create RAW socket and bind to interface 'name' */ int open_raw_sock(const char *name); -struct perf_event_attr; -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, - int group_fd, unsigned long flags); #endif diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index 09ab620b324c..476a11947180 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -21,6 +21,7 @@ #include <sys/ioctl.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define DEFAULT_FREQ 99 #define DEFAULT_SECS 5 @@ -50,7 +51,7 @@ static int sampling_start(int *pmu_fd, int freq) }; for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(&pe_sample_attr, -1 /* pid */, i, + pmu_fd[i] = sys_perf_event_open(&pe_sample_attr, -1 /* pid */, i, -1 /* group_fd */, 0 /* flags */); if (pmu_fd[i] < 0) { fprintf(stderr, "ERROR: Initializing perf sampling\n"); diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index de8fd0266d78..ccb0cba8324a 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -20,6 +20,7 @@ #include <sys/resource.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define SAMPLE_FREQ 50 @@ -126,9 +127,9 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) /* open perf_event on all cpus */ for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(attr, -1, i, -1, 0); + pmu_fd[i] = sys_perf_event_open(attr, -1, i, -1, 0); if (pmu_fd[i] < 0) { - printf("perf_event_open failed\n"); + printf("sys_perf_event_open failed\n"); goto all_cpu_err; } assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); @@ -147,9 +148,9 @@ static void test_perf_event_task(struct perf_event_attr *attr) int pmu_fd; /* open task bound event */ - pmu_fd = perf_event_open(attr, 0, -1, -1, 0); + pmu_fd = sys_perf_event_open(attr, 0, -1, -1, 0); if (pmu_fd < 0) { - printf("perf_event_open failed\n"); + printf("sys_perf_event_open failed\n"); return; } assert(ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c index 9c38f7aa4515..64e692fd7d51 100644 --- a/samples/bpf/trace_output_user.c +++ b/samples/bpf/trace_output_user.c @@ -21,6 +21,7 @@ #include <signal.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" static int pmu_fd; @@ -160,7 +161,7 @@ static void test_bpf_perf_event(void) }; int key = 0; - pmu_fd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); + pmu_fd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); assert(pmu_fd >= 0); assert(bpf_map_update_elem(map_fd[0], &key, &pmu_fd, BPF_ANY) == 0); diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c index 7a3b4a4b19f3..1681cb7cd713 100644 --- a/samples/bpf/tracex6_user.c +++ b/samples/bpf/tracex6_user.c @@ -10,6 +10,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define SAMPLE_PERIOD 0x7fffffffffffffffULL @@ -32,7 +33,7 @@ static void test_bpf_perf_event(void) }; for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); + pmu_fd[i] = sys_perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); if (pmu_fd[i] < 0) { printf("event syscall failed\n"); goto exit; -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration 2016-12-09 2:46 ` [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration Joe Stringer @ 2016-12-09 14:59 ` Arnaldo Carvalho de Melo 2016-12-20 19:32 ` [tip:perf/urgent] " tip-bot for Joe Stringer 1 sibling, 0 replies; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-09 14:59 UTC (permalink / raw) To: Joe Stringer; +Cc: linux-kernel, wangnan0, ast, daniel, netdev Em Thu, Dec 08, 2016 at 06:46:19PM -0800, Joe Stringer escreveu: > This declaration was made in samples/bpf/libbpf.c for convenience, but > there's already one in tools/perf/perf-sys.h. Reuse that one. > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > v3: First post. > --- > samples/bpf/Makefile | 3 ++- > samples/bpf/bpf_load.c | 3 ++- > samples/bpf/libbpf.c | 7 ------- > samples/bpf/libbpf.h | 3 --- > samples/bpf/sampleip_user.c | 3 ++- > samples/bpf/trace_event_user.c | 9 +++++---- > samples/bpf/trace_output_user.c | 3 ++- > samples/bpf/tracex6_user.c | 3 ++- > 8 files changed, 15 insertions(+), 19 deletions(-) > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index c8f7ed37b2de..0adc47e67e65 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -92,7 +92,8 @@ always += test_current_task_under_cgroup_kern.o > always += trace_event_kern.o > always += sampleip_kern.o > > -HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ > +HOSTCFLAGS += -I$(objtree)/usr/include -I$(objtree)/tools/lib/ \ > + -I$(objtree)/tools/include -I$(objtree)/tools/perf Switching these to $(srctree) as well, to support building it like: make -j4 O=../build/v4.9.0-rc8+ samples/bpf/ > > HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable > HOSTLOADLIBES_fds_example += -lelf > diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c > index f8e3c58a0897..d683bd278171 100644 > --- a/samples/bpf/bpf_load.c > +++ b/samples/bpf/bpf_load.c > @@ -19,6 +19,7 @@ > #include <ctype.h> > #include "libbpf.h" > #include "bpf_load.h" > +#include "perf-sys.h" > > #define DEBUGFS "/sys/kernel/debug/tracing/" > > @@ -168,7 +169,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) > id = atoi(buf); > attr.config = id; > > - efd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); > + efd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); > if (efd < 0) { > printf("event %d fd %d err %s\n", id, efd, strerror(errno)); > return -1; > diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c > index d9af876b4a2c..bee473a494f1 100644 > --- a/samples/bpf/libbpf.c > +++ b/samples/bpf/libbpf.c > @@ -34,10 +34,3 @@ int open_raw_sock(const char *name) > > return sock; > } > - > -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, > - int group_fd, unsigned long flags) > -{ > - return syscall(__NR_perf_event_open, attr, pid, cpu, > - group_fd, flags); > -} > diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h > index cc815624aacf..09aedc320009 100644 > --- a/samples/bpf/libbpf.h > +++ b/samples/bpf/libbpf.h > @@ -188,7 +188,4 @@ struct bpf_insn; > /* create RAW socket and bind to interface 'name' */ > int open_raw_sock(const char *name); > > -struct perf_event_attr; > -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, > - int group_fd, unsigned long flags); > #endif > diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c > index 09ab620b324c..476a11947180 100644 > --- a/samples/bpf/sampleip_user.c > +++ b/samples/bpf/sampleip_user.c > @@ -21,6 +21,7 @@ > #include <sys/ioctl.h> > #include "libbpf.h" > #include "bpf_load.h" > +#include "perf-sys.h" > > #define DEFAULT_FREQ 99 > #define DEFAULT_SECS 5 > @@ -50,7 +51,7 @@ static int sampling_start(int *pmu_fd, int freq) > }; > > for (i = 0; i < nr_cpus; i++) { > - pmu_fd[i] = perf_event_open(&pe_sample_attr, -1 /* pid */, i, > + pmu_fd[i] = sys_perf_event_open(&pe_sample_attr, -1 /* pid */, i, > -1 /* group_fd */, 0 /* flags */); > if (pmu_fd[i] < 0) { > fprintf(stderr, "ERROR: Initializing perf sampling\n"); > diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c > index de8fd0266d78..ccb0cba8324a 100644 > --- a/samples/bpf/trace_event_user.c > +++ b/samples/bpf/trace_event_user.c > @@ -20,6 +20,7 @@ > #include <sys/resource.h> > #include "libbpf.h" > #include "bpf_load.h" > +#include "perf-sys.h" > > #define SAMPLE_FREQ 50 > > @@ -126,9 +127,9 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) > > /* open perf_event on all cpus */ > for (i = 0; i < nr_cpus; i++) { > - pmu_fd[i] = perf_event_open(attr, -1, i, -1, 0); > + pmu_fd[i] = sys_perf_event_open(attr, -1, i, -1, 0); > if (pmu_fd[i] < 0) { > - printf("perf_event_open failed\n"); > + printf("sys_perf_event_open failed\n"); > goto all_cpu_err; > } > assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); > @@ -147,9 +148,9 @@ static void test_perf_event_task(struct perf_event_attr *attr) > int pmu_fd; > > /* open task bound event */ > - pmu_fd = perf_event_open(attr, 0, -1, -1, 0); > + pmu_fd = sys_perf_event_open(attr, 0, -1, -1, 0); > if (pmu_fd < 0) { > - printf("perf_event_open failed\n"); > + printf("sys_perf_event_open failed\n"); > return; > } > assert(ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); > diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c > index 9c38f7aa4515..64e692fd7d51 100644 > --- a/samples/bpf/trace_output_user.c > +++ b/samples/bpf/trace_output_user.c > @@ -21,6 +21,7 @@ > #include <signal.h> > #include "libbpf.h" > #include "bpf_load.h" > +#include "perf-sys.h" > > static int pmu_fd; > > @@ -160,7 +161,7 @@ static void test_bpf_perf_event(void) > }; > int key = 0; > > - pmu_fd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); > + pmu_fd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); > > assert(pmu_fd >= 0); > assert(bpf_map_update_elem(map_fd[0], &key, &pmu_fd, BPF_ANY) == 0); > diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c > index 7a3b4a4b19f3..1681cb7cd713 100644 > --- a/samples/bpf/tracex6_user.c > +++ b/samples/bpf/tracex6_user.c > @@ -10,6 +10,7 @@ > #include <linux/bpf.h> > #include "libbpf.h" > #include "bpf_load.h" > +#include "perf-sys.h" > > #define SAMPLE_PERIOD 0x7fffffffffffffffULL > > @@ -32,7 +33,7 @@ static void test_bpf_perf_event(void) > }; > > for (i = 0; i < nr_cpus; i++) { > - pmu_fd[i] = perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); > + pmu_fd[i] = sys_perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); > if (pmu_fd[i] < 0) { > printf("event syscall failed\n"); > goto exit; > -- > 2.10.2 ^ permalink raw reply [flat|nested] 27+ messages in thread
* [tip:perf/urgent] samples/bpf: Remove perf_event_open() declaration 2016-12-09 2:46 ` [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration Joe Stringer 2016-12-09 14:59 ` Arnaldo Carvalho de Melo @ 2016-12-20 19:32 ` tip-bot for Joe Stringer 1 sibling, 0 replies; 27+ messages in thread From: tip-bot for Joe Stringer @ 2016-12-20 19:32 UTC (permalink / raw) To: linux-tip-commits Cc: tglx, ast, joe, hpa, linux-kernel, wangnan0, mingo, daniel, acme Commit-ID: 205c8ada314f78e6637342089e5b585a051d6cf5 Gitweb: http://git.kernel.org/tip/205c8ada314f78e6637342089e5b585a051d6cf5 Author: Joe Stringer <joe@ovn.org> AuthorDate: Thu, 8 Dec 2016 18:46:19 -0800 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Tue, 20 Dec 2016 12:00:40 -0300 samples/bpf: Remove perf_event_open() declaration This declaration was made in samples/bpf/libbpf.c for convenience, but there's already one in tools/perf/perf-sys.h. Reuse that one. Committer notes: Testing it: $ make -j4 O=../build/v4.9.0-rc8+ samples/bpf/ make[1]: Entering directory '/home/build/v4.9.0-rc8+' CHK include/config/kernel.release GEN ./Makefile CHK include/generated/uapi/linux/version.h Using /home/acme/git/linux as source for kernel CHK include/generated/utsrelease.h CHK include/generated/timeconst.h CHK include/generated/bounds.h CHK include/generated/asm-offsets.h CALL /home/acme/git/linux/scripts/checksyscalls.sh HOSTCC samples/bpf/test_verifier.o HOSTCC samples/bpf/libbpf.o HOSTCC samples/bpf/../../tools/lib/bpf/bpf.o HOSTCC samples/bpf/test_maps.o HOSTCC samples/bpf/sock_example.o HOSTCC samples/bpf/bpf_load.o <SNIP> HOSTLD samples/bpf/trace_event HOSTLD samples/bpf/sampleip HOSTLD samples/bpf/tc_l2_redirect make[1]: Leaving directory '/home/build/v4.9.0-rc8+' $ Also tested the offwaketime resulting from the rebuild, seems to work as before. Signed-off-by: Joe Stringer <joe@ovn.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/20161209024620.31660-7-joe@ovn.org [ Use -I$(srctree)/tools/lib/ to support out of source code tree builds ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- samples/bpf/Makefile | 2 ++ samples/bpf/bpf_load.c | 3 ++- samples/bpf/libbpf.c | 7 ------- samples/bpf/libbpf.h | 3 --- samples/bpf/sampleip_user.c | 3 ++- samples/bpf/trace_event_user.c | 9 +++++---- samples/bpf/trace_output_user.c | 3 ++- samples/bpf/tracex6_user.c | 3 ++- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 81b0ef2..5a73f5a 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -109,6 +109,8 @@ always += xdp_tx_iptunnel_kern.o HOSTCFLAGS += -I$(objtree)/usr/include HOSTCFLAGS += -I$(srctree)/tools/lib/ HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ +HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include +HOSTCFLAGS += -I$(srctree)/tools/perf HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable HOSTLOADLIBES_fds_example += -lelf diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index 1bfb433..396e204 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -23,6 +23,7 @@ #include <ctype.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define DEBUGFS "/sys/kernel/debug/tracing/" @@ -179,7 +180,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) id = atoi(buf); attr.config = id; - efd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); + efd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); if (efd < 0) { printf("event %d fd %d err %s\n", id, efd, strerror(errno)); return -1; diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c index d9af876..bee473a 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/libbpf.c @@ -34,10 +34,3 @@ int open_raw_sock(const char *name) return sock; } - -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, - int group_fd, unsigned long flags) -{ - return syscall(__NR_perf_event_open, attr, pid, cpu, - group_fd, flags); -} diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index cc81562..09aedc3 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -188,7 +188,4 @@ struct bpf_insn; /* create RAW socket and bind to interface 'name' */ int open_raw_sock(const char *name); -struct perf_event_attr; -int perf_event_open(struct perf_event_attr *attr, int pid, int cpu, - int group_fd, unsigned long flags); #endif diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index 5ac5adf..be59d7d 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -21,6 +21,7 @@ #include <sys/ioctl.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define DEFAULT_FREQ 99 #define DEFAULT_SECS 5 @@ -49,7 +50,7 @@ static int sampling_start(int *pmu_fd, int freq) }; for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(&pe_sample_attr, -1 /* pid */, i, + pmu_fd[i] = sys_perf_event_open(&pe_sample_attr, -1 /* pid */, i, -1 /* group_fd */, 0 /* flags */); if (pmu_fd[i] < 0) { fprintf(stderr, "ERROR: Initializing perf sampling\n"); diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index 704fe9f..0c5561d 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -20,6 +20,7 @@ #include <sys/resource.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define SAMPLE_FREQ 50 @@ -125,9 +126,9 @@ static void test_perf_event_all_cpu(struct perf_event_attr *attr) /* open perf_event on all cpus */ for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(attr, -1, i, -1, 0); + pmu_fd[i] = sys_perf_event_open(attr, -1, i, -1, 0); if (pmu_fd[i] < 0) { - printf("perf_event_open failed\n"); + printf("sys_perf_event_open failed\n"); goto all_cpu_err; } assert(ioctl(pmu_fd[i], PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); @@ -146,9 +147,9 @@ static void test_perf_event_task(struct perf_event_attr *attr) int pmu_fd; /* open task bound event */ - pmu_fd = perf_event_open(attr, 0, -1, -1, 0); + pmu_fd = sys_perf_event_open(attr, 0, -1, -1, 0); if (pmu_fd < 0) { - printf("perf_event_open failed\n"); + printf("sys_perf_event_open failed\n"); return; } assert(ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd[0]) == 0); diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c index 1a1da7b..f4fa6af 100644 --- a/samples/bpf/trace_output_user.c +++ b/samples/bpf/trace_output_user.c @@ -21,6 +21,7 @@ #include <signal.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" static int pmu_fd; @@ -159,7 +160,7 @@ static void test_bpf_perf_event(void) }; int key = 0; - pmu_fd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); + pmu_fd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0); assert(pmu_fd >= 0); assert(bpf_map_update_elem(map_fd[0], &key, &pmu_fd, BPF_ANY) == 0); diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c index 179297c..ca7874e 100644 --- a/samples/bpf/tracex6_user.c +++ b/samples/bpf/tracex6_user.c @@ -10,6 +10,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "perf-sys.h" #define SAMPLE_PERIOD 0x7fffffffffffffffULL @@ -30,7 +31,7 @@ static void test_bpf_perf_event(void) }; for (i = 0; i < nr_cpus; i++) { - pmu_fd[i] = perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); + pmu_fd[i] = sys_perf_event_open(&attr_insn_pmu, -1/*pid*/, i/*cpu*/, -1/*group_fd*/, 0); if (pmu_fd[i] < 0) { printf("event syscall failed\n"); goto exit; ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCHv3 perf/core 7/7] samples/bpf: Move open_raw_sock to separate header 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer ` (5 preceding siblings ...) 2016-12-09 2:46 ` [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration Joe Stringer @ 2016-12-09 2:46 ` Joe Stringer 2016-12-20 19:33 ` [tip:perf/urgent] " tip-bot for Joe Stringer 2016-12-09 15:09 ` [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Arnaldo Carvalho de Melo 7 siblings, 1 reply; 27+ messages in thread From: Joe Stringer @ 2016-12-09 2:46 UTC (permalink / raw) To: linux-kernel; +Cc: wangnan0, ast, daniel, acme, netdev This function was declared in libbpf.c and was the only remaining function in this library, but has nothing to do with BPF. Shift it out into a new header, sock_example.h, and include it from the relevant samples. Signed-off-by: Joe Stringer <joe@ovn.org> --- v3: First post. --- samples/bpf/Makefile | 2 +- samples/bpf/fds_example.c | 1 + samples/bpf/libbpf.h | 3 --- samples/bpf/sock_example.c | 1 + samples/bpf/{libbpf.c => sock_example.h} | 3 +-- samples/bpf/sockex1_user.c | 1 + samples/bpf/sockex2_user.c | 1 + samples/bpf/sockex3_user.c | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) rename samples/bpf/{libbpf.c => sock_example.h} (92%) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 0adc47e67e65..7f083faa6e16 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -30,7 +30,7 @@ hostprogs-y += sampleip hostprogs-y += tc_l2_redirect # Libbpf dependencies -LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o +LIBBPF := ../../tools/lib/bpf/bpf.o test_verifier-objs := test_verifier.o $(LIBBPF) test_maps-objs := test_maps.o $(LIBBPF) diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index 4ffd8f340496..7ae3b19f5c42 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -14,6 +14,7 @@ #include "bpf_load.h" #include "libbpf.h" +#include "sock_example.h" #define BPF_F_PIN (1 << 0) #define BPF_F_GET (1 << 1) diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index 09aedc320009..3705fba453a0 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -185,7 +185,4 @@ struct bpf_insn; .off = 0, \ .imm = 0 }) -/* create RAW socket and bind to interface 'name' */ -int open_raw_sock(const char *name); - #endif diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 7ab636c30154..bb418fd0a1f2 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -27,6 +27,7 @@ #include <linux/ip.h> #include <stddef.h> #include "libbpf.h" +#include "sock_example.h" static int test_sock(void) { diff --git a/samples/bpf/libbpf.c b/samples/bpf/sock_example.h similarity index 92% rename from samples/bpf/libbpf.c rename to samples/bpf/sock_example.h index bee473a494f1..09f7fe7e5fd7 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/sock_example.h @@ -1,4 +1,3 @@ -/* eBPF mini library */ #include <stdlib.h> #include <stdio.h> #include <linux/unistd.h> @@ -11,7 +10,7 @@ #include <arpa/inet.h> #include "libbpf.h" -int open_raw_sock(const char *name) +static inline int open_raw_sock(const char *name) { struct sockaddr_ll sll; int sock; diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c index 2956d893d732..5cdddc5c9015 100644 --- a/samples/bpf/sockex1_user.c +++ b/samples/bpf/sockex1_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c index c43958a67cca..7ae4e2e5cf3a 100644 --- a/samples/bpf/sockex2_user.c +++ b/samples/bpf/sockex2_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> #include <sys/resource.h> diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 2cb9011ea440..a100cf6c95bb 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> #include <sys/resource.h> -- 2.10.2 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [tip:perf/urgent] samples/bpf: Move open_raw_sock to separate header 2016-12-09 2:46 ` [PATCHv3 perf/core 7/7] samples/bpf: Move open_raw_sock to separate header Joe Stringer @ 2016-12-20 19:33 ` tip-bot for Joe Stringer 0 siblings, 0 replies; 27+ messages in thread From: tip-bot for Joe Stringer @ 2016-12-20 19:33 UTC (permalink / raw) To: linux-tip-commits Cc: wangnan0, hpa, tglx, joe, acme, linux-kernel, daniel, ast, mingo Commit-ID: 9899694a7f67714216665b87318eb367e2c5c901 Gitweb: http://git.kernel.org/tip/9899694a7f67714216665b87318eb367e2c5c901 Author: Joe Stringer <joe@ovn.org> AuthorDate: Thu, 8 Dec 2016 18:46:20 -0800 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Tue, 20 Dec 2016 12:00:40 -0300 samples/bpf: Move open_raw_sock to separate header This function was declared in libbpf.c and was the only remaining function in this library, but has nothing to do with BPF. Shift it out into a new header, sock_example.h, and include it from the relevant samples. Signed-off-by: Joe Stringer <joe@ovn.org> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/20161209024620.31660-8-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- samples/bpf/Makefile | 2 +- samples/bpf/fds_example.c | 1 + samples/bpf/libbpf.h | 3 --- samples/bpf/sock_example.c | 1 + samples/bpf/{libbpf.c => sock_example.h} | 3 +-- samples/bpf/sockex1_user.c | 1 + samples/bpf/sockex2_user.c | 1 + samples/bpf/sockex3_user.c | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 5a73f5a..f01b66f 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -36,7 +36,7 @@ hostprogs-y += lwt_len_hist hostprogs-y += xdp_tx_iptunnel # Libbpf dependencies -LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o +LIBBPF := ../../tools/lib/bpf/bpf.o test_lru_dist-objs := test_lru_dist.o $(LIBBPF) sock_example-objs := sock_example.o $(LIBBPF) diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index a5cddc9..e29bd52 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -14,6 +14,7 @@ #include "bpf_load.h" #include "libbpf.h" +#include "sock_example.h" #define BPF_F_PIN (1 << 0) #define BPF_F_GET (1 << 1) diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index 09aedc3..3705fba 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -185,7 +185,4 @@ struct bpf_insn; .off = 0, \ .imm = 0 }) -/* create RAW socket and bind to interface 'name' */ -int open_raw_sock(const char *name); - #endif diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 5546f8a..6fc6e19 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -27,6 +27,7 @@ #include <linux/ip.h> #include <stddef.h> #include "libbpf.h" +#include "sock_example.h" char bpf_log_buf[BPF_LOG_BUF_SIZE]; diff --git a/samples/bpf/libbpf.c b/samples/bpf/sock_example.h similarity index 92% rename from samples/bpf/libbpf.c rename to samples/bpf/sock_example.h index bee473a..09f7fe7 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/sock_example.h @@ -1,4 +1,3 @@ -/* eBPF mini library */ #include <stdlib.h> #include <stdio.h> #include <linux/unistd.h> @@ -11,7 +10,7 @@ #include <arpa/inet.h> #include "libbpf.h" -int open_raw_sock(const char *name) +static inline int open_raw_sock(const char *name) { struct sockaddr_ll sll; int sock; diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c index 9454448..6cd2feb 100644 --- a/samples/bpf/sockex1_user.c +++ b/samples/bpf/sockex1_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c index 6a40600..0e0207c 100644 --- a/samples/bpf/sockex2_user.c +++ b/samples/bpf/sockex2_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> #include <sys/resource.h> diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 9099c42..b5524d4 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -3,6 +3,7 @@ #include <linux/bpf.h> #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include <unistd.h> #include <arpa/inet.h> #include <sys/resource.h> ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer ` (6 preceding siblings ...) 2016-12-09 2:46 ` [PATCHv3 perf/core 7/7] samples/bpf: Move open_raw_sock to separate header Joe Stringer @ 2016-12-09 15:09 ` Arnaldo Carvalho de Melo 2016-12-09 15:30 ` Daniel Borkmann 7 siblings, 1 reply; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-09 15:09 UTC (permalink / raw) To: Joe Stringer; +Cc: linux-kernel, netdev, wangnan0, ast, daniel Em Thu, Dec 08, 2016 at 06:46:13PM -0800, Joe Stringer escreveu: > (Was "libbpf: Synchronize implementations") > > Update tools/lib/bpf to provide the remaining bpf wrapper pieces needed by the > samples/bpf/ code, then get rid of all of the duplicate BPF libraries in > samples/bpf/libbpf.[ch]. > > --- > v3: Add ack for first patch. > Split out second patch from v2 into separate changes for remaining diff. > Add patches to switch samples/bpf over to using tools/lib/. > v2: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > Don't shift non-bpf code into libbpf. > Drop the patch to synchronize ELF definitions with tc. > v1: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > First post. Thanks, applied after addressing the -I$(objtree) issue raised by Wang, - Arnaldo ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-09 15:09 ` [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Arnaldo Carvalho de Melo @ 2016-12-09 15:30 ` Daniel Borkmann 2016-12-14 13:25 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 27+ messages in thread From: Daniel Borkmann @ 2016-12-09 15:30 UTC (permalink / raw) To: Arnaldo Carvalho de Melo, Joe Stringer Cc: linux-kernel, netdev, wangnan0, ast Hi Arnaldo, On 12/09/2016 04:09 PM, Arnaldo Carvalho de Melo wrote: > Em Thu, Dec 08, 2016 at 06:46:13PM -0800, Joe Stringer escreveu: >> (Was "libbpf: Synchronize implementations") >> >> Update tools/lib/bpf to provide the remaining bpf wrapper pieces needed by the >> samples/bpf/ code, then get rid of all of the duplicate BPF libraries in >> samples/bpf/libbpf.[ch]. >> >> --- >> v3: Add ack for first patch. >> Split out second patch from v2 into separate changes for remaining diff. >> Add patches to switch samples/bpf over to using tools/lib/. >> v2: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html >> Don't shift non-bpf code into libbpf. >> Drop the patch to synchronize ELF definitions with tc. >> v1: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html >> First post. > > Thanks, applied after addressing the -I$(objtree) issue raised by Wang, [ Sorry for late reply. ] First of all, glad to see us getting rid of the duplicate lib eventually! :) Please note that this might result in hopefully just a minor merge issue with net-next. Looks like patch 4/7 touches test_maps.c and test_verifier.c, which moved to a new bpf selftest suite [1] this net-next cycle. Seems it's just log buffer and some renames there, which can be discarded for both files sitting in selftests. Thanks, Daniel [1] https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/tree/tools/testing/selftests/bpf ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-09 15:30 ` Daniel Borkmann @ 2016-12-14 13:25 ` Arnaldo Carvalho de Melo 2016-12-14 14:55 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-14 13:25 UTC (permalink / raw) To: Daniel Borkmann; +Cc: Joe Stringer, linux-kernel, netdev, wangnan0, ast Em Fri, Dec 09, 2016 at 04:30:54PM +0100, Daniel Borkmann escreveu: > Hi Arnaldo, > > On 12/09/2016 04:09 PM, Arnaldo Carvalho de Melo wrote: > > Em Thu, Dec 08, 2016 at 06:46:13PM -0800, Joe Stringer escreveu: > > > (Was "libbpf: Synchronize implementations") > > > > > > Update tools/lib/bpf to provide the remaining bpf wrapper pieces needed by the > > > samples/bpf/ code, then get rid of all of the duplicate BPF libraries in > > > samples/bpf/libbpf.[ch]. > > > > > > --- > > > v3: Add ack for first patch. > > > Split out second patch from v2 into separate changes for remaining diff. > > > Add patches to switch samples/bpf over to using tools/lib/. > > > v2: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > > > Don't shift non-bpf code into libbpf. > > > Drop the patch to synchronize ELF definitions with tc. > > > v1: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > > > First post. > > > > Thanks, applied after addressing the -I$(objtree) issue raised by Wang, > > [ Sorry for late reply. ] > > First of all, glad to see us getting rid of the duplicate lib eventually! :) > > Please note that this might result in hopefully just a minor merge issue > with net-next. Looks like patch 4/7 touches test_maps.c and test_verifier.c, > which moved to a new bpf selftest suite [1] this net-next cycle. Seems it's > just log buffer and some renames there, which can be discarded for both > files sitting in selftests. Yeah, I've got to this point, and the merge has a little bit more than that, including BPF_PROG_ATTACH/BPF_PROG_DETACH, etc, working on it... - Arnaldo ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-14 13:25 ` Arnaldo Carvalho de Melo @ 2016-12-14 14:55 ` Arnaldo Carvalho de Melo 2016-12-14 22:46 ` Joe Stringer 0 siblings, 1 reply; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-14 14:55 UTC (permalink / raw) To: Daniel Borkmann, Joe Stringer; +Cc: linux-kernel, netdev, wangnan0, ast Em Wed, Dec 14, 2016 at 10:25:01AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Fri, Dec 09, 2016 at 04:30:54PM +0100, Daniel Borkmann escreveu: > > On 12/09/2016 04:09 PM, Arnaldo Carvalho de Melo wrote: > > > > v3: Add ack for first patch. > > > > Split out second patch from v2 into separate changes for remaining diff. > > > > Add patches to switch samples/bpf over to using tools/lib/. > > > > v2: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > > > > Don't shift non-bpf code into libbpf. > > > > Drop the patch to synchronize ELF definitions with tc. > > > > v1: https://www.mail-archive.com/netdev@vger.kernel.org/msg135088.html > > > > First post. > > > Thanks, applied after addressing the -I$(objtree) issue raised by Wang, > > [ Sorry for late reply. ] > > First of all, glad to see us getting rid of the duplicate lib eventually! :) > > > > Please note that this might result in hopefully just a minor merge issue > > with net-next. Looks like patch 4/7 touches test_maps.c and test_verifier.c, > > which moved to a new bpf selftest suite [1] this net-next cycle. Seems it's > > just log buffer and some renames there, which can be discarded for both > > files sitting in selftests. > > Yeah, I've got to this point, and the merge has a little bit more than > that, including BPF_PROG_ATTACH/BPF_PROG_DETACH, etc, working on it... So, Joe, can you try refreshing this work, starting from what I have in perf/core? It has the changes coming from net-next that Daniel warned us about and some more. [acme@jouet linux]$ git log --oneline -5 1f125a4aa4d8 tools lib bpf: Add flags to bpf_create_map() 5adf5614f72d tools lib bpf: use __u32 from linux/types.h ff687c38d803 tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h 53452c69b4c3 perf annotate: Fix jump target outside of function address range 2f41ae602b57 perf annotate: Support jump instruction with target as second operand [acme@jouet linux]$ I tried refreshing it, but it seems samples/bpf/ needs some love and care first, as I can't get it to build before these patches, to make sure nothing gets broken. Trying to bisect it I get to what seems multiple bisect breakages, last tag I got it to build, with lots of warnings, was v4.8, after that I get things like the ones below. I could try fixing it, but may be missing something, and want to push the other stuff in this branch... [acme@jouet linux]$ egrep SAMPLES\|BPF .config CONFIG_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NET_CLS_BPF=m CONFIG_NET_ACT_BPF=m CONFIG_BPF_JIT=y CONFIG_HAVE_EBPF_JIT=y CONFIG_BPF_EVENTS=y # CONFIG_TEST_BPF is not set CONFIG_SAMPLES=y [acme@jouet linux]$ [acme@jouet linux]$ make -C samples/bpf make: Entering directory '/home/acme/git/linux/samples/bpf' make -C ../../ $PWD/ make[1]: Entering directory '/home/acme/git/linux' CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/timeconst.h CHK include/generated/bounds.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh HOSTCC /home/acme/git/linux/samples/bpf/bpf_load.o In file included from /home/acme/git/linux/samples/bpf/bpf_load.c:21:0: /home/acme/git/linux/samples/bpf/bpf_helpers.h:76:11: error: ‘BPF_FUNC_skb_in_cgroup’ undeclared here (not in a function) (void *) BPF_FUNC_skb_in_cgroup; ^~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.host:124: recipe for target '/home/acme/git/linux/samples/bpf/bpf_load.o' failed make[2]: *** [/home/acme/git/linux/samples/bpf/bpf_load.o] Error 1 Makefile:1646: recipe for target '/home/acme/git/linux/samples/bpf/' failed [acme@jouet linux]$ make -C samples/bpf make: Entering directory '/home/acme/git/linux/samples/bpf' make -C ../../ $PWD/ make[1]: Entering directory '/home/acme/git/linux' scripts/kconfig/conf --silentoldconfig Kconfig # # configuration written to .config # SYSTBL arch/x86/entry/syscalls/../../include/generated/asm/syscalls_32.h SYSHDR arch/x86/entry/syscalls/../../include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_32.h CHK include/config/kernel.release UPD include/config/kernel.release CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h CHK include/generated/timeconst.h CC kernel/bounds.s CHK include/generated/bounds.h GEN scripts/gdb/linux/constants.py CC arch/x86/kernel/asm-offsets.s CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh HOSTCC /home/acme/git/linux/samples/bpf/bpf_load.o In file included from /home/acme/git/linux/samples/bpf/bpf_load.c:21:0: /home/acme/git/linux/samples/bpf/bpf_helpers.h:49:11: error: ‘BPF_FUNC_current_task_under_cgroup’ undeclared here (not in a function) (void *) BPF_FUNC_current_task_under_cgroup; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/acme/git/linux/samples/bpf/bpf_helpers.h:80:11: error: ‘BPF_FUNC_skb_in_cgroup’ undeclared here (not in a function) (void *) BPF_FUNC_skb_in_cgroup; ^~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.host:124: recipe for target '/home/acme/git/linux/samples/bpf/bpf_load.o' failed ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-14 14:55 ` Arnaldo Carvalho de Melo @ 2016-12-14 22:46 ` Joe Stringer 2016-12-15 14:33 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 27+ messages in thread From: Joe Stringer @ 2016-12-14 22:46 UTC (permalink / raw) To: Arnaldo Carvalho de Melo; +Cc: Daniel Borkmann, LKML, netdev, Wang Nan, ast On 14 December 2016 at 06:55, Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > Em Wed, Dec 14, 2016 at 10:25:01AM -0300, Arnaldo Carvalho de Melo escreveu: >> Em Fri, Dec 09, 2016 at 04:30:54PM +0100, Daniel Borkmann escreveu: >> > On 12/09/2016 04:09 PM, Arnaldo Carvalho de Melo wrote: >> > Please note that this might result in hopefully just a minor merge issue >> > with net-next. Looks like patch 4/7 touches test_maps.c and test_verifier.c, >> > which moved to a new bpf selftest suite [1] this net-next cycle. Seems it's >> > just log buffer and some renames there, which can be discarded for both >> > files sitting in selftests. >> >> Yeah, I've got to this point, and the merge has a little bit more than >> that, including BPF_PROG_ATTACH/BPF_PROG_DETACH, etc, working on it... > > So, Joe, can you try refreshing this work, starting from what I have in > perf/core? It has the changes coming from net-next that Daniel warned us about > and some more. Hi Arnaldo, I've just respun this series based on the version you previously applied to perf/core. Since bpf_prog_{attach,detach}() were added to samples/libbpf, a new patch will shift these over to tools/lib/bpf. Other than that, I folded "samples/bpf: Drop unnecessary build targets." back into "samples/bpf: Switch over to libbpf", and I noticed that there were a couple of unnecessary log buffers with the latest changes. For any new sample programs, those were fixed up to use libbpf as well. Don't forget to do a "make headers_install" before attempting to build the samples, access to the latest headers is required (as per the readme in samples/bpf). Thanks, Joe ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-14 22:46 ` Joe Stringer @ 2016-12-15 14:33 ` Arnaldo Carvalho de Melo 2016-12-15 15:35 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-15 14:33 UTC (permalink / raw) To: Joe Stringer; +Cc: Daniel Borkmann, LKML, netdev, Wang Nan, ast Em Wed, Dec 14, 2016 at 02:46:23PM -0800, Joe Stringer escreveu: > On 14 December 2016 at 06:55, Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > So, Joe, can you try refreshing this work, starting from what I have in > > perf/core? It has the changes coming from net-next that Daniel warned us about > > and some more. > I've just respun this series based on the version you previously > applied to perf/core. Since bpf_prog_{attach,detach}() were added to > samples/libbpf, a new patch will shift these over to tools/lib/bpf. > Other than that, I folded "samples/bpf: Drop unnecessary build > targets." back into "samples/bpf: Switch over to libbpf", and I > noticed that there were a couple of unnecessary log buffers with the > latest changes. For any new sample programs, those were fixed up to > use libbpf as well. > Don't forget to do a "make headers_install" before attempting to build > the samples, access to the latest headers is required (as per the > readme in samples/bpf). Ah, README, I should read that ;-) I got used to how tools/perf/ work, i.e. it is self sufficient wrt in-flux stuff in the kernel, i.e. headers that are related to features it supports and that are under constant improvements, such as eBPF, kvm, syscall tables, etc. Anyway, will do the headers_install step inside a container, to avoid polluting my workstation. Thanks for doing the respin and for the clarifications about building samples/bpf/. - Arnaldo ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf 2016-12-15 14:33 ` Arnaldo Carvalho de Melo @ 2016-12-15 15:35 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 27+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-12-15 15:35 UTC (permalink / raw) To: Joe Stringer; +Cc: Daniel Borkmann, LKML, netdev, Wang Nan, ast Em Thu, Dec 15, 2016 at 11:33:29AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Wed, Dec 14, 2016 at 02:46:23PM -0800, Joe Stringer escreveu: > > On 14 December 2016 at 06:55, Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > > So, Joe, can you try refreshing this work, starting from what I have in > > > perf/core? It has the changes coming from net-next that Daniel warned us about > > > and some more. > > > I've just respun this series based on the version you previously > > applied to perf/core. Since bpf_prog_{attach,detach}() were added to > > samples/libbpf, a new patch will shift these over to tools/lib/bpf. > > Other than that, I folded "samples/bpf: Drop unnecessary build > > targets." back into "samples/bpf: Switch over to libbpf", and I > > noticed that there were a couple of unnecessary log buffers with the > > latest changes. For any new sample programs, those were fixed up to > > use libbpf as well. > > > Don't forget to do a "make headers_install" before attempting to build > > the samples, access to the latest headers is required (as per the > > readme in samples/bpf). > > Ah, README, I should read that ;-) > > I got used to how tools/perf/ work, i.e. it is self sufficient wrt > in-flux stuff in the kernel, i.e. headers that are related to features > it supports and that are under constant improvements, such as eBPF, kvm, > syscall tables, etc. > > Anyway, will do the headers_install step inside a container, to avoid > polluting my workstation. heh: should've read that file, now I did: <quote> There are usually dependencies to header files of the current kernel. To avoid installing devel kernel headers system wide, as a normal user, simply call:: make headers_install This will creates a local "usr/include" directory in the git/build top level directory, that the make system automatically pickup first. </quote> > Thanks for doing the respin and for the clarifications about building > samples/bpf/. > > - Arnaldo ^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2016-12-20 19:34 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-09 2:46 [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 1/7] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Joe Stringer
2016-12-20 19:26 ` [tip:perf/urgent] " tip-bot for Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h Joe Stringer
2016-12-09 3:28 ` Wangnan (F)
2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 3/7] tools lib bpf: Add flags to bpf_create_map() Joe Stringer
2016-12-09 3:36 ` Wangnan (F)
2016-12-09 14:27 ` Arnaldo Carvalho de Melo
2016-12-20 19:27 ` [tip:perf/urgent] " tip-bot for Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 4/7] samples/bpf: Make samples more libbpf-centric Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 5/7] samples/bpf: Switch over to libbpf Joe Stringer
2016-12-09 5:04 ` Wangnan (F)
2016-12-09 5:18 ` Wangnan (F)
2016-12-09 17:59 ` Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 6/7] samples/bpf: Remove perf_event_open() declaration Joe Stringer
2016-12-09 14:59 ` Arnaldo Carvalho de Melo
2016-12-20 19:32 ` [tip:perf/urgent] " tip-bot for Joe Stringer
2016-12-09 2:46 ` [PATCHv3 perf/core 7/7] samples/bpf: Move open_raw_sock to separate header Joe Stringer
2016-12-20 19:33 ` [tip:perf/urgent] " tip-bot for Joe Stringer
2016-12-09 15:09 ` [PATCHv3 perf/core 0/7] Reuse libbpf from samples/bpf Arnaldo Carvalho de Melo
2016-12-09 15:30 ` Daniel Borkmann
2016-12-14 13:25 ` Arnaldo Carvalho de Melo
2016-12-14 14:55 ` Arnaldo Carvalho de Melo
2016-12-14 22:46 ` Joe Stringer
2016-12-15 14:33 ` Arnaldo Carvalho de Melo
2016-12-15 15:35 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.