History

Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Pull networking updates from Paolo Abeni: "Core: - Introduce a config option to tweak MAX_SKB_FRAGS. Increasing the default value allows for better BIG TCP performances - Reduce compound page head access for zero-copy data transfers - RPS/RFS improvements, avoiding unneeded NET_RX_SOFTIRQ when possible - Threaded NAPI improvements, adding defer skb free support and unneeded softirq avoidance - Address dst_entry reference count scalability issues, via false sharing avoidance and optimize refcount tracking - Add lockless accesses annotation to sk_err[_soft] - Optimize again the skb struct layout - Extends the skb drop reasons to make it usable by multiple subsystems - Better const qualifier awareness for socket casts BPF: - Add skb and XDP typed dynptrs which allow BPF programs for more ergonomic and less brittle iteration through data and variable-sized accesses - Add a new BPF netfilter program type and minimal support to hook BPF programs to netfilter hooks such as prerouting or forward - Add more precise memory usage reporting for all BPF map types - Adds support for using {FOU,GUE} encap with an ipip device operating in collect_md mode and add a set of BPF kfuncs for controlling encap params - Allow BPF programs to detect at load time whether a particular kfunc exists or not, and also add support for this in light skeleton - Bigger batch of BPF verifier improvements to prepare for upcoming BPF open-coded iterators allowing for less restrictive looping capabilities - Rework RCU enforcement in the verifier, add kptr_rcu and enforce BPF programs to NULL-check before passing such pointers into kfunc - Add support for kptrs in percpu hashmaps, percpu LRU hashmaps and in local storage maps - Enable RCU semantics for task BPF kptrs and allow referenced kptr tasks to be stored in BPF maps - Add support for refcounted local kptrs to the verifier for allowing shared ownership, useful for adding a node to both the BPF list and rbtree - Add BPF verifier support for ST instructions in convert_ctx_access() which will help new -mcpu=v4 clang flag to start emitting them - Add ARM32 USDT support to libbpf - Improve bpftool's visual program dump which produces the control flow graph in a DOT format by adding C source inline annotations Protocols: - IPv4: Allow adding to IPv4 address a 'protocol' tag. Such value indicates the provenance of the IP address - IPv6: optimize route lookup, dropping unneeded R/W lock acquisition - Add the handshake upcall mechanism, allowing the user-space to implement generic TLS handshake on kernel's behalf - Bridge: support per-{Port, VLAN} neighbor suppression, increasing resilience to nodes failures - SCTP: add support for Fair Capacity and Weighted Fair Queueing schedulers - MPTCP: delay first subflow allocation up to its first usage. This will allow for later better LSM interaction - xfrm: Remove inner/outer modes from input/output path. These are not needed anymore - WiFi: - reduced neighbor report (RNR) handling for AP mode - HW timestamping support - support for randomized auth/deauth TA for PASN privacy - per-link debugfs for multi-link - TC offload support for mac80211 drivers - mac80211 mesh fast-xmit and fast-rx support - enable Wi-Fi 7 (EHT) mesh support Netfilter: - Add nf_tables 'brouting' support, to force a packet to be routed instead of being bridged - Update bridge netfilter and ovs conntrack helpers to handle IPv6 Jumbo packets properly, i.e. fetch the packet length from hop-by-hop extension header. This is needed for BIT TCP support - The iptables 32bit compat interface isn't compiled in by default anymore - Move ip(6)tables builtin icmp matches to the udptcp one. This has the advantage that icmp/icmpv6 match doesn't load the iptables/ip6tables modules anymore when iptables-nft is used - Extended netlink error report for netdevice in flowtables and netdev/chains. Allow for incrementally add/delete devices to netdev basechain. Allow to create netdev chain without device Driver API: - Remove redundant Device Control Error Reporting Enable, as PCI core has already error reporting enabled at enumeration time - Move Multicast DB netlink handlers to core, allowing devices other then bridge to use them - Allow the page_pool to directly recycle the pages from safely localized NAPI - Implement lockless TX queue stop/wake combo macros, allowing for further code de-duplication and sanitization - Add YNL support for user headers and struct attrs - Add partial YNL specification for devlink - Add partial YNL specification for ethtool - Add tc-mqprio and tc-taprio support for preemptible traffic classes - Add tx push buf len param to ethtool, specifies the maximum number of bytes of a transmitted packet a driver can push directly to the underlying device - Add basic LED support for switch/phy - Add NAPI documentation, stop relaying on external links - Convert dsa_master_ioctl() to netdev notifier. This is a preparatory work to make the hardware timestamping layer selectable by user space - Add transceiver support and improve the error messages for CAN-FD controllers New hardware / drivers: - Ethernet: - AMD/Pensando core device support - MediaTek MT7981 SoC - MediaTek MT7988 SoC - Broadcom BCM53134 embedded switch - Texas Instruments CPSW9G ethernet switch - Qualcomm EMAC3 DWMAC ethernet - StarFive JH7110 SoC - NXP CBTX ethernet PHY - WiFi: - Apple M1 Pro/Max devices - RealTek rtl8710bu/rtl8188gu - RealTek rtl8822bs, rtl8822cs and rtl8821cs SDIO chipset - Bluetooth: - Realtek RTL8821CS, RTL8851B, RTL8852BS - Mediatek MT7663, MT7922 - NXP w8997 - Actions Semi ATS2851 - QTI WCN6855 - Marvell 88W8997 - Can: - STMicroelectronics bxcan stm32f429 Drivers: - Ethernet NICs: - Intel (1G, icg): - add tracking and reporting of QBV config errors - add support for configuring max SDU for each Tx queue - Intel (100G, ice): - refactor mailbox overflow detection to support Scalable IOV - GNSS interface optimization - Intel (i40e): - support XDP multi-buffer - nVidia/Mellanox: - add the support for linux bridge multicast offload - enable TC offload for egress and engress MACVLAN over bond - add support for VxLAN GBP encap/decap flows offload - extend packet offload to fully support libreswan - support tunnel mode in mlx5 IPsec packet offload - extend XDP multi-buffer support - support MACsec VLAN offload - add support for dynamic msix vectors allocation - drop RX page_cache and fully use page_pool - implement thermal zone to report NIC temperature - Netronome/Corigine: - add support for multi-zone conntrack offload - Solarflare/Xilinx: - support offloading TC VLAN push/pop actions to the MAE - support TC decap rules - support unicast PTP - Other NICs: - Broadcom (bnxt): enforce software based freq adjustments only on shared PHC NIC - RealTek (r8169): refactor to addess ASPM issues during NAPI poll - Micrel (lan8841): add support for PTP_PF_PEROUT - Cadence (macb): enable PTP unicast - Engleder (tsnep): add XDP socket zero-copy support - virtio-net: implement exact header length guest feature - veth: add page_pool support for page recycling - vxlan: add MDB data path support - gve: add XDP support for GQI-QPL format - geneve: accept every ethertype - macvlan: allow some packets to bypass broadcast queue - mana: add support for jumbo frame - Ethernet high-speed switches: - Microchip (sparx5): Add support for TC flower templates - Ethernet embedded switches: - Broadcom (b54): - configure 6318 and 63268 RGMII ports - Marvell (mv88e6xxx): - faster C45 bus scan - Microchip: - lan966x: - add support for IS1 VCAP - better TX/RX from/to CPU performances - ksz9477: add ETS Qdisc support - ksz8: enhance static MAC table operations and error handling - sama7g5: add PTP capability - NXP (ocelot): - add support for external ports - add support for preemptible traffic classes - Texas Instruments: - add CPSWxG SGMII support for J7200 and J721E - Intel WiFi (iwlwifi): - preparation for Wi-Fi 7 EHT and multi-link support - EHT (Wi-Fi 7) sniffer support - hardware timestamping support for some devices/firwmares - TX beacon protection on newer hardware - Qualcomm 802.11ax WiFi (ath11k): - MU-MIMO parameters support - ack signal support for management packets - RealTek WiFi (rtw88): - SDIO bus support - better support for some SDIO devices (e.g. MAC address from efuse) - RealTek WiFi (rtw89): - HW scan support for 8852b - better support for 6 GHz scanning - support for various newer firmware APIs - framework firmware backwards compatibility - MediaTek WiFi (mt76): - P2P support - mesh A-MSDU support - EHT (Wi-Fi 7) support - coredump support" * tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2078 commits) net: phy: hide the PHYLIB_LEDS knob net: phy: marvell-88x2222: remove unnecessary (void*) conversions tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp. net: amd: Fix link leak when verifying config failed net: phy: marvell: Fix inconsistent indenting in led_blink_set lan966x: Don't use xdp_frame when action is XDP_TX tsnep: Add XDP socket zero-copy TX support tsnep: Add XDP socket zero-copy RX support tsnep: Move skb receive action to separate function tsnep: Add functions for queue enable/disable tsnep: Rework TX/RX queue initialization tsnep: Replace modulo operation with mask net: phy: dp83867: Add led_brightness_set support net: phy: Fix reading LED reg property drivers: nfc: nfcsim: remove return value check of `dev_dir` net: phy: dp83867: Remove unnecessary (void*) conversions net: ethtool: coalesce: try to make user settings stick twice net: mana: Check if netdev/napi_alloc_frag returns single page net: mana: Rename mana_refill_rxoob and remove some empty lines net: veth: add page_pool stats ...

Linus Torvalds committed 3 years ago

Commit 6e98b092 parents b68ee1c 9b78d911925 files · +138910 −47345Browse files

Showing the changes to include/trace (6 of 1925 files). Show all

Unified · Split

6 files
  1. include/trace/events/fib.h +2 −3
  2. include/trace/events/fib6.h +1 −4
  3. include/trace/events/handshake.h +159 −0
  4. include/trace/events/qrtr.h +18 −15
  5. include/trace/events/sock.h +2 −2
  6. include/trace/events/tcp.h +1 −1
include/trace/events/fib.h+2−3
@@ -36,7 +36,6 @@ TRACE_EVENT(fib_table_lookup, · 35 unmodified lines
36 ),36 ),
37 37
38 TP_fast_assign(38 TP_fast_assign(
39 struct in6_addr in6_zero = {};
40 struct net_device *dev;39 struct net_device *dev;
41 struct in6_addr *in6;40 struct in6_addr *in6;
42 __be32 *p32;41 __be32 *p32;
@@ -74,7 +73,7 @@ TRACE_EVENT(fib_table_lookup, · 31 unmodified lines
74 *p32 = nhc->nhc_gw.ipv4;73 *p32 = nhc->nhc_gw.ipv4;
75 74
76 in6 = (struct in6_addr *)__entry->gw6;75 in6 = (struct in6_addr *)__entry->gw6;
77 *in6 = in6_zero;76 *in6 = in6addr_any;
78 } else if (nhc->nhc_gw_family == AF_INET6) {77 } else if (nhc->nhc_gw_family == AF_INET6) {
79 p32 = (__be32 *) __entry->gw4;78 p32 = (__be32 *) __entry->gw4;
80 *p32 = 0;79 *p32 = 0;
@@ -87,7 +86,7 @@ TRACE_EVENT(fib_table_lookup, · 6 unmodified lines
87 *p32 = 0;86 *p32 = 0;
88 87
89 in6 = (struct in6_addr *)__entry->gw6;88 in6 = (struct in6_addr *)__entry->gw6;
90 *in6 = in6_zero;89 *in6 = in6addr_any;
91 }90 }
92 ),91 ),
93 92
include/trace/events/fib6.h+1−4
@@ -68,11 +68,8 @@ TRACE_EVENT(fib6_table_lookup, · 67 unmodified lines
68 strcpy(__entry->name, "-");68 strcpy(__entry->name, "-");
69 }69 }
70 if (res->f6i == net->ipv6.fib6_null_entry) {70 if (res->f6i == net->ipv6.fib6_null_entry) {
71 struct in6_addr in6_zero = {};
72
73 in6 = (struct in6_addr *)__entry->gw;71 in6 = (struct in6_addr *)__entry->gw;
74 *in6 = in6_zero;72 *in6 = in6addr_any;
75
76 } else if (res->nh) {73 } else if (res->nh) {
77 in6 = (struct in6_addr *)__entry->gw;74 in6 = (struct in6_addr *)__entry->gw;
78 *in6 = res->nh->fib_nh_gw6;75 *in6 = res->nh->fib_nh_gw6;
include/trace/events/handshake.h+159−0
@@ -0,0 +1,159 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2#undef TRACE_SYSTEM
3#define TRACE_SYSTEM handshake
4
5#if !defined(_TRACE_HANDSHAKE_H) || defined(TRACE_HEADER_MULTI_READ)
6#define _TRACE_HANDSHAKE_H
7
8#include <linux/net.h>
9#include <linux/tracepoint.h>
10
11DECLARE_EVENT_CLASS(handshake_event_class,
12 TP_PROTO(
13 const struct net *net,
14 const struct handshake_req *req,
15 const struct sock *sk
16 ),
17 TP_ARGS(net, req, sk),
18 TP_STRUCT__entry(
19 __field(const void *, req)
20 __field(const void *, sk)
21 __field(unsigned int, netns_ino)
22 ),
23 TP_fast_assign(
24 __entry->req = req;
25 __entry->sk = sk;
26 __entry->netns_ino = net->ns.inum;
27 ),
28 TP_printk("req=%p sk=%p",
29 __entry->req, __entry->sk
30 )
31);
32#define DEFINE_HANDSHAKE_EVENT(name) \
33 DEFINE_EVENT(handshake_event_class, name, \
34 TP_PROTO( \
35 const struct net *net, \
36 const struct handshake_req *req, \
37 const struct sock *sk \
38 ), \
39 TP_ARGS(net, req, sk))
40
41DECLARE_EVENT_CLASS(handshake_fd_class,
42 TP_PROTO(
43 const struct net *net,
44 const struct handshake_req *req,
45 const struct sock *sk,
46 int fd
47 ),
48 TP_ARGS(net, req, sk, fd),
49 TP_STRUCT__entry(
50 __field(const void *, req)
51 __field(const void *, sk)
52 __field(int, fd)
53 __field(unsigned int, netns_ino)
54 ),
55 TP_fast_assign(
56 __entry->req = req;
57 __entry->sk = req->hr_sk;
58 __entry->fd = fd;
59 __entry->netns_ino = net->ns.inum;
60 ),
61 TP_printk("req=%p sk=%p fd=%d",
62 __entry->req, __entry->sk, __entry->fd
63 )
64);
65#define DEFINE_HANDSHAKE_FD_EVENT(name) \
66 DEFINE_EVENT(handshake_fd_class, name, \
67 TP_PROTO( \
68 const struct net *net, \
69 const struct handshake_req *req, \
70 const struct sock *sk, \
71 int fd \
72 ), \
73 TP_ARGS(net, req, sk, fd))
74
75DECLARE_EVENT_CLASS(handshake_error_class,
76 TP_PROTO(
77 const struct net *net,
78 const struct handshake_req *req,
79 const struct sock *sk,
80 int err
81 ),
82 TP_ARGS(net, req, sk, err),
83 TP_STRUCT__entry(
84 __field(const void *, req)
85 __field(const void *, sk)
86 __field(int, err)
87 __field(unsigned int, netns_ino)
88 ),
89 TP_fast_assign(
90 __entry->req = req;
91 __entry->sk = sk;
92 __entry->err = err;
93 __entry->netns_ino = net->ns.inum;
94 ),
95 TP_printk("req=%p sk=%p err=%d",
96 __entry->req, __entry->sk, __entry->err
97 )
98);
99#define DEFINE_HANDSHAKE_ERROR(name) \
100 DEFINE_EVENT(handshake_error_class, name, \
101 TP_PROTO( \
102 const struct net *net, \
103 const struct handshake_req *req, \
104 const struct sock *sk, \
105 int err \
106 ), \
107 TP_ARGS(net, req, sk, err))
108
109
110/*
111 * Request lifetime events
112 */
113
114DEFINE_HANDSHAKE_EVENT(handshake_submit);
115DEFINE_HANDSHAKE_ERROR(handshake_submit_err);
116DEFINE_HANDSHAKE_EVENT(handshake_cancel);
117DEFINE_HANDSHAKE_EVENT(handshake_cancel_none);
118DEFINE_HANDSHAKE_EVENT(handshake_cancel_busy);
119DEFINE_HANDSHAKE_EVENT(handshake_destruct);
120
121
122TRACE_EVENT(handshake_complete,
123 TP_PROTO(
124 const struct net *net,
125 const struct handshake_req *req,
126 const struct sock *sk,
127 int status
128 ),
129 TP_ARGS(net, req, sk, status),
130 TP_STRUCT__entry(
131 __field(const void *, req)
132 __field(const void *, sk)
133 __field(int, status)
134 __field(unsigned int, netns_ino)
135 ),
136 TP_fast_assign(
137 __entry->req = req;
138 __entry->sk = sk;
139 __entry->status = status;
140 __entry->netns_ino = net->ns.inum;
141 ),
142 TP_printk("req=%p sk=%p status=%d",
143 __entry->req, __entry->sk, __entry->status
144 )
145);
146
147/*
148 * Netlink events
149 */
150
151DEFINE_HANDSHAKE_ERROR(handshake_notify_err);
152DEFINE_HANDSHAKE_FD_EVENT(handshake_cmd_accept);
153DEFINE_HANDSHAKE_ERROR(handshake_cmd_accept_err);
154DEFINE_HANDSHAKE_FD_EVENT(handshake_cmd_done);
155DEFINE_HANDSHAKE_ERROR(handshake_cmd_done_err);
156
157#endif /* _TRACE_HANDSHAKE_H */
158
159#include <trace/define_trace.h>
include/trace/events/qrtr.h+18−15
@@ -10,15 +10,16 @@ · 9 unmodified lines
10 10
11TRACE_EVENT(qrtr_ns_service_announce_new,11TRACE_EVENT(qrtr_ns_service_announce_new,
12 12
13 TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),13 TP_PROTO(unsigned int service, unsigned int instance,
14 unsigned int node, unsigned int port),
14 15
15 TP_ARGS(service, instance, node, port),16 TP_ARGS(service, instance, node, port),
16 17
17 TP_STRUCT__entry(18 TP_STRUCT__entry(
18 __field(__le32, service)19 __field(unsigned int, service)
19 __field(__le32, instance)20 __field(unsigned int, instance)
20 __field(__le32, node)21 __field(unsigned int, node)
21 __field(__le32, port)22 __field(unsigned int, port)
22 ),23 ),
23 24
24 TP_fast_assign(25 TP_fast_assign(
@@ -36,15 +37,16 @@ TRACE_EVENT(qrtr_ns_service_announce_new, · 11 unmodified lines
36 37
37TRACE_EVENT(qrtr_ns_service_announce_del,38TRACE_EVENT(qrtr_ns_service_announce_del,
38 39
39 TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),40 TP_PROTO(unsigned int service, unsigned int instance,
41 unsigned int node, unsigned int port),
40 42
41 TP_ARGS(service, instance, node, port),43 TP_ARGS(service, instance, node, port),
42 44
43 TP_STRUCT__entry(45 TP_STRUCT__entry(
44 __field(__le32, service)46 __field(unsigned int, service)
45 __field(__le32, instance)47 __field(unsigned int, instance)
46 __field(__le32, node)48 __field(unsigned int, node)
47 __field(__le32, port)49 __field(unsigned int, port)
48 ),50 ),
49 51
50 TP_fast_assign(52 TP_fast_assign(
@@ -62,15 +64,16 @@ TRACE_EVENT(qrtr_ns_service_announce_del, · 11 unmodified lines
62 64
63TRACE_EVENT(qrtr_ns_server_add,65TRACE_EVENT(qrtr_ns_server_add,
64 66
65 TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),67 TP_PROTO(unsigned int service, unsigned int instance,
68 unsigned int node, unsigned int port),
66 69
67 TP_ARGS(service, instance, node, port),70 TP_ARGS(service, instance, node, port),
68 71
69 TP_STRUCT__entry(72 TP_STRUCT__entry(
70 __field(__le32, service)73 __field(unsigned int, service)
71 __field(__le32, instance)74 __field(unsigned int, instance)
72 __field(__le32, node)75 __field(unsigned int, node)
73 __field(__le32, port)76 __field(unsigned int, port)
74 ),77 ),
75 78
76 TP_fast_assign(79 TP_fast_assign(
include/trace/events/sock.h+2−2
@@ -158,7 +158,7 @@ TRACE_EVENT(inet_sock_set_state, · 157 unmodified lines
158 ),158 ),
159 159
160 TP_fast_assign(160 TP_fast_assign(
161 struct inet_sock *inet = inet_sk(sk);161 const struct inet_sock *inet = inet_sk(sk);
162 struct in6_addr *pin6;162 struct in6_addr *pin6;
163 __be32 *p32;163 __be32 *p32;
164 164
@@ -222,7 +222,7 @@ TRACE_EVENT(inet_sk_error_report, · 57 unmodified lines
222 ),222 ),
223 223
224 TP_fast_assign(224 TP_fast_assign(
225 struct inet_sock *inet = inet_sk(sk);225 const struct inet_sock *inet = inet_sk(sk);
226 struct in6_addr *pin6;226 struct in6_addr *pin6;
227 __be32 *p32;227 __be32 *p32;
228 228
include/trace/events/tcp.h+1−1
@@ -67,7 +67,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb, · 66 unmodified lines
67 ),67 ),
68 68
69 TP_fast_assign(69 TP_fast_assign(
70 struct inet_sock *inet = inet_sk(sk);70 const struct inet_sock *inet = inet_sk(sk);
71 __be32 *p32;71 __be32 *p32;
72 72
73 __entry->skbaddr = skb;73 __entry->skbaddr = skb;