Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-17--03-00 (v6.15-rc1-677-g2871d9839040) remotes/brancher/net-next-2025-04-17--15-00 (v6.15-rc1-674-g88c15631d44e) ==== BASE DIFF ==== Documentation/netlink/specs/ovpn.yaml | 367 +++ Documentation/netlink/specs/rt-link.yaml | 16 + MAINTAINERS | 11 + drivers/bluetooth/hci_vhci.c | 10 +- drivers/net/Kconfig | 15 + drivers/net/Makefile | 1 + drivers/net/ethernet/airoha/airoha_eth.c | 273 ++- drivers/net/ethernet/airoha/airoha_eth.h | 8 +- drivers/net/ethernet/airoha/airoha_ppe.c | 9 +- drivers/net/ethernet/airoha/airoha_regs.h | 7 + drivers/net/ethernet/ti/icssg/icss_iep.c | 121 +- drivers/net/ethernet/ti/icssg/icssg_common.c | 9 +- drivers/net/ovpn/Makefile | 22 + drivers/net/ovpn/bind.c | 55 + drivers/net/ovpn/bind.h | 101 + drivers/net/ovpn/crypto.c | 210 ++ drivers/net/ovpn/crypto.h | 145 ++ drivers/net/ovpn/crypto_aead.c | 383 ++++ drivers/net/ovpn/crypto_aead.h | 29 + drivers/net/ovpn/io.c | 446 ++++ drivers/net/ovpn/io.h | 34 + drivers/net/ovpn/main.c | 274 +++ drivers/net/ovpn/main.h | 14 + drivers/net/ovpn/netlink-gen.c | 213 ++ drivers/net/ovpn/netlink-gen.h | 41 + drivers/net/ovpn/netlink.c | 1258 +++++++++++ drivers/net/ovpn/netlink.h | 18 + drivers/net/ovpn/ovpnpriv.h | 55 + drivers/net/ovpn/peer.c | 1365 +++++++++++ drivers/net/ovpn/peer.h | 163 ++ drivers/net/ovpn/pktid.c | 129 ++ drivers/net/ovpn/pktid.h | 86 + drivers/net/ovpn/proto.h | 118 + drivers/net/ovpn/skb.h | 61 + drivers/net/ovpn/socket.c | 233 ++ drivers/net/ovpn/socket.h | 49 + drivers/net/ovpn/stats.c | 21 + drivers/net/ovpn/stats.h | 47 + drivers/net/ovpn/tcp.c | 598 +++++ drivers/net/ovpn/tcp.h | 36 + drivers/net/ovpn/udp.c | 439 ++++ drivers/net/ovpn/udp.h | 25 + include/linux/skbuff.h | 2 + include/uapi/linux/if_link.h | 15 + include/uapi/linux/ovpn.h | 109 + include/uapi/linux/udp.h | 1 + net/bluetooth/l2cap_core.c | 18 +- net/core/pktgen.c | 24 +- net/core/skbuff.c | 18 +- net/ipv6/af_inet6.c | 1 + net/ipv6/ioam6_iptunnel.c | 76 +- net/netfilter/nf_flow_table_core.c | 10 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/net/ovpn/.gitignore | 2 + tools/testing/selftests/net/ovpn/Makefile | 31 + tools/testing/selftests/net/ovpn/common.sh | 92 + tools/testing/selftests/net/ovpn/config | 10 + tools/testing/selftests/net/ovpn/data64.key | 5 + tools/testing/selftests/net/ovpn/ovpn-cli.c | 2376 ++++++++++++++++++++ tools/testing/selftests/net/ovpn/tcp_peers.txt | 5 + .../testing/selftests/net/ovpn/test-chachapoly.sh | 9 + .../selftests/net/ovpn/test-close-socket-tcp.sh | 9 + .../selftests/net/ovpn/test-close-socket.sh | 45 + tools/testing/selftests/net/ovpn/test-float.sh | 9 + tools/testing/selftests/net/ovpn/test-tcp.sh | 9 + tools/testing/selftests/net/ovpn/test.sh | 113 + tools/testing/selftests/net/ovpn/udp_peers.txt | 5 + 67 files changed, 10380 insertions(+), 130 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.O0a4L2BA5M b/tmp/tmp.oglWiGO6IK index 3f3711c70923..97c46309baa1 100644 --- a/tmp/tmp.O0a4L2BA5M +++ b/tmp/tmp.oglWiGO6IK @@ -1,4 +1,3 @@ -try to make the buffer for popen larger disable cirrus kunit config: set preempt dbg: tests: bonding: print info on failure @@ -7,13 +6,46 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours -selftests: drv-net: Test that NAPI ID is non-zero -selftests: net: Allow custom net ns paths -selftests: drv-net: Factor out ksft C helpers -netdevsim: Mark NAPI ID on skb in nsim_rcv +veth: apply qdisc backpressure on full ptr_ring to reduce TX drops +net: sched: generalize check for no-queue qdisc on TX queue +selftests: net/bridge : add tests for per vlan snooping with stp state changes +net: bridge: mcast: update multicast contex when vlan state is changed +net: bridge: mcast: re-implement br_multicast_{enable, disable}_port functions +net/mlx5: Don't use %pK through tracepoints +ice: Don't use %pK through printk or tracepoints +selftests: net: kmemleak for lwt dst cache tests +net: Use nlmsg_payload in rtnetlink file +net: Use nlmsg_payload in neighbour file +xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() +net: enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS +net: enetc: refactor bulk flipping of RX buffers to separate function +net: enetc: register XDP RX queues with frag_size +s390: ism: Pass string literal as format argument of dev_set_name() +MAINTAINERS: Add s390 networking drivers to NETWORKING DRIVERS +MAINTAINERS: Add ism.h to S390 NETWORKING DRIVERS +net/mlx5: Expose function UID in devlink info +devlink: add function unique identifier to devlink dev info +net/mlx5: Expose serial numbers in devlink info +net: ipv4: Fix uninitialized pointer warning in fnhe_remove_oldest +net: airoha: Add missing filed to ppe_mbox_data struct +MAINTAINERS: Add entry for Renesas RZ/V2H(P) DWMAC GBETH glue layer driver +net: stmmac: Add DWMAC glue layer for Renesas GBETH +dt-bindings: net: Document support for Renesas RZ/V2H(P) GBETH +dt-bindings: net: dwmac: Increase 'maxItems' for 'interrupts' and 'interrupt-names' +net: mana: Handle unsupported HWC commands +net: mana: Add sched HTB offload support +net: mana: Add speed support in mana_get_link_ksettings +tipc: fix NULL pointer dereference in tipc_mon_reinit_self() +ptp: Do not enable by default during compile testing +net: wangxun: restrict feature flags for tunnel packets +net: txgbe: Support to set UDP tunnel port +selftests: net: add a virtio_net deadlock selftest +selftests: net: add flag to force zerocopy mode in xdp_helper +selftests: net: move xdp_helper to net/lib +virtio-net: disable delayed refill when pausing rx +net: phy: leds: fix memory leak emulex/benet: Annotate flash_cookie as nonstring net: phylink: mac_link_(up|down)() clarifications -Merge tag 'for-net-2025-04-16' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth net: ibmveth: added KUnit tests for some buffer pool functions net: ibmveth: Reset the adapter when unexpected states are detected net: ibmveth: Indented struct ibmveth_adapter correctly @@ -31,26 +63,12 @@ net: ethernet: natsemi: Use pure PCI devres API net: tulip: Use pure PCI devres API net: octeontx2: Use pure PCI devres API net: prestera: Use pure PCI devres API +net: phylink: fix suspend/resume with WoL enabled and link down net: lwtunnel: disable BHs when required net: selftests: initialize TCP header and skb payload with zero -net: phylink: Fix issues with link balancing w/ BMC present -net: phylink: Drop unused defines for SUPPORTED/ADVERTISED_INTERFACES net: stmmac: dwmac-loongson: Add new GMAC's PCI device ID support net: stmmac: dwmac-loongson: Add new multi-chan IP core support net: stmmac: dwmac-loongson: Move queue number init to common function -dt-bindings: net: pse-pd: ti,tps23881: Add interrupt description -net: pse-pd: tps23881: Add support for static port priority feature -dt-bindings: net: pse-pd: microchip,pd692x0: Add manager regulator supply -net: pse-pd: pd692x0: Add support for controller and manager power supplies -net: pse-pd: pd692x0: Add support for PSE PI priority feature -net: ethtool: Add PSE port priority support feature -net: pse-pd: Add support for budget evaluation strategies -net: pse-pd: Add helper to report hardware enable status of the PI -net: ethtool: Add support for new power domains index description -net: pse-pd: Add support for PSE power domains -net: pse-pd: tps23881: Add support for PSE events and interrupts -net: pse-pd: Add support for reporting events -net: ethtool: Add support for ethnl_info_init_ntf helper function MAINTAINERS: Add entry for Socfpga DWMAC ethernet glue driver rtase: Add ndo_setup_tc support for CBS offload in traffic control setup net: Delete the outer () duplicated of macro SOCK_SKB_CB_OFFSET definition @@ -77,13 +95,6 @@ net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration net: ethernet: mtk_eth_soc: revise QDMA packet scheduler settings net: ethernet: mtk_eth_soc: correct the max weight of the queue limit for 100Mbps net: ethernet: mtk_eth_soc: reapply mdc divider on reset -neighbour: Convert RTM_SETNEIGHTBL to RCU. -neighbour: Convert RTM_GETNEIGHTBL to RCU. -neighbour: Convert RTM_GETNEIGH to RCU. -neighbour: Move neigh_find_table() to neigh_get(). -neighbour: Allocate skb in neigh_get(). -neighbour: Move two validations from neigh_get() to neigh_valid_get_req(). -neighbour: Make neigh_valid_get_req() return ndmsg. pds_core: make wait_context part of q_info pds_core: Remove unnecessary check in pds_client_adminq_cmd() pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result @@ -127,58 +138,3 @@ vxlan: Unsplit default FDB entry creation and notification vxlan: Insert FDB into hash table in vxlan_fdb_create() vxlan: Simplify creation of default FDB entry vxlan: Add RCU read-side critical sections in the Tx path -net: pktgen: fix code style (WARNING: Prefer strscpy over strcpy) -net: pktgen: fix code style (WARNING: please, no space before tabs) -net: pktgen: fix code style (ERROR: else should follow close brace '}') -net: ipv6: ioam6: fix double reallocation -net: ipv6: ioam6: use consistent dst names -testing/selftests: add test tool and scripts for ovpn module -ovpn: add basic ethtool support -ovpn: notify userspace when a peer is deleted -ovpn: kill key and notify userspace in case of IV exhaustion -ovpn: implement key add/get/del/swap via netlink -ovpn: implement peer add/get/dump/delete via netlink -ovpn: add support for updating local or remote UDP endpoint -ovpn: implement keepalive mechanism -ovpn: implement peer lookup logic -ovpn: implement multi-peer support -ovpn: add support for MSG_NOSIGNAL in tcp_sendmsg -skb: implement skb_send_sock_locked_with_flags() -ovpn: implement TCP transport -ovpn: store tunnel and transport statistics -ovpn: implement packet processing -ovpn: implement basic RX path (UDP) -ovpn: implement basic TX path (UDP) -ovpn: introduce the ovpn_socket object -ovpn: introduce the ovpn_peer object -ovpn: keep carrier always on for MP interfaces -ovpn: add basic interface creation/destruction/management routines -ovpn: add basic netlink support -net: introduce OpenVPN Data Channel Offload (ovpn) -net: ti: icss-iep: Fix possible NULL pointer dereference for perout request -net: ti: icssg-prueth: Fix possible NULL pointer dereference inside emac_xmit_xdp_frame() -net: ti: icssg-prueth: Fix kernel warning while bringing down network interface -net: ethtool: phy: Convert the PHY_GET command to generic phy dump -net: ethtool: Introduce per-PHY DUMP operations -net: airoha: Add missing filed to ppe_mbox_data struct -net: airoha: Add matchall filter offload support -rds: Use nested-BH locking for rds_page_remainder -rds: Acquire per-CPU pointer within BH disabled section -rds: Disable only bottom halves in rds_page_remainder_alloc() -mptcp: Use nested-BH locking for hmac_storage -net/sched: Use nested-BH locking for sch_frag_data_storage -net/sched: act_mirred: Move the recursion counter struct netdev_xmit -openvswitch: Move ovs_frag_data_storage into the struct ovs_pcpu_storage -openvswitch: Use nested-BH locking for ovs_pcpu_storage -openvswitch: Merge three per-CPU structures into one -xfrm: Use nested-BH locking for nat_keepalive_sk_ipv[46] -netfilter: nf_dup_netdev: Move the recursion counter struct netdev_xmit -netfilter: nft_inner: Use nested-BH locking for nft_pcpu_tun_ctx -netfilter: nf_dup{4, 6}: Move duplication check to task_struct -xdp: Use nested-BH locking for system_page_pool -ipv6: sr: Use nested-BH locking for hmac_storage -ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT -net: dst_cache: Use nested-BH locking for dst_cache::cache -net: page_pool: Don't recycle into cache on PREEMPT_RT -Bluetooth: vhci: Avoid needless snprintf() calls -Bluetooth: l2cap: Process valid commands in too long frame