mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
753c8608f3
-----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTFp0I1jqZrAX+hPRXbK58LschIgwUCZWiCPAAKCRDbK58LschI g4djAQC1FdqCRIFkhbiIRNHTgHjnfQShELQbd9ofJqzylLqmmgD+JI1E7D9SXagm pIXQ26EGmq8/VcCT3VLncA8EsC76Gg4= =Xowm -----END PGP SIGNATURE----- Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next Daniel Borkmann says: ==================== pull-request: bpf-next 2023-11-30 We've added 30 non-merge commits during the last 7 day(s) which contain a total of 58 files changed, 1598 insertions(+), 154 deletions(-). The main changes are: 1) Add initial TX metadata implementation for AF_XDP with support in mlx5 and stmmac drivers. Two types of offloads are supported right now, that is, TX timestamp and TX checksum offload, from Stanislav Fomichev with stmmac implementation from Song Yoong Siang. 2) Change BPF verifier logic to validate global subprograms lazily instead of unconditionally before the main program, so they can be guarded using BPF CO-RE techniques, from Andrii Nakryiko. 3) Add BPF link_info support for uprobe multi link along with bpftool integration for the latter, from Jiri Olsa. 4) Use pkg-config in BPF selftests to determine ld flags which is in particular needed for linking statically, from Akihiko Odaki. 5) Fix a few BPF selftest failures to adapt to the upcoming LLVM18, from Yonghong Song. * tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (30 commits) bpf/tests: Remove duplicate JSGT tests selftests/bpf: Add TX side to xdp_hw_metadata selftests/bpf: Convert xdp_hw_metadata to XDP_USE_NEED_WAKEUP selftests/bpf: Add TX side to xdp_metadata selftests/bpf: Add csum helpers selftests/xsk: Support tx_metadata_len xsk: Add option to calculate TX checksum in SW xsk: Validate xsk_tx_metadata flags xsk: Document tx_metadata_len layout net: stmmac: Add Tx HWTS support to XDP ZC net/mlx5e: Implement AF_XDP TX timestamp and checksum offload tools: ynl: Print xsk-features from the sample xsk: Add TX timestamp and TX checksum offload support xsk: Support tx_metadata_len selftests/bpf: Use pkg-config for libelf selftests/bpf: Override PKG_CONFIG for static builds selftests/bpf: Choose pkg-config for the target bpftool: Add support to display uprobe_multi links selftests/bpf: Add link_info test for uprobe_multi link selftests/bpf: Use bpf_link__destroy in fill_link_info tests ... ==================== Conflicts: Documentation/netlink/specs/netdev.yaml: |
||
|---|---|---|
| .. | ||
| 842 | ||
| crypto | ||
| dim | ||
| fonts | ||
| kunit | ||
| livepatch | ||
| lz4 | ||
| lzo | ||
| math | ||
| pldmfw | ||
| raid6 | ||
| reed_solomon | ||
| test_fortify | ||
| vdso | ||
| xz | ||
| zlib_deflate | ||
| zlib_dfltcc | ||
| zlib_inflate | ||
| zstd | ||
| .gitignore | ||
| argv_split.c | ||
| ashldi3.c | ||
| ashrdi3.c | ||
| asn1_decoder.c | ||
| asn1_encoder.c | ||
| assoc_array.c | ||
| atomic64.c | ||
| atomic64_test.c | ||
| audit.c | ||
| base64.c | ||
| bcd.c | ||
| bch.c | ||
| bitfield_kunit.c | ||
| bitmap-str.c | ||
| bitmap.c | ||
| bitrev.c | ||
| bootconfig-data.S | ||
| bootconfig.c | ||
| bsearch.c | ||
| btree.c | ||
| bucket_locks.c | ||
| bug.c | ||
| build_OID_registry | ||
| buildid.c | ||
| bust_spinlocks.c | ||
| check_signature.c | ||
| checksum.c | ||
| checksum_kunit.c | ||
| closure.c | ||
| clz_ctz.c | ||
| clz_tab.c | ||
| cmdline.c | ||
| cmdline_kunit.c | ||
| cmpdi2.c | ||
| compat_audit.c | ||
| cpu_rmap.c | ||
| cpumask.c | ||
| cpumask_kunit.c | ||
| crc-ccitt.c | ||
| crc-itu-t.c | ||
| crc-t10dif.c | ||
| crc4.c | ||
| crc7.c | ||
| crc8.c | ||
| crc16.c | ||
| crc32.c | ||
| crc32defs.h | ||
| crc32test.c | ||
| crc64-rocksoft.c | ||
| crc64.c | ||
| ctype.c | ||
| debug_info.c | ||
| debug_locks.c | ||
| debugobjects.c | ||
| dec_and_lock.c | ||
| decompress.c | ||
| decompress_bunzip2.c | ||
| decompress_inflate.c | ||
| decompress_unlz4.c | ||
| decompress_unlzma.c | ||
| decompress_unlzo.c | ||
| decompress_unxz.c | ||
| decompress_unzstd.c | ||
| devmem_is_allowed.c | ||
| devres.c | ||
| dhry.h | ||
| dhry_1.c | ||
| dhry_2.c | ||
| dhry_run.c | ||
| digsig.c | ||
| dump_stack.c | ||
| dynamic_debug.c | ||
| dynamic_queue_limits.c | ||
| earlycpio.c | ||
| errname.c | ||
| error-inject.c | ||
| errseq.c | ||
| extable.c | ||
| fault-inject-usercopy.c | ||
| fault-inject.c | ||
| fdt.c | ||
| fdt_addresses.c | ||
| fdt_empty_tree.c | ||
| fdt_ro.c | ||
| fdt_rw.c | ||
| fdt_strerror.c | ||
| fdt_sw.c | ||
| fdt_wip.c | ||
| find_bit.c | ||
| find_bit_benchmark.c | ||
| flex_proportions.c | ||
| fortify_kunit.c | ||
| fw_table.c | ||
| gen_crc32table.c | ||
| gen_crc64table.c | ||
| genalloc.c | ||
| generic-radix-tree.c | ||
| glob.c | ||
| globtest.c | ||
| group_cpus.c | ||
| hashtable_test.c | ||
| hexdump.c | ||
| hweight.c | ||
| idr.c | ||
| inflate.c | ||
| interval_tree.c | ||
| interval_tree_test.c | ||
| iomap.c | ||
| iomap_copy.c | ||
| iommu-helper.c | ||
| iov_iter.c | ||
| irq_poll.c | ||
| irq_regs.c | ||
| is_signed_type_kunit.c | ||
| is_single_threaded.c | ||
| kasprintf.c | ||
| Kconfig | ||
| Kconfig.debug | ||
| Kconfig.kasan | ||
| Kconfig.kcsan | ||
| Kconfig.kfence | ||
| Kconfig.kgdb | ||
| Kconfig.kmsan | ||
| Kconfig.ubsan | ||
| kfifo.c | ||
| klist.c | ||
| kobject.c | ||
| kobject_uevent.c | ||
| kstrtox.c | ||
| kstrtox.h | ||
| kunit_iov_iter.c | ||
| libcrc32c.c | ||
| linear_ranges.c | ||
| list-test.c | ||
| list_debug.c | ||
| list_sort.c | ||
| llist.c | ||
| locking-selftest-hardirq.h | ||
| locking-selftest-mutex.h | ||
| locking-selftest-rlock-hardirq.h | ||
| locking-selftest-rlock-softirq.h | ||
| locking-selftest-rlock.h | ||
| locking-selftest-rsem.h | ||
| locking-selftest-rtmutex.h | ||
| locking-selftest-softirq.h | ||
| locking-selftest-spin-hardirq.h | ||
| locking-selftest-spin-softirq.h | ||
| locking-selftest-spin.h | ||
| locking-selftest-wlock-hardirq.h | ||
| locking-selftest-wlock-softirq.h | ||
| locking-selftest-wlock.h | ||
| locking-selftest-wsem.h | ||
| locking-selftest.c | ||
| lockref.c | ||
| logic_iomem.c | ||
| logic_pio.c | ||
| lru_cache.c | ||
| lshrdi3.c | ||
| lwq.c | ||
| Makefile | ||
| maple_tree.c | ||
| memcat_p.c | ||
| memcpy_kunit.c | ||
| memory-notifier-error-inject.c | ||
| memregion.c | ||
| memweight.c | ||
| muldi3.c | ||
| net_utils.c | ||
| netdev-notifier-error-inject.c | ||
| nlattr.c | ||
| nmi_backtrace.c | ||
| notifier-error-inject.c | ||
| notifier-error-inject.h | ||
| objagg.c | ||
| objpool.c | ||
| of-reconfig-notifier-error-inject.c | ||
| oid_registry.c | ||
| once.c | ||
| overflow_kunit.c | ||
| packing.c | ||
| parman.c | ||
| parser.c | ||
| pci_iomap.c | ||
| percpu-refcount.c | ||
| percpu_counter.c | ||
| percpu_test.c | ||
| plist.c | ||
| pm-notifier-error-inject.c | ||
| polynomial.c | ||
| radix-tree.c | ||
| radix-tree.h | ||
| random32.c | ||
| ratelimit.c | ||
| rbtree.c | ||
| rbtree_test.c | ||
| rcuref.c | ||
| ref_tracker.c | ||
| refcount.c | ||
| rhashtable.c | ||
| sbitmap.c | ||
| scatterlist.c | ||
| seq_buf.c | ||
| sg_pool.c | ||
| sg_split.c | ||
| siphash.c | ||
| siphash_kunit.c | ||
| slub_kunit.c | ||
| smp_processor_id.c | ||
| sort.c | ||
| stackdepot.c | ||
| stackinit_kunit.c | ||
| stmp_device.c | ||
| strcat_kunit.c | ||
| string.c | ||
| string_helpers.c | ||
| strncpy_from_user.c | ||
| strnlen_user.c | ||
| strscpy_kunit.c | ||
| syscall.c | ||
| test-kstrtox.c | ||
| test-string_helpers.c | ||
| test_bitmap.c | ||
| test_bitops.c | ||
| test_bits.c | ||
| test_blackhole_dev.c | ||
| test_bpf.c | ||
| test_debug_virtual.c | ||
| test_dynamic_debug.c | ||
| test_firmware.c | ||
| test_fprobe.c | ||
| test_fpu.c | ||
| test_free_pages.c | ||
| test_hash.c | ||
| test_hexdump.c | ||
| test_hmm.c | ||
| test_hmm_uapi.h | ||
| test_ida.c | ||
| test_kmod.c | ||
| test_kprobes.c | ||
| test_linear_ranges.c | ||
| test_list_sort.c | ||
| test_lockup.c | ||
| test_maple_tree.c | ||
| test_memcat_p.c | ||
| test_meminit.c | ||
| test_min_heap.c | ||
| test_module.c | ||
| test_objagg.c | ||
| test_objpool.c | ||
| test_parman.c | ||
| test_printf.c | ||
| test_ref_tracker.c | ||
| test_rhashtable.c | ||
| test_scanf.c | ||
| test_sort.c | ||
| test_static_key_base.c | ||
| test_static_keys.c | ||
| test_string.c | ||
| test_sysctl.c | ||
| test_ubsan.c | ||
| test_user_copy.c | ||
| test_uuid.c | ||
| test_vmalloc.c | ||
| test_xarray.c | ||
| textsearch.c | ||
| timerqueue.c | ||
| trace_readwrite.c | ||
| ts_bm.c | ||
| ts_fsm.c | ||
| ts_kmp.c | ||
| ubsan.c | ||
| ubsan.h | ||
| ucmpdi2.c | ||
| ucs2_string.c | ||
| usercopy.c | ||
| uuid.c | ||
| vsprintf.c | ||
| win_minmax.c | ||
| xarray.c | ||
| xxhash.c | ||