Lorenz Bauer
0802a05ee7
BACKPORT: bpf: sockmap: Move generic sockmap hooks from BPF TCP ...
The init, close and unhash handlers from TCP sockmap are generic,
and can be reused by UDP sockmap. Move the helpers into the sockmap code
base and expose them. This requires tcp_bpf_get_proto and tcp_bpf_clone to
be conditional on BPF_STREAM_PARSER.
The moved functions are unmodified, except that sk_psock_unlink is
renamed to sock_map_unlink to better match its behaviour.
Change-Id: I54a6692b3e357efc09dedf1a6a55724c844aea74
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20200309111243.6982-6-lmb@cloudflare.com
2025-12-23 13:36:03 -08:00
firmware: meson_sm: Rework driver as a proper platform driver
2024-04-13 12:51:26 +02:00
iio: frequency: adf4350: Fix ADF4350_REG3_12BIT_CLKDIV_MODE
2025-10-29 13:59:50 +01:00
Merge android11-5.4.249+ ( d57e792) into msm-5.4
2023-09-28 16:45:28 +05:30
net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
2025-06-04 14:32:33 +02:00
RDMA/mlx5: Enforce same type port association for multiport RoCE
2025-01-09 13:23:34 +01:00
mmc: sdhci-msm: Disable partial_init and clk-scaling to avoid RED error
2024-04-18 10:46:06 +05:30
Merge tag 'ASB-2024-12-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2024-12-17 03:24:53 +02:00
Revert "netfilter: Replace zero-length array with flexible-array member"
2025-01-14 17:17:17 +00:00
Revert "netfilter: Replace zero-length array with flexible-array member"
2025-01-14 17:17:17 +00:00
Revert "netfilter: Replace zero-length array with flexible-array member"
2025-01-14 17:17:17 +00:00
Revert "netfilter: Replace zero-length array with flexible-array member"
2025-01-14 17:17:17 +00:00
Revert "netfilter: Replace zero-length array with flexible-array member"
2025-01-14 17:17:17 +00:00
Merge tag 'ASB-2024-10-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2024-10-09 18:08:17 +00:00
This is the 5.4.244 stable release
2023-06-20 11:07:18 +00:00
qed: Improve the stack space of filter_config()
2024-08-19 05:33:30 +02:00
Merge tag 'ASB-2025-09-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-09-12 18:48:05 +03:00
UPSTREAM: mm: return faster for non-fatal signals in user mode faults
2025-05-18 08:08:42 +00:00
soc: qcom: mdt_loader: Read hash from firmware blob
2024-08-08 16:32:23 -05:00
Revert "spi: Fix deadlock when adding SPI controllers on SPI buses"
2024-11-21 22:00:36 +00:00
SUNRPC: Replace internal use of SOCKWQ_ASYNC_NOSPACE
2024-12-14 19:44:42 +01:00
Merge tag 'ASB-2025-10-06_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-10-08 15:17:54 +03:00
ACPI/IORT: Make iort_msi_map_rid() PCI agnostic
2023-12-13 18:18:10 +01:00
UPSTREAM: fs: add LSM-supporting anon-inode interface
2025-02-20 04:17:45 +02:00
ata: libata-scsi: Fix system suspend for a security locked drive
2025-12-03 12:45:21 +01:00
atm: atmtcp: Prevent arbitrary write in atmtcp_recv_control().
2025-09-04 14:05:54 +02:00
writeback: fix false warning in inode_to_wb()
2025-05-02 07:39:19 +02:00
Revert "coredump: hand a pidfd to the usermode coredump helper"
2025-06-05 07:57:32 +00:00
fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE
2024-09-04 13:14:50 +02:00
ocfs2/dlm: move BITS_TO_BYTES() to bitops.h for wider use
2023-06-09 10:28:54 +02:00
Merge 5.4.287 into android11-5.4-lts
2024-12-16 10:50:16 +00:00
UPSTREAM: bpf: Replace zero-length array with flexible-array member
2025-12-23 13:36:00 -08:00
BACKPORT: bpf: sockmap: Move generic sockmap hooks from BPF TCP
2025-12-23 13:36:03 -08:00
UPSTREAM: bpf: Introduce dynamic program extensions
2025-12-23 13:35:55 -08:00
BACKPORT: bpf: Introduce function-by-function verification
2025-12-23 13:35:52 -08:00
UPSTREAM: bpf: Introduce dynamic program extensions
2025-12-23 13:35:55 -08:00
Revert "cgroup: Make operations on the cgroup root_list RCU safe"
2024-12-16 10:50:29 +00:00
BACKPORT: kernfs: convert kernfs_node->id from union kernfs_node_id to u64
2025-12-23 13:35:40 -08:00
Merge android11-5.4.259+ ( 81334f2) into msm-5.4
2023-12-18 15:40:18 +05:30
BACKPORT: epoll: wire up syscall epoll_pwait2
2025-12-22 07:42:50 +02:00
Fix gcc 4.9 build issue in 5.4.y
2024-08-19 05:33:53 +02:00
This is the 5.4.302 stable release
2025-12-03 14:36:44 +00:00
Merge android11-5.4.254+ ( 91f7025) into msm-5.4
2023-10-30 22:46:41 -07:00
Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier"
2023-12-18 18:58:40 +00:00
Merge tag 'ASB-2024-10-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2024-10-09 18:08:17 +00:00
Revert "cred: switch to using atomic_long_t"
2024-01-03 17:00:08 +00:00
This is the 5.4.283 stable release
2024-09-06 11:18:13 +00:00
Merge tag 'ASB-2025-12-01_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-12-04 19:21:35 +02:00
linux/dim: Do nothing if no time delta between samples
2023-05-30 12:44:01 +01:00
Merge tag 'ASB-2025-08-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-09-01 13:17:46 +03:00
Merge android11-5.4.242+(e699d54) into msm-5.4
2023-07-26 14:21:25 +05:30
dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV
2024-02-23 08:25:06 +01:00
misc: eeprom: eeprom_93cx6: Add quirk for extra read clock cycle
2024-12-14 19:44:55 +01:00
ethernet: Add helper for assigning packet type when dest address does not match device address
2024-05-02 16:18:36 +02:00
eventfd: Export eventfd_ctx_do_read()
2023-09-23 10:59:40 +02:00
BACKPORT: bpf: Add support for BTF pointers to x86 JIT
2025-12-23 13:35:36 -08:00
UPSTREAM: close_range(): fix the logics in descriptor table trimming
2025-12-22 04:28:18 +02:00
UPSTREAM: bpf: Use migrate_disable/enable in array macros and cgroup/lirc code.
2025-12-23 13:35:58 -08:00
objtool: Add support for intra-function calls
2024-04-13 12:51:29 +02:00
Merge tag 'ASB-2025-10-06_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-10-08 15:17:54 +03:00
This is the 5.4.280 stable release
2024-07-19 13:19:29 +00:00
BACKPORT: ftrace: Add modify_ftrace_direct()
2025-12-23 13:35:46 -08:00
Merge android11-5.4.274 ( 564901b) into msm-5.4
2024-07-24 20:38:43 -07:00
This is the 5.4.295 stable release
2025-06-30 08:05:33 +00:00
Merge android11-5.4.233+ ( 4716ccc) into msm-5.4
2023-05-30 11:16:10 +05:30
gpu: host1x: mipi: Update tegra_mipi_request() to be node based
2024-03-26 18:22:18 -04:00
Revert "hrtimers: Handle CPU state correctly on hotplug"
2025-04-26 12:28:45 +02:00
BACKPORT: FROMGIT: userfaultfd: add UFFDIO_CONTINUE ioctl
2025-05-18 08:08:42 +00:00
Revert "mm: provide speculative fault infrastructure"
2025-05-24 05:44:05 +00:00
Drivers: hv: util: Avoid accessing a ringbuffer not initialized yet
2025-01-09 13:23:33 +01:00
i2c: Use IS_REACHABLE() for substituting empty ACPI functions
2024-09-12 11:03:50 +02:00
clockevents/drivers/i8253: Fix stop sequence for timer 0
2025-04-10 14:29:34 +02:00
Fix termination state for idr_for_each_entry_ul()
2023-11-20 10:30:15 +01:00
net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
2023-09-23 10:59:55 +02:00
team: fix null-ptr-deref when team device type is changed
2023-10-10 21:46:37 +02:00
net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs
2025-08-28 16:21:27 +02:00
Revert "interconnect: Add helpers for enabling/disabling a path"
2023-08-31 13:52:19 +00:00
Merge branch 'android11-5.4-lts' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-10-08 15:23:13 +03:00
Merge android11-5.4.281 ( d62984a) into msm-5.4
2024-10-29 01:43:17 -07:00
Merge 5.4.259 into android11-5.4-lts
2023-10-26 09:18:00 +00:00
msm: ipa: Add support for Private IP Forwarding
2024-01-31 15:08:32 +05:30
ipa_eth: Header change to pass more info from ETH to GSI
2023-06-14 09:27:04 +05:30
msm: ipa3: change variable name for indication of
2024-03-13 08:33:14 -07:00
Revert "genirq: Allow irq_chip registration functions to take a const irq_chip"
2024-08-30 10:05:12 +00:00
UPSTREAM: irq_work: Convert flags to atomic_t
2025-12-23 13:35:39 -08:00
Revert "genirq: Allow the PM device to originate from irq domain"
2024-08-30 10:05:12 +00:00
jbd2: introduce/export functions jbd2_journal_submit|finish_inode_data_buffers()
2024-11-08 16:20:30 +01:00
Merge 5.4.287 into android11-5.4-lts
2024-12-16 10:50:16 +00:00
This is the 5.4.291 stable release
2025-03-13 14:53:52 +00:00
BACKPORT: kernfs: convert kernfs_node->id from union kernfs_node_id to u64
2025-12-23 13:35:40 -08:00
KVM: Explicitly verify target vCPU is online in kvm_get_vcpu()
2025-03-13 12:43:07 +01:00
leds: class: Protect brightness_show() with led_cdev->led_access mutex
2024-12-14 19:44:53 +01:00
ata: libata-sata: increase PMP SRST timeout to 10s
2023-10-10 21:46:42 +02:00
list: add "list_del_init_careful()" to go with "list_empty_careful()"
2023-06-28 10:18:35 +02:00
drm/syncobj: make lockdep complain on WAIT_FOR_SUBMIT v3
2024-03-01 13:13:38 +01:00
BACKPORT: security: add inode_init_security_anon() LSM hook
2025-02-20 04:17:45 +02:00
mcb: remove is_added flag from mcb_device struct
2023-10-25 11:53:19 +02:00
net: phy: mchp: Add support for LAN8814 QUAD PHY
2024-07-05 09:08:27 +02:00
Revert "mm/migrate: Pass vm_fault pointer to migrate_misplaced_page()"
2025-05-24 05:44:07 +00:00
Merge branch 'android11-5.4-lts' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-12-11 01:41:51 -08:00
Revert "mm: make pte_unmap_same compatible with SPF"
2025-05-24 05:44:30 +00:00
module: Restore the moduleparam prefix length check
2025-08-28 16:21:21 +02:00
msm: ep_pcie: Disable hot reset and ignore linkdown
2024-09-13 17:38:37 +05:30
new helper: lookup_positive_unlocked()
2023-09-23 10:59:40 +02:00
BACKPORT: xdp: Move devmap bulk queue into struct net_device
2025-12-23 13:35:53 -08:00
Remove DECnet support from kernel
2023-06-21 15:44:10 +02:00
Remove DECnet support from kernel
2023-06-21 15:44:10 +02:00
netpoll: netpoll_send_skb() returns transmit status
2025-04-10 14:29:35 +02:00
nfs: add missing selections of CONFIG_CRC32
2025-05-02 07:39:20 +02:00
nfs: fix UAF in direct writes
2025-08-28 16:21:37 +02:00
Revert "fs/nls: make load_nls() take a const parameter"
2023-09-30 15:41:35 +00:00
Merge android11-5.4.254+ ( 91f7025) into msm-5.4
2023-10-30 22:46:41 -07:00
nvme: fixup comment for nvme RDMA Provider Type
2024-07-05 09:08:28 +02:00
mlxsw: spectrum_acl_erp: Fix object nesting warning
2024-08-19 05:33:28 +02:00
Merge tag 'ASB-2025-09-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-09-12 18:48:05 +03:00
of/irq: Make of_msi_map_rid() PCI bus agnostic
2023-12-13 18:18:11 +01:00
overflow: Allow mixed type arguments
2025-03-13 12:42:52 +01:00
Revert "mm: provide speculative fault infrastructure"
2025-05-24 05:44:05 +00:00
Revert "PCI/ACPI: Fix runtime PM ref imbalance on Hot-Plug Capable ports"
2025-09-02 14:38:47 +00:00
This is the 5.4.291 stable release
2025-03-13 14:53:52 +00:00
Merge android11-5.4.265+ ( a34cc1d) into msm-5.4
2024-02-29 15:10:56 +05:30
ANDROID: 16K: Don't copy data vma for maps/smaps output
2025-08-22 07:06:50 -07:00
ANDROID: 16K: Introduce pgsize_migration_inline.h
2024-10-10 16:13:30 -07:00
Merge tag 'ASB-2025-08-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-09-01 13:17:46 +03:00
ANDROID: fix up platform_device ABI break
2023-11-28 10:15:58 +00:00
Revert "PM: domains: Fix up terminology with parent/child"
2023-06-16 09:26:26 +00:00
This is the 5.4.269 stable release
2024-02-24 15:47:08 +00:00
PM / wakeirq: support enabling wake-up irq after runtime_suspend called
2023-08-11 11:54:00 +02:00
poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()
2025-02-01 18:18:51 +01:00
power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint
2025-05-25 16:53:58 +00:00
pps: fix poll support
2025-08-28 16:21:18 +02:00
sched/rt: Provide migrate_disable/enable() inlines
2023-11-20 10:30:12 +01:00
Merge android11-5.4.249+ ( d57e792) into msm-5.4
2023-09-28 16:45:28 +05:30
UPSTREAM: nsfs: clean-up ns_get_path() signature to return int
2025-12-23 13:35:44 -08:00
This is the 5.4.262 stable release
2023-11-29 10:18:14 +00:00
firmware: qcom_scm: Add a call for getting dload mode
2024-06-21 10:36:14 +05:30
Merge 5.4.259 into android11-5.4-lts
2023-10-26 09:18:00 +00:00
quota: Fix slow quotaoff
2023-10-25 11:53:18 +02:00
scsi: core: raid_class: Remove raid_component_add()
2023-08-30 16:27:27 +02:00
rcu: add a helper to report consolidated flavor QS
2024-03-26 18:22:25 -04:00
rcu: fix header guard for rcu_all_qs()
2025-06-04 14:32:34 +02:00
Revert "regmap: allow to define reg_update_bits for no bus configuration"
2024-04-16 10:04:00 +00:00
This is the 5.4.284 stable release
2024-09-12 10:37:37 +00:00
Revert "mm: introduce __page_add_new_anon_rmap()"
2025-05-24 05:44:06 +00:00
Merge android11-5.4.259+ ( 81334f2) into msm-5.4
2023-12-18 15:40:18 +05:30
sched/headers: Move 'struct sched_param' out of uapi, to work around glibc/musl breakage
2025-06-30 14:38:08 +03:00
BACKPORT: security: add inode_init_security_anon() LSM hook
2025-02-20 04:17:45 +02:00
Revert "Revert "Revert "8250: add support for ASIX devices with a FIFO bug"""
2025-05-18 11:04:18 +03:00
serial: core: fix kernel-doc for uart_port_unlock_irqrestore()
2024-05-02 16:18:37 +02:00
dmaengine: sh: setup_xref error handling
2025-12-03 12:45:11 +01:00
BACKPORT: FROMGIT: userfaultfd/shmem: combine shmem_{mcopy_atomic,mfill_zeropage}_pte
2025-05-18 08:08:42 +00:00
Merge tag 'ASB-2025-10-06_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-10-08 15:17:54 +03:00
BACKPORT: bpf: sockmap: Move generic sockmap hooks from BPF TCP
2025-12-23 13:36:03 -08:00
Merge android11-5.4.233+ ( 4716ccc) into msm-5.4
2023-05-30 11:16:10 +05:30
lib/string_helpers: Introduce string_upper() and string_lower() helpers
2023-05-30 12:44:08 +01:00
Revert "mm: introduce __lru_cache_add_active_or_unevictable"
2025-05-24 05:44:06 +00:00
BACKPORT: epoll: wire up syscall epoll_pwait2
2025-12-22 07:42:50 +02:00
Merge android11-5.4.233+ ( 4716ccc) into msm-5.4
2023-05-30 11:16:10 +05:30
ANDROID: preserve CRC for struct tcp_sock
2024-07-20 12:53:22 +00:00
tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem
2023-05-17 11:35:57 +02:00
Merge android11-5.4.274 ( 564901b) into msm-5.4
2024-07-24 20:38:43 -07:00
Revert "tracing: Constify string literal data member in struct trace_event_call"
2025-01-13 09:47:29 +00:00
tty: Prevent writing chars during tcsetattr TCSADRAIN/FLUSH
2023-05-17 11:36:04 +02:00
types: Complement the aligned types with signed 64-bit one
2025-06-04 14:32:27 +02:00
u64_stats: fix u64_stats_init() for lockdep when used repeatedly in one file
2024-05-02 16:18:28 +02:00
UPSTREAM: uaccess: Add strict non-pagefault kernel-space read function
2025-12-23 13:35:39 -08:00
UPSTREAM: udp: do not accept non-tunnel GSO skbs landing in a tunnel
2025-03-10 16:19:50 +00:00
units: add the HZ macros
2024-02-23 08:24:47 +01:00
Merge branch 'android11-5.4-lts' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-12-11 01:41:51 -08:00
BACKPORT: FROMGIT: userfaultfd/shmem: modify shmem_mfill_atomic_pte to use install_pte()
2025-05-18 08:08:42 +00:00
util_macros.h: fix/rework find_closest() macros
2024-12-14 19:44:43 +01:00
vfio: Introduce interface to flush virqfd inject workqueue
2024-04-13 12:51:34 +02:00
net: do not allow gso_size to be set to GSO_BY_FRAGS
2023-08-30 16:27:17 +02:00
Revert "mm: add speculative page fault vmstats"
2025-05-24 05:44:04 +00:00
BACKPORT: bpf: Add mmap() support for BPF_MAP_TYPE_ARRAY
2025-12-23 13:35:42 -08:00
linux/vt_buffer.h: allow either builtin or modular for macros
2023-05-17 11:35:46 +02:00
Merge tag 'ASB-2025-02-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
2025-02-06 22:53:05 +02:00
This is the 5.4.251 stable release
2023-08-03 10:56:28 +00:00
