History

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

Daniel Borkmann says: ==================== bpf-next 2021-10-02 We've added 85 non-merge commits during the last 15 day(s) which contain a total of 132 files changed, 13779 insertions(+), 6724 deletions(-). The main changes are: 1) Massive update on test_bpf.ko coverage for JITs as preparatory work for an upcoming MIPS eBPF JIT, from Johan Almbladh. 2) Add a batched interface for RX buffer allocation in AF_XDP buffer pool, with driver support for i40e and ice from Magnus Karlsson. 3) Add legacy uprobe support to libbpf to complement recently merged legacy kprobe support, from Andrii Nakryiko. 4) Add bpf_trace_vprintk() as variadic printk helper, from Dave Marchevsky. 5) Support saving the register state in verifier when spilling <8byte bounded scalar to the stack, from Martin Lau. 6) Add libbpf opt-in for stricter BPF program section name handling as part of libbpf 1.0 effort, from Andrii Nakryiko. 7) Add a document to help clarifying BPF licensing, from Alexei Starovoitov. 8) Fix skel_internal.h to propagate errno if the loader indicates an internal error, from Kumar Kartikeya Dwivedi. 9) Fix build warnings with -Wcast-function-type so that the option can later be enabled by default for the kernel, from Kees Cook. 10) Fix libbpf to ignore STT_SECTION symbols in legacy map definitions as it otherwise errors out when encountering them, from Toke Høiland-Jørgensen. 11) Teach libbpf to recognize specialized maps (such as for perf RB) and internally remove BTF type IDs when creating them, from Hengqi Chen. 12) Various fixes and improvements to BPF selftests. ====================

Jakub Kicinski committed 5 years ago

Commit 6b7b0c32 parents 20ab39d d636c8d132 files · +13779 −6724Browse files

Showing the changes to include/uapi (1 of 132 files). Show all

Unified · Split

include/uapi/linux/bpf.h+14−2
@@ -4046,7 +4046,7 @@ union bpf_attr { · 4045 unmodified lines
40464046 * arguments. The *data* are a **u64** array and corresponding format string
40474047 * values are stored in the array. For strings and pointers where pointees
40484048 * are accessed, only the pointer values are stored in the *data* array.
4049− * The *data_len* is the size of *data* in bytes.
4049+ * The *data_len* is the size of *data* in bytes - must be a multiple of 8.
40504050 *
40514051 * Formats **%s**, **%p{i,I}{4,6}** requires to read kernel memory.
40524052 * Reading kernel memory may fail due to either invalid address or
@@ -4751,7 +4751,8 @@ union bpf_attr { · 698 unmodified lines
47514751 * Each format specifier in **fmt** corresponds to one u64 element
47524752 * in the **data** array. For strings and pointers where pointees
47534753 * are accessed, only the pointer values are stored in the *data*
4754− * array. The *data_len* is the size of *data* in bytes.
4754+ * array. The *data_len* is the size of *data* in bytes - must be
4755+ * a multiple of 8.
47554756 *
47564757 * Formats **%s** and **%p{i,I}{4,6}** require to read kernel
47574758 * memory. Reading kernel memory may fail due to either invalid
@@ -4898,6 +4899,16 @@ union bpf_attr { · 140 unmodified lines
48984899 * **-EINVAL** if *flags* is not zero.
48994900 *
49004901 * **-ENOENT** if architecture does not support branch records.
4902+ *
4903+ * long bpf_trace_vprintk(const char *fmt, u32 fmt_size, const void *data, u32 data_len)
4904+ * Description
4905+ * Behaves like **bpf_trace_printk**\ () helper, but takes an array of u64
4906+ * to format and can handle more format args as a result.
4907+ *
4908+ * Arguments are to be used as in **bpf_seq_printf**\ () helper.
4909+ * Return
4910+ * The number of bytes written to the buffer, or a negative error
4911+ * in case of failure.
49014912 */
49024913 #define __BPF_FUNC_MAPPER(FN) \
49034914 FN(unspec), \
@@ -5077,6 +5088,7 @@ union bpf_attr { · 173 unmodified lines
50775088 FN(get_attach_cookie), \
50785089 FN(task_pt_regs), \
50795090 FN(get_branch_snapshot), \
5091+ FN(trace_vprintk), \
50805092 /* */
50815093
50825094 /* integer value in 'imm' field of BPF_CALL instruction selects which helper