Jakub Kicinski 708852dcac Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next ... Daniel Borkmann says: ==================== The following pull-request contains BPF updates for your *net-next* tree. There is a small merge conflict in libbpf (Cc Andrii so he's in the loop as well): for (i = 1; i <= btf__get_nr_types(btf); i++) { t = (struct btf_type *)btf__type_by_id(btf, i); if (!has_datasec && btf_is_var(t)) { /* replace VAR with INT */ t->info = BTF_INFO_ENC(BTF_KIND_INT, 0, 0); <<<<<<< HEAD /* * using size = 1 is the safest choice, 4 will be too * big and cause kernel BTF validation failure if * original variable took less than 4 bytes */ t->size = 1; *(int *)(t+1) = BTF_INT_ENC(0, 0, 8); } else if (!has_datasec && kind == BTF_KIND_DATASEC) { ======= t->size = sizeof(int); *(int *)(t + 1) = BTF_INT_ENC(0, 0, 32); } else if (!has_datasec && btf_is_datasec(t)) { >>>>>>> 72ef80b5ee /* replace DATASEC with STRUCT */ Conflict is between the two commits 1d4126c4e1 ("libbpf: sanitize VAR to conservative 1-byte INT") and b03bc6853c ("libbpf: convert libbpf code to use new btf helpers"), so we need to pick the sanitation fixup as well as use the new btf_is_datasec() helper and the whitespace cleanup. Looks like the following: [...] if (!has_datasec && btf_is_var(t)) { /* replace VAR with INT */ t->info = BTF_INFO_ENC(BTF_KIND_INT, 0, 0); /* * using size = 1 is the safest choice, 4 will be too * big and cause kernel BTF validation failure if * original variable took less than 4 bytes */ t->size = 1; *(int *)(t + 1) = BTF_INT_ENC(0, 0, 8); } else if (!has_datasec && btf_is_datasec(t)) { /* replace DATASEC with STRUCT */ [...] The main changes are: 1) Addition of core parts of compile once - run everywhere (co-re) effort, that is, relocation of fields offsets in libbpf as well as exposure of kernel's own BTF via sysfs and loading through libbpf, from Andrii. More info on co-re: http://vger.kernel.org/bpfconf2019.html#session-2 and http://vger.kernel.org/lpc-bpf2018.html#session-2 2) Enable passing input flags to the BPF flow dissector to customize parsing and allowing it to stop early similar to the C based one, from Stanislav. 3) Add a BPF helper function that allows generating SYN cookies from XDP and tc BPF, from Petar. 4) Add devmap hash-based map type for more flexibility in device lookup for redirects, from Toke. 5) Improvements to XDP forwarding sample code now utilizing recently enabled devmap lookups, from Jesper. 6) Add support for reporting the effective cgroup progs in bpftool, from Jakub and Takshak. 7) Fix reading kernel config from bpftool via /proc/config.gz, from Peter. 8) Fix AF_XDP umem pages mapping for 32 bit architectures, from Ivan. 9) Follow-up to add two more BPF loop tests for the selftest suite, from Alexei. 10) Add perf event output helper also for other skb-based program types, from Allan. 11) Fix a co-re related compilation error in selftests, from Yonghong. ==================== Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>		2019-08-13 16:24:57 -07:00
..
auxdisplay	auxdisplay: Replace licenses with SPDX identifiers	2018-04-12 19:02:45 +02:00
binderfs	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
bpf	samples/bpf: xdp_fwd explain bpf_fib_lookup return codes	2019-08-09 18:05:03 +02:00
configfs	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 145	2019-05-30 11:25:18 -07:00
connector	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
hidraw	HID: samples/hidraw: fix typo in printed message	2018-11-21 00:31:58 +01:00
hw_breakpoint	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
kdb	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
kfifo	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 465	2019-06-19 17:09:10 +02:00
kobject	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
kprobes	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
livepatch	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
mei	samples: mei: use /dev/mei0 instead of /dev/mei	2019-01-30 15:24:45 +01:00
mic/mpssd	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 290	2019-06-05 17:36:38 +02:00
pidfd	samples: make pidfd-metadata fail gracefully on older kernels	2019-06-24 15:55:50 +02:00
pktgen	samples: pktgen: allow to specify destination port	2019-07-01 11:02:20 -07:00
qmi	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
rpmsg	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282	2019-06-05 17:36:37 +02:00
seccomp	samples: guard sub-directories with CONFIG options	2019-05-18 11:29:01 +09:00
timers	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
trace_events	sched/core: Provide a pointer to the valid CPU mask	2019-06-03 11:49:37 +02:00
trace_printk	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
uhid	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
v4l	media: v4l2-pci-skeleton.c: fix doc warning	2019-05-28 13:14:28 -04:00
vfio-mdev	treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again	2019-07-25 11:05:10 +02:00
vfs	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36	2019-05-24 17:27:11 +02:00
watchdog	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	docs: driver-api: add a series of orphaned documents	2019-07-15 11:03:02 -03:00
Makefile	kbuild: add CONFIG_HEADERS_INSTALL and loosen the dependency of samples	2019-06-15 19:57:01 +09:00