Commit c1acda98 authored by David S. Miller's avatar David S. Miller
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-03-09

The following pull-request contains BPF updates for your *net-next* tree.

We've added 90 non-merge commits during the last 17 day(s) which contain
a total of 114 files changed, 5158 insertions(+), 1288 deletions(-).

The main changes are:

1) Faster bpf_redirect_map(), from Björn.

2) skmsg cleanup, from Cong.

3) Support for floating point types in BTF, from Ilya.

4) Documentation for sys_bpf commands, from Joe.

5) Support for sk_lookup in bpf_prog_test_run, form Lorenz.

6) Enable task local storage for tracing programs, from Song.

7) bpf_for_each_map_elem() helper, from Yonghong.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 05a59d79 32f91529

Documentation/bpf/btf.rst

+15 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ sequentially and type id is assigned to each recognized type starting from id 
    #define BTF_KIND_FUNC_PROTO     13      /* Function Proto       */

    #define BTF_KIND_VAR            14      /* Variable     */

    #define BTF_KIND_DATASEC        15      /* Section      */

    #define BTF_KIND_FLOAT          16      /* Floating point       */



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.
@@ -95,8 +96,8 @@ Each type contains the following common data:: 
        /* "info" bits arrangement

         * bits  0-15: vlen (e.g. # of struct's members)

         * bits 16-23: unused

         * bits 24-27: kind (e.g. int, ptr, array...etc)

         * bits 28-30: unused

         * bits 24-28: kind (e.g. int, ptr, array...etc)

         * bits 29-30: unused

         * bit     31: kind_flag, currently used by

         *             struct, union and fwd

         */
@@ -452,6 +453,18 @@ map definition. 
  * ``offset``: the in-section offset of the variable

  * ``size``: the size of the variable in bytes



2.2.16 BTF_KIND_FLOAT

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



``struct btf_type`` encoding requirement:

 * ``name_off``: any valid offset

 * ``info.kind_flag``: 0

 * ``info.kind``: BTF_KIND_FLOAT

 * ``info.vlen``: 0

 * ``size``: the size of the float type in bytes: 2, 4, 8, 12 or 16.



No additional type data follow ``btf_type``.



3. BTF Kernel API

*****************

Documentation/bpf/index.rst

+6 −3
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ BPF instruction-set. 
The Cilium project also maintains a `BPF and XDP Reference Guide`_

that goes into great technical depth about the BPF Architecture.



The primary info for the bpf syscall is available in the `man-pages`_

for `bpf(2)`_.



BPF Type Format (BTF)

=====================
@@ -35,6 +32,12 @@ Two sets of Questions and Answers (Q&A) are maintained. 
   bpf_design_QA

   bpf_devel_QA



Syscall API

===========



The primary info for the bpf syscall is available in the `man-pages`_

for `bpf(2)`_. For more information about the userspace API, see

Documentation/userspace-api/ebpf/index.rst.



Helper functions

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

Documentation/userspace-api/ebpf/index.rst

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



eBPF Userspace API

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



eBPF is a kernel mechanism to provide a sandboxed runtime environment in the

Linux kernel for runtime extension and instrumentation without changing kernel

source code or loading kernel modules. eBPF programs can be attached to various

kernel subsystems, including networking, tracing and Linux security modules

(LSM).



For internal kernel documentation on eBPF, see Documentation/bpf/index.rst.



.. toctree::

   :maxdepth: 1



   syscall

Documentation/userspace-api/ebpf/syscall.rst

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



eBPF Syscall

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



:Authors: - Alexei Starovoitov <ast@kernel.org>

          - Joe Stringer <joe@wand.net.nz>

          - Michael Kerrisk <mtk.manpages@gmail.com>



The primary info for the bpf syscall is available in the `man-pages`_

for `bpf(2)`_.



bpf() subcommand reference

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



.. kernel-doc:: include/uapi/linux/bpf.h

   :doc: eBPF Syscall Preamble



.. kernel-doc:: include/uapi/linux/bpf.h

   :doc: eBPF Syscall Commands



.. Links:

.. _man-pages: https://www.kernel.org/doc/man-pages/

.. _bpf(2): https://man7.org/linux/man-pages/man2/bpf.2.html

Documentation/userspace-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ place where this information is gathered. 
   unshare

   spec_ctrl

   accelerators/ocxl

   ebpf/index

   ioctl/index

   iommu

   media/index