Commit 17d95e42 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'libbpf-versioning-doc' 



Andrey Ignatov says:

====================
This patch set adds ABI versioning and documentation to libbpf.

Patch 1 renames btf_get_from_id to btf__get_from_id to follow naming
convention.
Patch 2 adds version script and has more details on ABI versioning.
Patch 3 adds simple check that all global symbols are versioned.
Patch 4 documents a few aspects of libbpf API and ABI in dev process.

v1->v2:
* add patch from Martin KaFai Lau <kafai@fb.com> to rename btf_get_from_id;
* add documentation for libbpf API and ABI.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents b89c2998 76d1b894

tools/bpf/bpftool/map.c

+2 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int do_dump(int argc, char **argv) 


	prev_key = NULL;



	err = btf_get_from_id(info.btf_id, &btf);

	err = btf__get_from_id(info.btf_id, &btf);

	if (err) {

		p_err("failed to get btf");

		goto exit_free;
@@ -857,7 +857,7 @@ static int do_lookup(int argc, char **argv) 
	}



	/* here means bpf_map_lookup_elem() succeeded */

	err = btf_get_from_id(info.btf_id, &btf);

	err = btf__get_from_id(info.btf_id, &btf);

	if (err) {

		p_err("failed to get btf");

		goto exit_free;

tools/bpf/bpftool/prog.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv) 
		goto err_free;

	}



	if (info.btf_id && btf_get_from_id(info.btf_id, &btf)) {

	if (info.btf_id && btf__get_from_id(info.btf_id, &btf)) {

		p_err("failed to get btf");

		goto err_free;

	}

tools/lib/bpf/Makefile

+21 −2
Original line number Diff line number Diff line
@@ -145,6 +145,12 @@ include $(srctree)/tools/build/Makefile.include 


BPF_IN    := $(OUTPUT)libbpf-in.o

LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE))

VERSION_SCRIPT := libbpf.map



GLOBAL_SYM_COUNT = $(shell readelf -s $(BPF_IN) | \

			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {s++} END{print s}')

VERSIONED_SYM_COUNT = $(shell readelf -s $(OUTPUT)libbpf.so | \

			      grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)



CMD_TARGETS = $(LIB_FILE)
@@ -158,7 +164,7 @@ TARGETS = $(CMD_TARGETS) 


all: fixdep all_cmd



all_cmd: $(CMD_TARGETS)

all_cmd: $(CMD_TARGETS) check



$(BPF_IN): force elfdep bpfdep

	@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
@@ -176,7 +182,8 @@ $(BPF_IN): force elfdep bpfdep 
	$(Q)$(MAKE) $(build)=libbpf



$(OUTPUT)libbpf.so: $(BPF_IN)

	$(QUIET_LINK)$(CC) --shared $^ -o $@

	$(QUIET_LINK)$(CC) --shared -Wl,--version-script=$(VERSION_SCRIPT) \

		$^ -o $@



$(OUTPUT)libbpf.a: $(BPF_IN)

	$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
@@ -184,6 +191,18 @@ $(OUTPUT)libbpf.a: $(BPF_IN) 
$(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a

	$(QUIET_LINK)$(CXX) $^ -lelf -o $@



check: check_abi



check_abi: $(OUTPUT)libbpf.so

	@if [ "$(GLOBAL_SYM_COUNT)" != "$(VERSIONED_SYM_COUNT)" ]; then	 \

		echo "Warning: Num of global symbols in $(BPF_IN)"	 \

		     "($(GLOBAL_SYM_COUNT)) does NOT match with num of"	 \

		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \

		     "Please make sure all LIBBPF_API symbols are"	 \

		     "versioned in $(VERSION_SCRIPT)." >&2;		 \

		exit 1;							 \

	fi



define do_install

	if [ ! -d '$(DESTDIR_SQ)$2' ]; then		\

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2';	\

tools/lib/bpf/README.rst

0 → 100644
+139 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



libbpf API naming convention

============================



libbpf API provides access to a few logically separated groups of

functions and types. Every group has its own naming convention

described here. It's recommended to follow these conventions whenever a

new function or type is added to keep libbpf API clean and consistent.



All types and functions provided by libbpf API should have one of the

following prefixes: ``bpf_``, ``btf_``, ``libbpf_``.



System call wrappers

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



System call wrappers are simple wrappers for commands supported by

sys_bpf system call. These wrappers should go to ``bpf.h`` header file

and map one-on-one to corresponding commands.



For example ``bpf_map_lookup_elem`` wraps ``BPF_MAP_LOOKUP_ELEM``

command of sys_bpf, ``bpf_prog_attach`` wraps ``BPF_PROG_ATTACH``, etc.



Objects

-------



Another class of types and functions provided by libbpf API is "objects"

and functions to work with them. Objects are high-level abstractions

such as BPF program or BPF map. They're represented by corresponding

structures such as ``struct bpf_object``, ``struct bpf_program``,

``struct bpf_map``, etc.



Structures are forward declared and access to their fields should be

provided via corresponding getters and setters rather than directly.



These objects are associated with corresponding parts of ELF object that

contains compiled BPF programs.



For example ``struct bpf_object`` represents ELF object itself created

from an ELF file or from a buffer, ``struct bpf_program`` represents a

program in ELF object and ``struct bpf_map`` is a map.



Functions that work with an object have names built from object name,

double underscore and part that describes function purpose.



For example ``bpf_object__open`` consists of the name of corresponding

object, ``bpf_object``, double underscore and ``open`` that defines the

purpose of the function to open ELF file and create ``bpf_object`` from

it.



Another example: ``bpf_program__load`` is named for corresponding

object, ``bpf_program``, that is separated from other part of the name

by double underscore.



All objects and corresponding functions other than BTF related should go

to ``libbpf.h``. BTF types and functions should go to ``btf.h``.



Auxiliary functions

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



Auxiliary functions and types that don't fit well in any of categories

described above should have ``libbpf_`` prefix, e.g.

``libbpf_get_error`` or ``libbpf_prog_type_by_name``.



libbpf ABI

==========



libbpf can be both linked statically or used as DSO. To avoid possible

conflicts with other libraries an application is linked with, all

non-static libbpf symbols should have one of the prefixes mentioned in

API documentation above. See API naming convention to choose the right

name for a new symbol.



Symbol visibility

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



libbpf follow the model when all global symbols have visibility "hidden"

by default and to make a symbol visible it has to be explicitly

attributed with ``LIBBPF_API`` macro. For example:



.. code-block:: c



        LIBBPF_API int bpf_prog_get_fd_by_id(__u32 id);



This prevents from accidentally exporting a symbol, that is not supposed

to be a part of ABI what, in turn, improves both libbpf developer- and

user-experiences.



ABI versionning

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



To make future ABI extensions possible libbpf ABI is versioned.

Versioning is implemented by ``libbpf.map`` version script that is

passed to linker.



Version name is ``LIBBPF_`` prefix + three-component numeric version,

starting from ``0.0.1``.



Every time ABI is being changed, e.g. because a new symbol is added or

semantic of existing symbol is changed, ABI version should be bumped.



For example, if current state of ``libbpf.map`` is:



.. code-block::

        LIBBPF_0.0.1 {

        	global:

                        bpf_func_a;

                        bpf_func_b;

        	local:

        		\*;

        };



, and a new symbol ``bpf_func_c`` is being introduced, then

``libbpf.map`` should be changed like this:



.. code-block::

        LIBBPF_0.0.1 {

        	global:

                        bpf_func_a;

                        bpf_func_b;

        	local:

        		\*;

        };

        LIBBPF_0.0.2 {

                global:

                        bpf_func_c;

        } LIBBPF_0.0.1;



, where new version ``LIBBPF_0.0.2`` depends on the previous

``LIBBPF_0.0.1``.



Format of version script and ways to handle ABI changes, including

incompatible ones, described in details in [1].



Links

=====



[1] https://www.akkadia.org/drepper/dsohowto.pdf

    (Chapter 3. Maintaining APIs and ABIs).

tools/lib/bpf/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset) 
		return NULL;

}



int btf_get_from_id(__u32 id, struct btf **btf)

int btf__get_from_id(__u32 id, struct btf **btf)

{

	struct bpf_btf_info btf_info = { 0 };

	__u32 len = sizeof(btf_info);

CRA Git | Maintained and supported by SUSTech CRA and CCSE