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 samples (9 of 1925 files). Show all

Unified · Split

9 files
  1. samples/bpf/cpustat_kern.c +2 −2
  2. samples/bpf/hbm.c +3 −2
  3. samples/bpf/ibumad_kern.c +2 −2
  4. samples/bpf/lwt_len_hist.sh +1 −1
  5. samples/bpf/offwaketime_kern.c +1 −1
  6. samples/bpf/sampleip_user.c +9 −2
  7. samples/bpf/task_fd_query_user.c +2 −2
  8. samples/bpf/test_lwt_bpf.sh +1 −1
  9. samples/bpf/test_overhead_tp.bpf.c +2 −2
samples/bpf/cpustat_kern.c+2−2
@@ -76,8 +76,8 @@ struct { · 75 unmodified lines
7676
7777 /*
7878 * The trace events for cpu_idle and cpu_frequency are taken from:
79− * /sys/kernel/debug/tracing/events/power/cpu_idle/format
80− * /sys/kernel/debug/tracing/events/power/cpu_frequency/format
79+ * /sys/kernel/tracing/events/power/cpu_idle/format
80+ * /sys/kernel/tracing/events/power/cpu_frequency/format
8181 *
8282 * These two events have same format, so define one common structure.
8383 */
samples/bpf/hbm.c+3−2
@@ -65,7 +65,7 @@ static void Usage(void); · 64 unmodified lines
6565 static void read_trace_pipe2(void);
6666 static void do_error(char *msg, bool errno_flag);
6767
68−#define DEBUGFS "/sys/kernel/debug/tracing/"
68+#define TRACEFS "/sys/kernel/tracing/"
6969
7070 static struct bpf_program *bpf_prog;
7171 static struct bpf_object *obj;
@@ -77,7 +77,7 @@ static void read_trace_pipe2(void) · 5 unmodified lines
7777 FILE *outf;
7878 char *outFname = "hbm_out.log";
7979
80− trace_fd = open(DEBUGFS "trace_pipe", O_RDONLY, 0);
80+ trace_fd = open(TRACEFS "trace_pipe", O_RDONLY, 0);
8181 if (trace_fd < 0) {
8282 printf("Error opening trace_pipe\n");
8383 return;
@@ -315,6 +315,7 @@ static int run_bpf_prog(char *prog, int cg_id) · 231 unmodified lines
315315 fout = fopen(fname, "w");
316316 fprintf(fout, "id:%d\n", cg_id);
317317 fprintf(fout, "ERROR: Could not lookup queue_stats\n");
318+ fclose(fout);
318319 } else if (stats_flag && qstats.lastPacketTime >
319320 qstats.firstPacketTime) {
320321 long long delta_us = (qstats.lastPacketTime -
samples/bpf/ibumad_kern.c+2−2
@@ -39,8 +39,8 @@ struct { · 38 unmodified lines
3939 /* Taken from the current format defined in
4040 * include/trace/events/ib_umad.h
4141 * and
42− * /sys/kernel/debug/tracing/events/ib_umad/ib_umad_read/format
43− * /sys/kernel/debug/tracing/events/ib_umad/ib_umad_write/format
42+ * /sys/kernel/tracing/events/ib_umad/ib_umad_read/format
43+ * /sys/kernel/tracing/events/ib_umad/ib_umad_write/format
4444 */
4545 struct ib_umad_rw_args {
4646 u64 pad;
samples/bpf/lwt_len_hist.sh+1−1
@@ -5,7 +5,7 @@ NS1=lwt_ns1 · 4 unmodified lines
55 VETH0=tst_lwt1a
66 VETH1=tst_lwt1b
77 BPF_PROG=lwt_len_hist.bpf.o
8−TRACE_ROOT=/sys/kernel/debug/tracing
8+TRACE_ROOT=/sys/kernel/tracing
99
1010 function cleanup {
1111 # To reset saved histogram, remove pinned map
samples/bpf/offwaketime_kern.c+1−1
@@ -110,7 +110,7 @@ static inline int update_counts(void *ctx, u32 pid, u64 delta) · 109 unmodified lines
110110 }
111111
112112 #if 1
113−/* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format */
113+/* taken from /sys/kernel/tracing/events/sched/sched_switch/format */
114114 struct sched_switch_args {
115115 unsigned long long pad;
116116 char prev_comm[TASK_COMM_LEN];
samples/bpf/sampleip_user.c+9−2
@@ -21,10 +21,10 @@ · 20 unmodified lines
2121 #define DEFAULT_FREQ 99
2222 #define DEFAULT_SECS 5
2323 #define MAX_IPS 8192
24−#define PAGE_OFFSET 0xffff880000000000
2524
2625 static int map_fd;
2726 static int nr_cpus;
27+static long _text_addr;
2828
2929 static void usage(void)
3030 {
@@ -108,7 +108,7 @@ static void print_ip_map(int fd) · 77 unmodified lines
108108 /* sort and print */
109109 qsort(counts, max, sizeof(struct ipcount), count_cmp);
110110 for (i = 0; i < max; i++) {
111− if (counts[i].ip > PAGE_OFFSET) {
111+ if (counts[i].ip > _text_addr) {
112112 sym = ksym_search(counts[i].ip);
113113 if (!sym) {
114114 printf("ksym not found. Is kallsyms loaded?\n");
@@ -169,6 +169,13 @@ int main(int argc, char **argv) · 54 unmodified lines
169169 return 2;
170170 }
171171
172+ /* used to determine whether the address is kernel space */
173+ _text_addr = ksym_get_addr("_text");
174+ if (!_text_addr) {
175+ fprintf(stderr, "ERROR: no '_text' in /proc/kallsyms\n");
176+ return 3;
177+ }
178+
172179 /* create perf FDs for each CPU */
173180 nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
174181 links = calloc(nr_cpus, sizeof(struct bpf_link *));
samples/bpf/task_fd_query_user.c+2−2
@@ -235,7 +235,7 @@ static int test_debug_fs_uprobe(char *binary_path, long offset, bool is_return) · 234 unmodified lines
235235 struct bpf_link *link;
236236 ssize_t bytes;
237237
238− snprintf(buf, sizeof(buf), "/sys/kernel/debug/tracing/%s_events",
238+ snprintf(buf, sizeof(buf), "/sys/kernel/tracing/%s_events",
239239 event_type);
240240 kfd = open(buf, O_WRONLY | O_TRUNC, 0);
241241 CHECK_PERROR_RET(kfd < 0);
@@ -252,7 +252,7 @@ static int test_debug_fs_uprobe(char *binary_path, long offset, bool is_return) · 10 unmodified lines
252252 close(kfd);
253253 kfd = -1;
254254
255− snprintf(buf, sizeof(buf), "/sys/kernel/debug/tracing/events/%ss/%s/id",
255+ snprintf(buf, sizeof(buf), "/sys/kernel/tracing/events/%ss/%s/id",
256256 event_type, event_alias);
257257 efd = open(buf, O_RDONLY, 0);
258258 CHECK_PERROR_RET(efd < 0);
samples/bpf/test_lwt_bpf.sh+1−1
@@ -21,7 +21,7 @@ IP_LOCAL="192.168.99.1" · 20 unmodified lines
2121
2222 PROG_SRC="test_lwt_bpf.c"
2323 BPF_PROG="test_lwt_bpf.o"
24−TRACE_ROOT=/sys/kernel/debug/tracing
24+TRACE_ROOT=/sys/kernel/tracing
2525 CONTEXT_INFO=$(cat ${TRACE_ROOT}/trace_options | grep context)
2626
2727 function lookup_mac()
samples/bpf/test_overhead_tp.bpf.c+2−2
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 #include "vmlinux.h"
88 #include <bpf/bpf_helpers.h>
99
10−/* from /sys/kernel/debug/tracing/events/task/task_rename/format */
10+/* from /sys/kernel/tracing/events/task/task_rename/format */
1111 struct task_rename {
1212 __u64 pad;
1313 __u32 pid;
@@ -21,7 +21,7 @@ int prog(struct task_rename *ctx) · 7 unmodified lines
2121 return 0;
2222 }
2323
24−/* from /sys/kernel/debug/tracing/events/fib/fib_table_lookup/format */
24+/* from /sys/kernel/tracing/events/fib/fib_table_lookup/format */
2525 struct fib_table_lookup {
2626 __u64 pad;
2727 __u32 tb_id;