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
..
accounting
arch	tools headers UAPI: Update tools's copy of mman.h headers	2019-07-29 09:02:58 -03:00
bpf	tools: bpftool: add feature check for zlib	2019-08-13 16:22:07 +02:00
build	tools build: Check if gettid() is available before providing helper	2019-07-07 17:53:09 -03:00
cgroup
crypto
debugging
firewire	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
firmware	Driver Core and debugfs changes for 5.3-rc1	2019-07-12 12:24:03 -07:00
gpio	Bulk GPIO changes for the v5.3 kernel cycle:	2019-07-09 09:07:00 -07:00
hv	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 280	2019-06-05 17:36:36 +02:00
iio	Second set of IIO device support, features, cleanups and minor fixes for 5.3.	2019-07-01 10:58:13 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-08-13 16:24:57 -07:00
io_uring	tools/io_uring: sync with liburing	2019-05-23 10:25:26 -06:00
kvm/kvm_stat	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499	2019-06-19 17:09:53 +02:00
laptop	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 505	2019-06-19 17:11:22 +02:00
leds
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-08-13 16:24:57 -07:00
memory-model	tools/memory-model: Improve data-race detection	2019-06-24 09:08:54 -07:00
nfsd
objtool	objtool: Improve UACCESS coverage	2019-07-25 08:36:39 +02:00
pci	pci-v5.3-changes	2019-07-15 20:44:49 -07:00
pcmcia	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 247	2019-06-19 17:09:08 +02:00
perf	perf tools: Fix perf.data documentation units for memory size	2019-07-29 09:03:43 -03:00
power	kbuild: create *.mod with full directory path and remove MODVERDIR	2019-07-18 02:19:31 +09:00
scripts	perf build: Do not use -Wshadow on gcc < 4.8	2019-07-23 09:04:54 -03:00
spi	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178	2019-05-30 11:29:19 -07:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-08-13 16:24:57 -07:00
thermal/tmon	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 89	2019-05-24 17:37:52 +02:00
time	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282	2019-06-05 17:36:37 +02:00
usb	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157	2019-05-30 11:26:37 -07:00
virtio	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 482	2019-06-19 17:09:52 +02:00
vm	tools/vm/slabinfo: add sorting info to help menu	2019-07-12 11:05:46 -07:00
wmi	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
Makefile	tools/power/x86: A tool to validate Intel Speed Select commands	2019-07-03 15:37:09 +03:00