提交 1414e03a 编写于 作者: A Andrii Nakryiko 提交者: Zheng Zengkai

libbpf: Move few APIs from 0.4 to 0.5 version

mainline inclusion
from mainline-5.14-rc1
commit 16cac006
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=16cac0060680c11bb82c325c4fe95cb66fc8dfaf

-------------------------------------------------

Official libbpf 0.4 release doesn't include three APIs that were tentatively
put into 0.4 section. Fix libbpf.map and move these three APIs:

  - bpf_map__initial_value;
  - bpf_map_lookup_and_delete_elem_flags;
  - bpf_object__gen_loader.
Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210603004026.2698513-2-andrii@kernel.org
(cherry picked from commit 16cac006)
Signed-off-by: NWang Yufen <wangyufen@huawei.com>

Conflicts:
	tools/lib/bpf/libbpf.map
Signed-off-by: NWang Yufen <wangyufen@huawei.com>
上级 78c8ce6c
...@@ -359,9 +359,7 @@ LIBBPF_0.4.0 { ...@@ -359,9 +359,7 @@ LIBBPF_0.4.0 {
bpf_linker__finalize; bpf_linker__finalize;
bpf_linker__free; bpf_linker__free;
bpf_linker__new; bpf_linker__new;
bpf_map__initial_value;
bpf_map__inner_map; bpf_map__inner_map;
bpf_object__gen_loader;
bpf_object__set_kversion; bpf_object__set_kversion;
bpf_tc_attach; bpf_tc_attach;
bpf_tc_detach; bpf_tc_detach;
...@@ -372,5 +370,8 @@ LIBBPF_0.4.0 { ...@@ -372,5 +370,8 @@ LIBBPF_0.4.0 {
LIBBPF_0.5.0 { LIBBPF_0.5.0 {
global: global:
bpf_map__initial_value;
bpf_map_lookup_and_delete_elem_flags;
bpf_object__gen_loader;
libbpf_set_strict_mode; libbpf_set_strict_mode;
} LIBBPF_0.4.0; } LIBBPF_0.4.0;
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册