Commit b7b98f86 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 

Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-11-01

We've added 181 non-merge commits during the last 28 day(s) which contain
a total of 280 files changed, 11791 insertions(+), 5879 deletions(-).

The main changes are:

1) Fix bpf verifier propagation of 64-bit bounds, from Alexei.

2) Parallelize bpf test_progs, from Yucong and Andrii.

3) Deprecate various libbpf apis including af_xdp, from Andrii, Hengqi, Magnus.

4) Improve bpf selftests on s390, from Ilya.

5) bloomfilter bpf map type, from Joanne.

6) Big improvements to JIT tests especially on Mips, from Johan.

7) Support kernel module function calls from bpf, from Kumar.

8) Support typeless and weak ksym in light skeleton, from Kumar.

9) Disallow unprivileged bpf by default, from Pawan.

10) BTF_KIND_DECL_TAG support, from Yonghong.

11) Various bpftool cleanups, from Quentin.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (181 commits)
  libbpf: Deprecate AF_XDP support
  kbuild: Unify options for BTF generation for vmlinux and modules
  selftests/bpf: Add a testcase for 64-bit bounds propagation issue.
  bpf: Fix propagation of signed bounds from 64-bit min/max into 32-bit.
  bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.
  selftests/bpf: Fix also no-alu32 strobemeta selftest
  bpf: Add missing map_delete_elem method to bloom filter map
  selftests/bpf: Add bloom map success test for userspace calls
  bpf: Add alignment padding for "map_extra" + consolidate holes
  bpf: Bloom filter map naming fixups
  selftests/bpf: Add test cases for struct_ops prog
  bpf: Add dummy BPF STRUCT_OPS for test purpose
  bpf: Factor out helpers for ctx access checking
  bpf: Factor out a helper to prepare trampoline for struct_ops prog
  selftests, bpf: Fix broken riscv build
  riscv, libbpf: Add RISC-V (RV64) support to bpf_tracing.h
  tools, build: Add RISC-V to HOSTARCH parsing
  riscv, bpf: Increase the maximum number of iterations
  selftests, bpf: Add one test for sockmap with strparser
  selftests, bpf: Fix test_txmsg_ingress_parser error
  ...
====================

Link: https://lore.kernel.org/r/20211102013123.9005-1-alexei.starovoitov@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 52fa3ee0 0b170456

Documentation/bpf/btf.rst

+14 −14
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ sequentially and type id is assigned to each recognized type starting from id 
    #define BTF_KIND_VAR            14      /* Variable     */

    #define BTF_KIND_DATASEC        15      /* Section      */

    #define BTF_KIND_FLOAT          16      /* Floating point       */

    #define BTF_KIND_TAG            17      /* Tag          */

    #define BTF_KIND_DECL_TAG       17      /* Decl Tag     */



Note that the type section encodes debug info, not just pure types.

``BTF_KIND_FUNC`` is not a type, and it represents a defined subprogram.
@@ -107,7 +107,7 @@ Each type contains the following common data:: 
         * "size" tells the size of the type it is describing.

         *

         * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,

         * FUNC, FUNC_PROTO and TAG.

         * FUNC, FUNC_PROTO and DECL_TAG.

         * "type" is a type_id referring to another type.

         */

        union {
@@ -466,30 +466,30 @@ map definition. 


No additional type data follow ``btf_type``.



2.2.17 BTF_KIND_TAG

~~~~~~~~~~~~~~~~~~~

2.2.17 BTF_KIND_DECL_TAG

~~~~~~~~~~~~~~~~~~~~~~~~



``struct btf_type`` encoding requirement:

 * ``name_off``: offset to a non-empty string

 * ``info.kind_flag``: 0

 * ``info.kind``: BTF_KIND_TAG

 * ``info.kind``: BTF_KIND_DECL_TAG

 * ``info.vlen``: 0

 * ``type``: ``struct``, ``union``, ``func`` or ``var``

 * ``type``: ``struct``, ``union``, ``func``, ``var`` or ``typedef``



``btf_type`` is followed by ``struct btf_tag``.::

``btf_type`` is followed by ``struct btf_decl_tag``.::



    struct btf_tag {

    struct btf_decl_tag {

        __u32   component_idx;

    };



The ``name_off`` encodes btf_tag attribute string.

The ``type`` should be ``struct``, ``union``, ``func`` or ``var``.

For ``var`` type, ``btf_tag.component_idx`` must be ``-1``.

For the other three types, if the btf_tag attribute is

The ``name_off`` encodes btf_decl_tag attribute string.

The ``type`` should be ``struct``, ``union``, ``func``, ``var`` or ``typedef``.

For ``var`` or ``typedef`` type, ``btf_decl_tag.component_idx`` must be ``-1``.

For the other three types, if the btf_decl_tag attribute is

applied to the ``struct``, ``union`` or ``func`` itself,

``btf_tag.component_idx`` must be ``-1``. Otherwise,

``btf_decl_tag.component_idx`` must be ``-1``. Otherwise,

the attribute is applied to a ``struct``/``union`` member or

a ``func`` argument, and ``btf_tag.component_idx`` should be a

a ``func`` argument, and ``btf_decl_tag.component_idx`` should be a

valid index (starting from 0) pointing to a member or an argument.



3. BTF Kernel API

Documentation/bpf/libbpf/libbpf_naming_convention.rst

+40 −0
Original line number Diff line number Diff line
@@ -150,6 +150,46 @@ mirror of the mainline's version of libbpf for a stand-alone build. 
However, all changes to libbpf's code base must be upstreamed through

the mainline kernel tree.





API documentation convention

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



The libbpf API is documented via comments above definitions in

header files. These comments can be rendered by doxygen and sphinx

for well organized html output. This section describes the

convention in which these comments should be formated.



Here is an example from btf.h:



.. code-block:: c



        /**

         * @brief **btf__new()** creates a new instance of a BTF object from the raw

         * bytes of an ELF's BTF section

         * @param data raw bytes

         * @param size number of bytes passed in `data`

         * @return new BTF object instance which has to be eventually freed with

         * **btf__free()**

         *

         * On error, error-code-encoded-as-pointer is returned, not a NULL. To extract

         * error code from such a pointer `libbpf_get_error()` should be used. If

         * `libbpf_set_strict_mode(LIBBPF_STRICT_CLEAN_PTRS)` is enabled, NULL is

         * returned on error instead. In both cases thread-local `errno` variable is

         * always set to error code as well.

         */



The comment must start with a block comment of the form '/\*\*'.



The documentation always starts with a @brief directive. This line is a short

description about this API. It starts with the name of the API, denoted in bold

like so: **api_name**. Please include an open and close parenthesis if this is a

function. Follow with the short description of the API. A longer form description

can be added below the last directive, at the bottom of the comment.



Parameters are denoted with the @param directive, there should be one for each

parameter. If this is a function with a non-void return, use the @return directive

to document it.



License

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3442,6 +3442,7 @@ S: Supported 
F:	arch/arm64/net/









BPF JIT for MIPS (32-BIT AND 64-BIT)









M:	Johan Almbladh <johan.almbladh@anyfinetworks.com>









M:	Paul Burton <paulburton@kernel.org>









L:	netdev@vger.kernel.org









L:	bpf@vger.kernel.org
































Makefile



+3
−0






























Original line number
Diff line number
Diff line







@@ -480,6 +480,8 @@ LZ4		= lz4c







XZ		= xz









ZSTD		= zstd



















PAHOLE_FLAGS	= $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh)



















CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \









		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)









NOSTDINC_FLAGS :=








@@ -534,6 +536,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE







export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE









export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE









export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL









export PAHOLE_FLAGS



















# Files to ignore in find ... statements










































arch/arm/net/bpf_jit_32.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -1882,11 +1882,6 @@ static int validate_code(struct jit_ctx *ctx)







	return 0;









}



















void bpf_jit_compile(struct bpf_prog *prog)









{









	/* Nothing to do here. We support Internal BPF. */









}



















bool bpf_jit_needs_zext(void)









{









	return true;