8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/tools/lib/bpf/libbpf.pc.template

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/tools/lib/bpf/libbpf.pc.template

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/tools/lib/bpf/libbpf.pc.template

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/tools/lib/bpf/libbpf.pc.template

ff36e78fdb251b9fa65028554689806961e011eb - Merge drm/drm-next into drm-intel-next-queued

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/tools/lib/bpf/libbpf.pc.template

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/tools/lib/bpf/libbpf.pc.template

7d6aa9ba4f8228c75970fc4fad27194611a548a6 - Merge remote-tracking branch 'net-next/master' into mac80211-next

Thu, 02 Jan 2020 14:50:09 +0100

Merge remote-tracking branch 'net-next/master' into mac80211-nextMerging to get the mac80211 updates that have since propagatedinto net-next.Signed-off-by: Johannes Berg List of files: /linux/tools/lib/bpf/libbpf.pc.template

74c12ee02af109adcde36ec184fa59c0afb0edaa - Merge v5.6-rc1 into drm-misc-fixes

Wed, 12 Feb 2020 14:08:59 +0100

Merge v5.6-rc1 into drm-misc-fixesWe're based on v5.6, need v5.6-rc1 at least. :)Signed-off-by: Maarten Lankhorst List of files: /linux/tools/lib/bpf/libbpf.pc.template

fdff7c21ea00787e3f70a1a00b40b88eb998c6ad - Merge branch 'linus' into perf/urgent, to synchronize with upstream

Wed, 05 Feb 2020 08:44:22 +0100

Merge branch 'linus' into perf/urgent, to synchronize with upstreamSigned-off-by: Ingo Molnar List of files: /linux/tools/lib/bpf/libbpf.pc.template

bd2463ac7d7ec51d432f23bf0e893fb371a908cd - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Wed, 29 Jan 2020 01:02:33 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextPull networking updates from David Miller: 1) Add WireGuard 2) Add HE and TWT support to ath11k driver, from John Crispin. 3) Add ESP in TCP encapsulation support, from Sabrina Dubroca. 4) Add variable window congestion control to TIPC, from Jon Maloy. 5) Add BCM84881 PHY driver, from Russell King. 6) Start adding netlink support for ethtool operations, from Michal Kubecek. 7) Add XDP drop and TX action support to ena driver, from Sameeh Jubran. 8) Add new ipv4 route notifications so that mlxsw driver does not have to handle identical routes itself. From Ido Schimmel. 9) Add BPF dynamic program extensions, from Alexei Starovoitov.10) Support RX and TX timestamping in igc, from Vinicius Costa Gomes.11) Add support for macsec HW offloading, from Antoine Tenart.12) Add initial support for MPTCP protocol, from Christoph Paasch, Matthieu Baerts, Florian Westphal, Peter Krystad, and many others.13) Add Octeontx2 PF support, from Sunil Goutham, Geetha sowjanya, Linu Cherian, and others.* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1469 commits) net: phy: add default ARCH_BCM_IPROC for MDIO_BCM_IPROC udp: segment looped gso packets correctly netem: change mailing list qed: FW 8.42.2.0 debug features qed: rt init valid initialization changed qed: Debug feature: ilt and mdump qed: FW 8.42.2.0 Add fw overlay feature qed: FW 8.42.2.0 HSI changes qed: FW 8.42.2.0 iscsi/fcoe changes qed: Add abstraction for different hsi values per chip qed: FW 8.42.2.0 Additional ll2 type qed: Use dmae to write to widebus registers in fw_funcs qed: FW 8.42.2.0 Parser offsets modified qed: FW 8.42.2.0 Queue Manager changes qed: FW 8.42.2.0 Expose new registers and change windows qed: FW 8.42.2.0 Internal ram offsets modifications MAINTAINERS: Add entry for Marvell OcteonTX2 Physical Function driver Documentation: net: octeontx2: Add RVU HW and drivers overview octeontx2-pf: ethtool RSS config support octeontx2-pf: Add basic ethtool support ... List of files: /linux/tools/lib/bpf/libbpf.pc.template

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

Fri, 27 Dec 2019 23:20:10 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDaniel Borkmann says:====================pull-request: bpf-next 2019-12-27The following pull-request contains BPF updates for your *net-next* tree.We've added 127 non-merge commits during the last 17 day(s) which containa total of 110 files changed, 6901 insertions(+), 2721 deletions(-).There are three merge conflicts. Conflicts and resolution looks as follows:1) Merge conflict in net/bpf/test_run.c:There was a tree-wide cleanup c593642c8be0 ("treewide: Use sizeof_field() macro")which gets in the way with b590cb5f802d ("bpf: Switch to offsetofend inBPF_PROG_TEST_RUN"): <<<<<<< HEAD if (!range_is_zero(__skb, offsetof(struct __sk_buff, priority) + sizeof_field(struct __sk_buff, priority), ======= if (!range_is_zero(__skb, offsetofend(struct __sk_buff, priority), >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92cThere are a few occasions that look similar to this. Always take the chunk withoffsetofend(). Note that there is one where the fields differ in here: <<<<<<< HEAD if (!range_is_zero(__skb, offsetof(struct __sk_buff, tstamp) + sizeof_field(struct __sk_buff, tstamp), ======= if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_segs), >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92cJust take the one with offsetofend() /and/ gso_segs. Latter is correct due to850a88cc4096 ("bpf: Expose __sk_buff wire_len/gso_segs to BPF_PROG_TEST_RUN").2) Merge conflict in arch/riscv/net/bpf_jit_comp.c:(I'm keeping Bjorn in Cc here for a double-check in case I got it wrong.) <<<<<<< HEAD if (is_13b_check(off, insn)) return -1; emit(rv_blt(tcc, RV_REG_ZERO, off >> 1), ctx); ======= emit_branch(BPF_JSLT, RV_REG_T1, RV_REG_ZERO, off, ctx); >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92cResult should look like: emit_branch(BPF_JSLT, tcc, RV_REG_ZERO, off, ctx);3) Merge conflict in arch/riscv/include/asm/pgtable.h: <<<<<<< HEAD ======= #define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) #define VMALLOC_END (PAGE_OFFSET - 1) #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) #define BPF_JIT_REGION_SIZE (SZ_128M) #define BPF_JIT_REGION_START (PAGE_OFFSET - BPF_JIT_REGION_SIZE) #define BPF_JIT_REGION_END (VMALLOC_END) /* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then * position vmemmap directly below the VMALLOC region. */ #define VMEMMAP_SHIFT \ (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) #define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT) #define VMEMMAP_END (VMALLOC_START - 1) #define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE) #define vmemmap ((struct page *)VMEMMAP_START) >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92cOnly take the BPF_* defines from there and move them higher up in thesame file. Remove the rest from the chunk. The VMALLOC_* etc definesgot moved via 01f52e16b868 ("riscv: define vmemmap before pfn_to_pagecalls"). Result: [...] #define __S101 PAGE_READ_EXEC #define __S110 PAGE_SHARED_EXEC #define __S111 PAGE_SHARED_EXEC #define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) #define VMALLOC_END (PAGE_OFFSET - 1) #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) #define BPF_JIT_REGION_SIZE (SZ_128M) #define BPF_JIT_REGION_START (PAGE_OFFSET - BPF_JIT_REGION_SIZE) #define BPF_JIT_REGION_END (VMALLOC_END) /* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then * position vmemmap directly below the VMALLOC region. */ #define VMEMMAP_SHIFT \ (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) #define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT) #define VMEMMAP_END (VMALLOC_START - 1) #define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE) [...]Let me know if there are any other issues.Anyway, the main changes are:1) Extend bpftool to produce a struct (aka "skeleton") tailored and specific to a provided BPF object file. This provides an alternative, simplified API compared to standard libbpf interaction. Also, add libbpf extern variable resolution for .kconfig section to import Kconfig data, from Andrii Nakryiko.2) Add BPF dispatcher for XDP which is a mechanism to avoid indirect calls by generating a branch funnel as discussed back in bpfconf'19 at LSF/MM. Also, add various BPF riscv JIT improvements, from Björn Töpel.3) Extend bpftool to allow matching BPF programs and maps by name, from Paul Chaignon.4) Support for replacing cgroup BPF programs attached with BPF_F_ALLOW_MULTI flag for allowing updates without service interruption, from Andrey Ignatov.5) Cleanup and simplification of ring access functions for AF_XDP with a bonus of 0-5% performance improvement, from Magnus Karlsson.6) Enable BPF JITs for x86-64 and arm64 by default. Also, final version of audit support for BPF, from Daniel Borkmann and latter with Jiri Olsa.7) Move and extend test_select_reuseport into BPF program tests under BPF selftests, from Jakub Sitnicki.8) Various BPF sample improvements for xdpsock for customizing parameters to set up and benchmark AF_XDP, from Jay Jayatheerthan.9) Improve libbpf to provide a ulimit hint on permission denied errors. Also change XDP sample programs to attach in driver mode by default, from Toke Høiland-Jørgensen.10) Extend BPF test infrastructure to allow changing skb mark from tc BPF programs, from Nikita V. Shirokov.11) Optimize prologue code sequence in BPF arm32 JIT, from Russell King.12) Fix xdp_redirect_cpu BPF sample to manually attach to tracepoints after libbpf conversion, from Jesper Dangaard Brouer.13) Minor misc improvements from various others.====================Signed-off-by: David S. Miller List of files: /linux/tools/lib/bpf/libbpf.pc.template

dbd8f6bae6f4a98aa517aeda6e5276ed4a20f571 - libbpf: Add zlib as a dependency in pkg-config template

Mon, 16 Dec 2019 19:38:29 +0100

libbpf: Add zlib as a dependency in pkg-config templateList zlib as another dependency of libbpf in pkg-config template.Verified it is correctly resolved to proper -lz flag:$ make DESTDIR=/tmp/libbpf-install install$ pkg-config --libs /tmp/libbpf-install/usr/local/lib64/pkgconfig/libbpf.pc-L/usr/local/lib64 -lbpf$ pkg-config --libs --static /tmp/libbpf-install/usr/local/lib64/pkgconfig/libbpf.pc-L/usr/local/lib64 -lbpf -lelf -lzFixes: 166750bc1dd2 ("libbpf: Support libbpf-provided extern variables")Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Acked-by: Yonghong Song Cc: Luca Boccassi Link: https://lore.kernel.org/bpf/20191216183830.3972964-1-andriin@fb.com List of files: /linux/tools/lib/bpf/libbpf.pc.template

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 - Merge branch 'next' into for-linus

Sat, 20 Jul 2019 06:07:56 +0200

Merge branch 'next' into for-linusPrepare second round of input updates for 5.3 merge window. List of files: /linux/tools/lib/bpf/libbpf.pc.template

ecb41832bd2a7a3f8ac93527cec5e51e3827daed - Merge tag 'v5.2' into next

Mon, 15 Jul 2019 18:42:32 +0200

Merge tag 'v5.2' into nextSync up with mainline to resolve conflicts in iforce driver. List of files: /linux/tools/lib/bpf/libbpf.pc.template

74acee309fb2a434dce215d44014e6f8e06975ae - Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Wed, 10 Jul 2019 01:39:57 +0200

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus List of files: /linux/tools/lib/bpf/libbpf.pc.template

355a47ae7ebcf9d605aa809b259d380422e81b8d - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Wed, 26 Jun 2019 12:22:54 +0200

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixesSome fixes have been accidentally pushed to this, so I cannot fost-forward.Required to pull in the remove-fbcon-notifiers fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/tools/lib/bpf/libbpf.pc.template

860dbce3d8dd90cb9e909c58fa79808766243651 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Sun, 02 Jun 2019 08:46:11 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/tools/lib/bpf/libbpf.pc.template

2491b544ff3aa9717d427033206fa793be53429d - Merge drm/drm-next into drm-intel-next-queued

Tue, 28 May 2019 10:07:59 +0200

Merge drm/drm-next into drm-intel-next-queuedGet the HDR dependencies originally merged via drm-misc. Sync up alli915 changes applied via other trees. And get v5.2-rc2 as the baseline.Signed-off-by: Jani Nikula List of files: /linux/tools/lib/bpf/libbpf.pc.template

374ed5429346a021c8e2d26fafce14c5b15dedd0 - Merge drm/drm-next into drm-misc-next

Wed, 22 May 2019 22:08:21 +0200

Merge drm/drm-next into drm-misc-nextBackmerging 5.2-rc1 to -misc-next for robherSigned-off-by: Sean Paul List of files: /linux/tools/lib/bpf/libbpf.pc.template

Changes in libbpf.pc.template