Skip to contentSkip to conversation

Start libbpf 1.0 dev cycle

PATCH Applied Andrii Nakryiko 3 participants 6 messages May 18, 2022 – May 19, 2022

Subsystems (2)
lore
Share & tools
lore

Andrii Nakryiko

author maintainer
#0 lore raw

cover Start libbpf 1.0 dev cycle

Start preparations for libbpf 1.0 release and as a first test remove bpf_create_map*() APIs.

Andrii Nakryiko (3):
libbpf: fix up global symbol counting logic
libbpf: start 1.0 development cycle
libbpf: remove bpf_create_map*() APIs

 tools/lib/bpf/Makefile         |  2 +-
 tools/lib/bpf/bpf.c            | 80 ----------------------------------
 tools/lib/bpf/bpf.h            | 42 ------------------
 tools/lib/bpf/libbpf.map       |  4 ++
 tools/lib/bpf/libbpf_version.h |  4 +-
 5 files changed, 7 insertions(+), 125 deletions(-)
Signature · 1 line
2.30.2
author maintainer
#1 lore raw

PATCH 1/3 libbpf: fix up global symbol counting logic

Add the same negative ABS filter that we use in VERSIONED_SYM_COUNT to filter out ABS symbols like LIBBPF_0.8.0.

---
 tools/lib/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/Makefile +1 -1
index 64741c55b8e3..a1265b152027 100644
@@ -127,7 +127,7 @@ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
 GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
 			   sed 's/\[.*\]//' | \
-			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
+			   awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \
 			   sort -u | wc -l)
 VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \
 			      sed 's/\[.*\]//' | \
Signature · 1 line
2.30.2
author maintainer
#2 lore raw

PATCH 2/3 libbpf: start 1.0 development cycle

In reply to Andrii Nakryiko

Start libbpf 1.0 development cycle by adding LIBBPF_1.0.0 section to libbpf.map file and marking all current symbols as local. As we remove all the deprecated APIs we'll populate global list before the final 1.0 release.

---
 tools/lib/bpf/libbpf.map       | 4 ++++
 tools/lib/bpf/libbpf_version.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.map +4 -0
index 6b36f46ab5d8..52973cffc20c 100644
@@ -459,3 +459,7 @@ LIBBPF_0.8.0 {
 		libbpf_register_prog_handler;
 		libbpf_unregister_prog_handler;
 } LIBBPF_0.7.0;
+
+LIBBPF_1.0.0 {
+	local: *;
+};
tools/lib/bpf/libbpf_version.h +2 -2
index 61f2039404b6..2fb2f4290080 100644
@@ -3,7 +3,7 @@
 #ifndef __LIBBPF_VERSION_H
 #define __LIBBPF_VERSION_H
 
-#define LIBBPF_MAJOR_VERSION 0
-#define LIBBPF_MINOR_VERSION 8
+#define LIBBPF_MAJOR_VERSION 1
+#define LIBBPF_MINOR_VERSION 0
 
 #endif /* __LIBBPF_VERSION_H */
Signature · 1 line
2.30.2
author maintainer
#3 lore raw

PATCH 3/3 libbpf: remove bpf_create_map*() APIs

In reply to Andrii Nakryiko

To test API removal, get rid of bpf_create_map*() APIs. Perf defines __weak implementation of bpf_map_create() that redirects to old bpf_create_map() and that seems to compile and run fine.

Cc Jiri Olsa <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
---
 tools/lib/bpf/bpf.c | 80 ---------------------------------------------
 tools/lib/bpf/bpf.h | 42 ------------------------
 2 files changed, 122 deletions(-)
tools/lib/bpf/bpf.c +0 -80
index 4677644d80f4..240186aac8e6 100644
@@ -208,86 +208,6 @@ int bpf_map_create(enum bpf_map_type map_type,
 	return libbpf_err_errno(fd);
 }
 
-int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, p);
-
-	p.map_flags = create_attr->map_flags;
-	p.numa_node = create_attr->numa_node;
-	p.btf_fd = create_attr->btf_fd;
-	p.btf_key_type_id = create_attr->btf_key_type_id;
-	p.btf_value_type_id = create_attr->btf_value_type_id;
-	p.map_ifindex = create_attr->map_ifindex;
-	if (create_attr->map_type == BPF_MAP_TYPE_STRUCT_OPS)
-		p.btf_vmlinux_value_type_id = create_attr->btf_vmlinux_value_type_id;
-	else
-		p.inner_map_fd = create_attr->inner_map_fd;
-
-	return bpf_map_create(create_attr->map_type, create_attr->name,
-			      create_attr->key_size, create_attr->value_size,
-			      create_attr->max_entries, &p);
-}
-
-int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
-			int key_size, int value_size, int max_entries,
-			__u32 map_flags, int node)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts);
-
-	opts.map_flags = map_flags;
-	if (node >= 0) {
-		opts.numa_node = node;
-		opts.map_flags |= BPF_F_NUMA_NODE;
-	}
-
-	return bpf_map_create(map_type, name, key_size, value_size, max_entries, &opts);
-}
-
-int bpf_create_map(enum bpf_map_type map_type, int key_size,
-		   int value_size, int max_entries, __u32 map_flags)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts, .map_flags = map_flags);
-
-	return bpf_map_create(map_type, NULL, key_size, value_size, max_entries, &opts);
-}
-
-int bpf_create_map_name(enum bpf_map_type map_type, const char *name,
-			int key_size, int value_size, int max_entries,
-			__u32 map_flags)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts, .map_flags = map_flags);
-
-	return bpf_map_create(map_type, name, key_size, value_size, max_entries, &opts);
-}
-
-int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name,
-			       int key_size, int inner_map_fd, int max_entries,
-			       __u32 map_flags, int node)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts);
-
-	opts.inner_map_fd = inner_map_fd;
-	opts.map_flags = map_flags;
-	if (node >= 0) {
-		opts.map_flags |= BPF_F_NUMA_NODE;
-		opts.numa_node = node;
-	}
-
-	return bpf_map_create(map_type, name, key_size, 4, max_entries, &opts);
-}
-
-int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,
-			  int key_size, int inner_map_fd, int max_entries,
-			  __u32 map_flags)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts,
-		.inner_map_fd = inner_map_fd,
-		.map_flags = map_flags,
-	);
-
-	return bpf_map_create(map_type, name, key_size, 4, max_entries, &opts);
-}
-
 static void *
 alloc_zero_tailing_info(const void *orecord, __u32 cnt,
 			__u32 actual_rec_size, __u32 expected_rec_size)
tools/lib/bpf/bpf.h +0 -42

48 lines not on this page · raw message

Signature · 1 line
2.30.2
Acked-by on the v1 series
#4 lore raw
In reply to Andrii Nakryiko
Quoted 8 lines · Andrii Nakryiko

Start preparations for libbpf 1.0 release and as a first test remove bpf_create_map*() APIs.

Andrii Nakryiko (3):
libbpf: fix up global symbol counting logic
libbpf: start 1.0 development cycle
libbpf: remove bpf_create_map*() APIs

Quoted 7 lines
  tools/lib/bpf/Makefile         |  2 +-
  tools/lib/bpf/bpf.c            | 80 ----------------------------------
  tools/lib/bpf/bpf.h            | 42 ------------------
  tools/lib/bpf/libbpf.map       |  4 ++
  tools/lib/bpf/libbpf_version.h |  4 +-
  5 files changed, 7 insertions(+), 125 deletions(-)

Ack for the whole series.

#5 lore raw
In reply to Andrii Nakryiko
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 9 lines · On Wed, 18 May 2022 11:59:12 -0700 you wrote:

Start preparations for libbpf 1.0 release and as a first test remove bpf_create_map*() APIs.

Andrii Nakryiko (3):
libbpf: fix up global symbol counting logic
libbpf: start 1.0 development cycle
libbpf: remove bpf_create_map*() APIs

[...]

Here is the summary with links:
- [bpf-next,1/3] libbpf: fix up global symbol counting logic

    https://git.kernel.org/bpf/bpf-next/c/056431ae4d79
  - [bpf-next,2/3] libbpf: start 1.0 development cycle
    https://git.kernel.org/bpf/bpf-next/c/e2371b1632b1
  - [bpf-next,3/3] libbpf: remove bpf_create_map*() APIs
    https://git.kernel.org/bpf/bpf-next/c/d16495a98232

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html