History

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

Pull networking updates from Paolo Abeni: "The most interesting thing is probably the networking structs reorganization and a significant amount of changes is around self-tests. Core & protocols: - Analyze and reorganize core networking structs (socks, netdev, netns, mibs) to optimize cacheline consumption and set up build time warnings to safeguard against future header changes This improves TCP performances with many concurrent connections up to 40% - Add page-pool netlink-based introspection, exposing the memory usage and recycling stats. This helps indentify bad PP users and possible leaks - Refine TCP/DCCP source port selection to no longer favor even source port at connect() time when IP_LOCAL_PORT_RANGE is set. This lowers the time taken by connect() for hosts having many active connections to the same destination - Refactor the TCP bind conflict code, shrinking related socket structs - Refactor TCP SYN-Cookie handling, as a preparation step to allow arbitrary SYN-Cookie processing via eBPF - Tune optmem_max for 0-copy usage, increasing the default value to 128KB and namespecifying it - Allow coalescing for cloned skbs coming from page pools, improving RX performances with some common configurations - Reduce extension header parsing overhead at GRO time - Add bridge MDB bulk deletion support, allowing user-space to request the deletion of matching entries - Reorder nftables struct members, to keep data accessed by the datapath first - Introduce TC block ports tracking and use. This allows supporting multicast-like behavior at the TC layer - Remove UAPI support for retired TC qdiscs (dsmark, CBQ and ATM) and classifiers (RSVP and tcindex) - More data-race annotations - Extend the diag interface to dump TCP bound-only sockets - Conditional notification of events for TC qdisc class and actions - Support for WPAN dynamic associations with nearby devices, to form a sub-network using a specific PAN ID - Implement SMCv2.1 virtual ISM device support - Add support for Batman-avd mulicast packet type BPF: - Tons of verifier improvements: - BPF register bounds logic and range support along with a large test suite - log improvements - complete precision tracking support for register spills - track aligned STACK_ZERO cases as imprecise spilled registers. This improves the verifier "instructions processed" metric from single digit to 50-60% for some programs - support for user's global BPF subprogram arguments with few commonly requested annotations for a better developer experience - support tracking of BPF_JNE which helps cases when the compiler transforms (unsigned) "a > 0" into "if a == 0 goto xxx" and the like - several fixes - 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 - Fix kCFI bugs in BPF all forms of indirect calls from BPF into kernel and from kernel into BPF work with CFI enabled. This allows BPF to work with CONFIG_FINEIBT=y - 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 - Support uid/gid options when mounting bpffs - Add a new kfunc which acquires the associated cgroup of a task within a specific cgroup v1 hierarchy where the latter is identified by its id - Extend verifier to allow bpf_refcount_acquire() of a map value field obtained via direct load which is a use-case needed in sched_ext - Add BPF link_info support for uprobe multi link along with bpftool integration for the latter - Support for VLAN tag in XDP hints - Remove deprecated bpfilter kernel leftovers given the project is developed in user-space (https://github.com/facebook/bpfilter) Misc: - Support for parellel TC self-tests execution - Increase MPTCP self-tests coverage - Updated the bridge documentation, including several so-far undocumented features - Convert all the net self-tests to run in unique netns, to avoid random failures due to conflict and allow concurrent runs - Add TCP-AO self-tests - Add kunit tests for both cfg80211 and mac80211 - Autogenerate Netlink families documentation from YAML spec - Add yml-gen support for fixed headers and recursive nests, the tool can now generate user-space code for all genetlink families for which we have specs - A bunch of additional module descriptions fixes - Catch incorrect freeing of pages belonging to a page pool Driver API: - Rust abstractions for network PHY drivers; do not cover yet the full C API, but already allow implementing functional PHY drivers in rust - Introduce queue and NAPI support in the netdev Netlink interface, allowing complete access to the device <> NAPIs <> queues relationship - Introduce notifications filtering for devlink to allow control application scale to thousands of instances - Improve PHY validation, requesting rate matching information for each ethtool link mode supported by both the PHY and host - Add support for ethtool symmetric-xor RSS hash - ACPI based Wifi band RFI (WBRF) mitigation feature for the AMD platform - Expose pin fractional frequency offset value over new DPLL generic netlink attribute - Convert older drivers to platform remove callback returning void - Add support for PHY package MMD read/write New hardware / drivers: - Ethernet: - Octeon CN10K devices - Broadcom 5760X P7 - Qualcomm SM8550 SoC - Texas Instrument DP83TG720S PHY - Bluetooth: - IMC Networks Bluetooth radio Removed: - WiFi: - libertas 16-bit PCMCIA support - Atmel at76c50x drivers - HostAP ISA/PCMCIA style 802.11b driver - zd1201 802.11b USB dongles - Orinoco ISA/PCMCIA 802.11b driver - Aviator/Raytheon driver - Planet WL3501 driver - RNDIS USB 802.11b driver Driver updates: - Ethernet high-speed NICs: - Intel (100G, ice, idpf): - allow one by one port representors creation and removal - add temperature and clock information reporting - add get/set for ethtool's header split ringparam - add again FW logging - adds support switchdev hardware packet mirroring - iavf: implement symmetric-xor RSS hash - igc: add support for concurrent physical and free-running timers - i40e: increase the allowable descriptors - nVidia/Mellanox: - Preparation for Socket-Direct multi-dev netdev. That will allow in future releases combining multiple PFs devices attached to different NUMA nodes under the same netdev - Broadcom (bnxt): - TX completion handling improvements - add basic ntuple filter support - reduce MSIX vectors usage for MQPRIO offload - add VXLAN support, USO offload and TX coalesce completion for P7 - Marvell Octeon EP: - xmit-more support - add PF-VF mailbox support and use it for FW notifications for VFs - Wangxun (ngbe/txgbe): - implement ethtool functions to operate pause param, ring param, coalesce channel number and msglevel - Netronome/Corigine (nfp): - add flow-steering support - support UDP segmentation offload - Ethernet NICs embedded, slower, virtual: - Xilinx AXI: remove duplicate DMA code adopting the dma engine driver - stmmac: add support for HW-accelerated VLAN stripping - TI AM654x sw: add mqprio, frame preemption & coalescing - gve: add support for non-4k page sizes. - virtio-net: support dynamic coalescing moderation - nVidia/Mellanox Ethernet datacenter switches: - allow firmware upgrade without a reboot - more flexible support for bridge flooding via the compressed FID flooding mode - Ethernet embedded switches: - Microchip: - fine-tune flow control and speed configurations in KSZ8xxx - KSZ88X3: enable setting rmii reference - Renesas: - add jumbo frames support - Marvell: - 88E6xxx: add "eth-mac" and "rmon" stats support - Ethernet PHYs: - aquantia: add firmware load support - at803x: refactor the driver to simplify adding support for more chip variants - NXP C45 TJA11xx: Add MACsec offload support - Wifi: - MediaTek (mt76): - NVMEM EEPROM improvements - mt7996 Extremely High Throughput (EHT) improvements - mt7996 Wireless Ethernet Dispatcher (WED) support - mt7996 36-bit DMA support - Qualcomm (ath12k): - support for a single MSI vector - WCN7850: support AP mode - Intel (iwlwifi): - new debugfs file fw_dbg_clear - allow concurrent P2P operation on DFS channels - Bluetooth: - QCA2066: support HFP offload - ISO: more broadcast-related improvements - NXP: better recovery in case receiver/transmitter get out of sync" * tag 'net-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1714 commits) lan78xx: remove redundant statement in lan78xx_get_eee lan743x: remove redundant statement in lan743x_ethtool_get_eee bnxt_en: Fix RCU locking for ntuple filters in bnxt_rx_flow_steer() bnxt_en: Fix RCU locking for ntuple filters in bnxt_srxclsrldel() bnxt_en: Remove unneeded variable in bnxt_hwrm_clear_vnic_filter() tcp: Revert no longer abort SYN_SENT when receiving some ICMP Revert "mlx5 updates 2023-12-20" Revert "net: stmmac: Enable Per DMA Channel interrupt" ipvlan: Remove usage of the deprecated ida_simple_xx() API ipvlan: Fix a typo in a comment net/sched: Remove ipt action tests net: stmmac: Use interrupt mode INTM=1 for per channel irq net: stmmac: Add support for TX/RX channel interrupt net: stmmac: Make MSI interrupt routine generic dt-bindings: net: snps,dwmac: per channel irq net: phy: at803x: make read_status more generic net: phy: at803x: add support for cdt cross short test for qca808x net: phy: at803x: refactor qca808x cable test get status function net: phy: at803x: generalize cdt fault length function net: ethernet: cortina: Drop TSO support ...

Linus Torvalds committed 2 years ago

Commit 3e7aeb72 parents de927f6 a7fe0881785 files · +91377 −108971Browse files

Showing the changes to tools/include/uapi/linux (5 of 1785 files). Show all

Unified · Split

5 files
  1. tools/include/uapi/linux/bpf.h +26 −17
  2. tools/include/uapi/linux/if_xdp.h +55 −6
  3. tools/include/uapi/linux/netdev.h +78 −2
  4. tools/include/uapi/linux/pkt_cls.h +0 −47
  5. tools/include/uapi/linux/pkt_sched.h +0 −109
tools/include/uapi/linux/bpf.h+26−17
@@ -1074,9 +1074,11 @@ enum bpf_link_type { · 1073 unmodified lines
1074 BPF_LINK_TYPE_TCX = 11,1074 BPF_LINK_TYPE_TCX = 11,
1075 BPF_LINK_TYPE_UPROBE_MULTI = 12,1075 BPF_LINK_TYPE_UPROBE_MULTI = 12,
1076 BPF_LINK_TYPE_NETKIT = 13,1076 BPF_LINK_TYPE_NETKIT = 13,
1077 MAX_BPF_LINK_TYPE,1077 __MAX_BPF_LINK_TYPE,
1078};1078};
1079 1079
1080#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE
1081
1080enum bpf_perf_event_type {1082enum bpf_perf_event_type {
1081 BPF_PERF_EVENT_UNSPEC = 0,1083 BPF_PERF_EVENT_UNSPEC = 0,
1082 BPF_PERF_EVENT_UPROBE = 1,1084 BPF_PERF_EVENT_UPROBE = 1,
@@ -1200,6 +1202,9 @@ enum bpf_perf_event_type { · 117 unmodified lines
1200 */1202 */
1201#define BPF_F_XDP_DEV_BOUND_ONLY (1U << 6)1203#define BPF_F_XDP_DEV_BOUND_ONLY (1U << 6)
1202 1204
1205/* The verifier internal test flag. Behavior is undefined */
1206#define BPF_F_TEST_REG_INVARIANTS (1U << 7)
1207
1203/* link_create.kprobe_multi.flags used in LINK_CREATE command for1208/* link_create.kprobe_multi.flags used in LINK_CREATE command for
1204 * BPF_TRACE_KPROBE_MULTI attach type to create return probe.1209 * BPF_TRACE_KPROBE_MULTI attach type to create return probe.
1205 */1210 */
@@ -4517,6 +4522,8 @@ union bpf_attr { · 3311 unmodified lines
4517 * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags)4522 * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags)
4518 * Description4523 * Description
4519 * Return a user or a kernel stack in bpf program provided buffer.4524 * Return a user or a kernel stack in bpf program provided buffer.
4525 * Note: the user stack will only be populated if the *task* is
4526 * the current task; all other tasks will return -EOPNOTSUPP.
4520 * To achieve this, the helper needs *task*, which is a valid4527 * To achieve this, the helper needs *task*, which is a valid
4521 * pointer to **struct task_struct**. To store the stacktrace, the4528 * pointer to **struct task_struct**. To store the stacktrace, the
4522 * bpf program provides *buf* with a nonnegative *size*.4529 * bpf program provides *buf* with a nonnegative *size*.
@@ -4528,6 +4535,7 @@ union bpf_attr { · 5 unmodified lines
4528 *4535 *
4529 * **BPF_F_USER_STACK**4536 * **BPF_F_USER_STACK**
4530 * Collect a user space stack instead of a kernel stack.4537 * Collect a user space stack instead of a kernel stack.
4538 * The *task* must be the current task.
4531 * **BPF_F_USER_BUILD_ID**4539 * **BPF_F_USER_BUILD_ID**
4532 * Collect buildid+offset instead of ips for user stack,4540 * Collect buildid+offset instead of ips for user stack,
4533 * only valid if **BPF_F_USER_STACK** is also specified.4541 * only valid if **BPF_F_USER_STACK** is also specified.
@@ -6556,6 +6564,16 @@ struct bpf_link_info { · 2022 unmodified lines
6556 __u32 flags;6564 __u32 flags;
6557 __u64 missed;6565 __u64 missed;
6558 } kprobe_multi;6566 } kprobe_multi;
6567 struct {
6568 __aligned_u64 path;
6569 __aligned_u64 offsets;
6570 __aligned_u64 ref_ctr_offsets;
6571 __aligned_u64 cookies;
6572 __u32 path_size; /* in/out: real path size on success, including zero byte */
6573 __u32 count; /* in/out: uprobe_multi offsets/ref_ctr_offsets/cookies count */
6574 __u32 flags;
6575 __u32 pid;
6576 } uprobe_multi;
6559 struct {6577 struct {
6560 __u32 type; /* enum bpf_perf_event_type */6578 __u32 type; /* enum bpf_perf_event_type */
6561 __u32 :32;6579 __u32 :32;
@@ -7151,40 +7169,31 @@ struct bpf_spin_lock { · 589 unmodified lines
7151};7169};
7152 7170
7153struct bpf_timer {7171struct bpf_timer {
7154 __u64 :64;7172 __u64 __opaque[2];
7155 __u64 :64;
7156} __attribute__((aligned(8)));7173} __attribute__((aligned(8)));
7157 7174
7158struct bpf_dynptr {7175struct bpf_dynptr {
7159 __u64 :64;7176 __u64 __opaque[2];
7160 __u64 :64;
7161} __attribute__((aligned(8)));7177} __attribute__((aligned(8)));
7162 7178
7163struct bpf_list_head {7179struct bpf_list_head {
7164 __u64 :64;7180 __u64 __opaque[2];
7165 __u64 :64;
7166} __attribute__((aligned(8)));7181} __attribute__((aligned(8)));
7167 7182
7168struct bpf_list_node {7183struct bpf_list_node {
7169 __u64 :64;7184 __u64 __opaque[3];
7170 __u64 :64;
7171 __u64 :64;
7172} __attribute__((aligned(8)));7185} __attribute__((aligned(8)));
7173 7186
7174struct bpf_rb_root {7187struct bpf_rb_root {
7175 __u64 :64;7188 __u64 __opaque[2];
7176 __u64 :64;
7177} __attribute__((aligned(8)));7189} __attribute__((aligned(8)));
7178 7190
7179struct bpf_rb_node {7191struct bpf_rb_node {
7180 __u64 :64;7192 __u64 __opaque[4];
7181 __u64 :64;
7182 __u64 :64;
7183 __u64 :64;
7184} __attribute__((aligned(8)));7193} __attribute__((aligned(8)));
7185 7194
7186struct bpf_refcount {7195struct bpf_refcount {
7187 __u32 :32;7196 __u32 __opaque[1];
7188} __attribute__((aligned(4)));7197} __attribute__((aligned(4)));
7189 7198
7190struct bpf_sysctl {7199struct bpf_sysctl {
tools/include/uapi/linux/if_xdp.h+55−6
@@ -26,14 +26,20 @@ · 25 unmodified lines
26 */26 */
27#define XDP_USE_NEED_WAKEUP (1 << 3)27#define XDP_USE_NEED_WAKEUP (1 << 3)
28/* By setting this option, userspace application indicates that it can28/* By setting this option, userspace application indicates that it can
29 * handle multiple descriptors per packet thus enabling xsk core to split29 * handle multiple descriptors per packet thus enabling AF_XDP to split
30 * multi-buffer XDP frames into multiple Rx descriptors. Without this set30 * multi-buffer XDP frames into multiple Rx descriptors. Without this set
31 * such frames will be dropped by xsk.31 * such frames will be dropped.
32 */32 */
33#define XDP_USE_SG (1 << 4)33#define XDP_USE_SG (1 << 4)
34 34
35/* Flags for xsk_umem_config flags */35/* Flags for xsk_umem_config flags */
36#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)36#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)
37
38/* Force checksum calculation in software. Can be used for testing or
39 * working around potential HW issues. This option causes performance
40 * degradation and only works in XDP_COPY mode.
41 */
42#define XDP_UMEM_TX_SW_CSUM (1 << 1)
37 43
38struct sockaddr_xdp {44struct sockaddr_xdp {
39 __u16 sxdp_family;45 __u16 sxdp_family;
@@ -76,6 +82,7 @@ struct xdp_umem_reg { · 36 unmodified lines
76 __u32 chunk_size;82 __u32 chunk_size;
77 __u32 headroom;83 __u32 headroom;
78 __u32 flags;84 __u32 flags;
85 __u32 tx_metadata_len;
79};86};
80 87
81struct xdp_statistics {88struct xdp_statistics {
@@ -105,6 +112,41 @@ struct xdp_options { · 23 unmodified lines
105#define XSK_UNALIGNED_BUF_ADDR_MASK \112#define XSK_UNALIGNED_BUF_ADDR_MASK \
106 ((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)113 ((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)
107 114
115/* Request transmit timestamp. Upon completion, put it into tx_timestamp
116 * field of union xsk_tx_metadata.
117 */
118#define XDP_TXMD_FLAGS_TIMESTAMP (1 << 0)
119
120/* Request transmit checksum offload. Checksum start position and offset
121 * are communicated via csum_start and csum_offset fields of union
122 * xsk_tx_metadata.
123 */
124#define XDP_TXMD_FLAGS_CHECKSUM (1 << 1)
125
126/* AF_XDP offloads request. 'request' union member is consumed by the driver
127 * when the packet is being transmitted. 'completion' union member is
128 * filled by the driver when the transmit completion arrives.
129 */
130struct xsk_tx_metadata {
131 __u64 flags;
132
133 union {
134 struct {
135 /* XDP_TXMD_FLAGS_CHECKSUM */
136
137 /* Offset from desc->addr where checksumming should start. */
138 __u16 csum_start;
139 /* Offset from csum_start where checksum should be stored. */
140 __u16 csum_offset;
141 } request;
142
143 struct {
144 /* XDP_TXMD_FLAGS_TIMESTAMP */
145 __u64 tx_timestamp;
146 } completion;
147 };
148};
149
108/* Rx/Tx descriptor */150/* Rx/Tx descriptor */
109struct xdp_desc {151struct xdp_desc {
110 __u64 addr;152 __u64 addr;
@@ -112,9 +154,16 @@ struct xdp_desc { · 1 unmodified line
112 __u32 options;154 __u32 options;
113};155};
114 156
115/* Flag indicating packet constitutes of multiple buffers*/157/* UMEM descriptor is __u64 */
158
159/* Flag indicating that the packet continues with the buffer pointed out by the
160 * next frame in the ring. The end of the packet is signalled by setting this
161 * bit to zero. For single buffer packets, every descriptor has 'options' set
162 * to 0 and this maintains backward compatibility.
163 */
116#define XDP_PKT_CONTD (1 << 0)164#define XDP_PKT_CONTD (1 << 0)
117 165
118/* UMEM descriptor is __u64 */166/* TX packet carries valid metadata. */
167#define XDP_TX_METADATA (1 << 1)
119 168
120#endif /* _LINUX_IF_XDP_H */169#endif /* _LINUX_IF_XDP_H */
tools/include/uapi/linux/netdev.h+78−2
@@ -44,13 +44,30 @@ enum netdev_xdp_act { · 43 unmodified lines
44 * timestamp via bpf_xdp_metadata_rx_timestamp().44 * timestamp via bpf_xdp_metadata_rx_timestamp().
45 * @NETDEV_XDP_RX_METADATA_HASH: Device is capable of exposing receive packet45 * @NETDEV_XDP_RX_METADATA_HASH: Device is capable of exposing receive packet
46 * hash via bpf_xdp_metadata_rx_hash().46 * hash via bpf_xdp_metadata_rx_hash().
47 * @NETDEV_XDP_RX_METADATA_VLAN_TAG: Device is capable of exposing receive
48 * packet VLAN tag via bpf_xdp_metadata_rx_vlan_tag().
47 */49 */
48enum netdev_xdp_rx_metadata {50enum netdev_xdp_rx_metadata {
49 NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,51 NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,
50 NETDEV_XDP_RX_METADATA_HASH = 2,52 NETDEV_XDP_RX_METADATA_HASH = 2,
53 NETDEV_XDP_RX_METADATA_VLAN_TAG = 4,
54};
51 55
52 /* private: */56/**
53 NETDEV_XDP_RX_METADATA_MASK = 3,57 * enum netdev_xsk_flags
58 * @NETDEV_XSK_FLAGS_TX_TIMESTAMP: HW timestamping egress packets is supported
59 * by the driver.
60 * @NETDEV_XSK_FLAGS_TX_CHECKSUM: L3 checksum HW offload is supported by the
61 * driver.
62 */
63enum netdev_xsk_flags {
64 NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1,
65 NETDEV_XSK_FLAGS_TX_CHECKSUM = 2,
66};
67
68enum netdev_queue_type {
69 NETDEV_QUEUE_TYPE_RX,
70 NETDEV_QUEUE_TYPE_TX,
54};71};
55 72
56enum {73enum {
@@ -59,21 +76,80 @@ enum { · 2 unmodified lines
59 NETDEV_A_DEV_XDP_FEATURES,76 NETDEV_A_DEV_XDP_FEATURES,
60 NETDEV_A_DEV_XDP_ZC_MAX_SEGS,77 NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
61 NETDEV_A_DEV_XDP_RX_METADATA_FEATURES,78 NETDEV_A_DEV_XDP_RX_METADATA_FEATURES,
79 NETDEV_A_DEV_XSK_FEATURES,
62 80
63 __NETDEV_A_DEV_MAX,81 __NETDEV_A_DEV_MAX,
64 NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)82 NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)
65};83};
66 84
85enum {
86 NETDEV_A_PAGE_POOL_ID = 1,
87 NETDEV_A_PAGE_POOL_IFINDEX,
88 NETDEV_A_PAGE_POOL_NAPI_ID,
89 NETDEV_A_PAGE_POOL_INFLIGHT,
90 NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
91 NETDEV_A_PAGE_POOL_DETACH_TIME,
92
93 __NETDEV_A_PAGE_POOL_MAX,
94 NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)
95};
96
97enum {
98 NETDEV_A_PAGE_POOL_STATS_INFO = 1,
99 NETDEV_A_PAGE_POOL_STATS_ALLOC_FAST = 8,
100 NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW,
101 NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW_HIGH_ORDER,
102 NETDEV_A_PAGE_POOL_STATS_ALLOC_EMPTY,
103 NETDEV_A_PAGE_POOL_STATS_ALLOC_REFILL,
104 NETDEV_A_PAGE_POOL_STATS_ALLOC_WAIVE,
105 NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHED,
106 NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHE_FULL,
107 NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING,
108 NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING_FULL,
109 NETDEV_A_PAGE_POOL_STATS_RECYCLE_RELEASED_REFCNT,
110
111 __NETDEV_A_PAGE_POOL_STATS_MAX,
112 NETDEV_A_PAGE_POOL_STATS_MAX = (__NETDEV_A_PAGE_POOL_STATS_MAX - 1)
113};
114
115enum {
116 NETDEV_A_NAPI_IFINDEX = 1,
117 NETDEV_A_NAPI_ID,
118 NETDEV_A_NAPI_IRQ,
119 NETDEV_A_NAPI_PID,
120
121 __NETDEV_A_NAPI_MAX,
122 NETDEV_A_NAPI_MAX = (__NETDEV_A_NAPI_MAX - 1)
123};
124
125enum {
126 NETDEV_A_QUEUE_ID = 1,
127 NETDEV_A_QUEUE_IFINDEX,
128 NETDEV_A_QUEUE_TYPE,
129 NETDEV_A_QUEUE_NAPI_ID,
130
131 __NETDEV_A_QUEUE_MAX,
132 NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)
133};
134
67enum {135enum {
68 NETDEV_CMD_DEV_GET = 1,136 NETDEV_CMD_DEV_GET = 1,
69 NETDEV_CMD_DEV_ADD_NTF,137 NETDEV_CMD_DEV_ADD_NTF,
70 NETDEV_CMD_DEV_DEL_NTF,138 NETDEV_CMD_DEV_DEL_NTF,
71 NETDEV_CMD_DEV_CHANGE_NTF,139 NETDEV_CMD_DEV_CHANGE_NTF,
140 NETDEV_CMD_PAGE_POOL_GET,
141 NETDEV_CMD_PAGE_POOL_ADD_NTF,
142 NETDEV_CMD_PAGE_POOL_DEL_NTF,
143 NETDEV_CMD_PAGE_POOL_CHANGE_NTF,
144 NETDEV_CMD_PAGE_POOL_STATS_GET,
145 NETDEV_CMD_QUEUE_GET,
146 NETDEV_CMD_NAPI_GET,
72 147
73 __NETDEV_CMD_MAX,148 __NETDEV_CMD_MAX,
74 NETDEV_CMD_MAX = (__NETDEV_CMD_MAX - 1)149 NETDEV_CMD_MAX = (__NETDEV_CMD_MAX - 1)
75};150};
76 151
77#define NETDEV_MCGRP_MGMT "mgmt"152#define NETDEV_MCGRP_MGMT "mgmt"
153#define NETDEV_MCGRP_PAGE_POOL "page-pool"
78 154
79#endif /* _UAPI_LINUX_NETDEV_H */155#endif /* _UAPI_LINUX_NETDEV_H */
tools/include/uapi/linux/pkt_cls.h+0−47
@@ -204,37 +204,6 @@ struct tc_u32_pcnt { · 203 unmodified lines
204 204
205#define TC_U32_MAXDEPTH 8205#define TC_U32_MAXDEPTH 8
206 206
207
208/* RSVP filter */
209
210enum {
211 TCA_RSVP_UNSPEC,
212 TCA_RSVP_CLASSID,
213 TCA_RSVP_DST,
214 TCA_RSVP_SRC,
215 TCA_RSVP_PINFO,
216 TCA_RSVP_POLICE,
217 TCA_RSVP_ACT,
218 __TCA_RSVP_MAX
219};
220
221#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
222
223struct tc_rsvp_gpi {
224 __u32 key;
225 __u32 mask;
226 int offset;
227};
228
229struct tc_rsvp_pinfo {
230 struct tc_rsvp_gpi dpi;
231 struct tc_rsvp_gpi spi;
232 __u8 protocol;
233 __u8 tunnelid;
234 __u8 tunnelhdr;
235 __u8 pad;
236};
237
238/* ROUTE filter */207/* ROUTE filter */
239 208
240enum {209enum {
@@ -265,22 +234,6 @@ enum { · 24 unmodified lines
265 234
266#define TCA_FW_MAX (__TCA_FW_MAX - 1)235#define TCA_FW_MAX (__TCA_FW_MAX - 1)
267 236
268/* TC index filter */
269
270enum {
271 TCA_TCINDEX_UNSPEC,
272 TCA_TCINDEX_HASH,
273 TCA_TCINDEX_MASK,
274 TCA_TCINDEX_SHIFT,
275 TCA_TCINDEX_FALL_THROUGH,
276 TCA_TCINDEX_CLASSID,
277 TCA_TCINDEX_POLICE,
278 TCA_TCINDEX_ACT,
279 __TCA_TCINDEX_MAX
280};
281
282#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1)
283
284/* Flow filter */237/* Flow filter */
285 238
286enum {239enum {
tools/include/uapi/linux/pkt_sched.h+0−109
@@ -457,115 +457,6 @@ enum { · 456 unmodified lines
457 457
458#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)458#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
459 459
460
461/* CBQ section */
462
463#define TC_CBQ_MAXPRIO 8
464#define TC_CBQ_MAXLEVEL 8
465#define TC_CBQ_DEF_EWMA 5
466
467struct tc_cbq_lssopt {
468 unsigned char change;
469 unsigned char flags;
470#define TCF_CBQ_LSS_BOUNDED 1
471#define TCF_CBQ_LSS_ISOLATED 2
472 unsigned char ewma_log;
473 unsigned char level;
474#define TCF_CBQ_LSS_FLAGS 1
475#define TCF_CBQ_LSS_EWMA 2
476#define TCF_CBQ_LSS_MAXIDLE 4
477#define TCF_CBQ_LSS_MINIDLE 8
478#define TCF_CBQ_LSS_OFFTIME 0x10
479#define TCF_CBQ_LSS_AVPKT 0x20
480 __u32 maxidle;
481 __u32 minidle;
482 __u32 offtime;
483 __u32 avpkt;
484};
485
486struct tc_cbq_wrropt {
487 unsigned char flags;
488 unsigned char priority;
489 unsigned char cpriority;
490 unsigned char __reserved;
491 __u32 allot;
492 __u32 weight;
493};
494
495struct tc_cbq_ovl {
496 unsigned char strategy;
497#define TC_CBQ_OVL_CLASSIC 0
498#define TC_CBQ_OVL_DELAY 1
499#define TC_CBQ_OVL_LOWPRIO 2
500#define TC_CBQ_OVL_DROP 3
501#define TC_CBQ_OVL_RCLASSIC 4
502 unsigned char priority2;
503 __u16 pad;
504 __u32 penalty;
505};
506
507struct tc_cbq_police {
508 unsigned char police;
509 unsigned char __res1;
510 unsigned short __res2;
511};
512
513struct tc_cbq_fopt {
514 __u32 split;
515 __u32 defmap;
516 __u32 defchange;
517};
518
519struct tc_cbq_xstats {
520 __u32 borrows;
521 __u32 overactions;
522 __s32 avgidle;
523 __s32 undertime;
524};
525
526enum {
527 TCA_CBQ_UNSPEC,
528 TCA_CBQ_LSSOPT,
529 TCA_CBQ_WRROPT,
530 TCA_CBQ_FOPT,
531 TCA_CBQ_OVL_STRATEGY,
532 TCA_CBQ_RATE,
533 TCA_CBQ_RTAB,
534 TCA_CBQ_POLICE,
535 __TCA_CBQ_MAX,
536};
537
538#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1)
539
540/* dsmark section */
541
542enum {
543 TCA_DSMARK_UNSPEC,
544 TCA_DSMARK_INDICES,
545 TCA_DSMARK_DEFAULT_INDEX,
546 TCA_DSMARK_SET_TC_INDEX,
547 TCA_DSMARK_MASK,
548 TCA_DSMARK_VALUE,
549 __TCA_DSMARK_MAX,
550};
551
552#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
553
554/* ATM section */
555
556enum {
557 TCA_ATM_UNSPEC,
558 TCA_ATM_FD, /* file/socket descriptor */
559 TCA_ATM_PTR, /* pointer to descriptor - later */
560 TCA_ATM_HDR, /* LL header */
561 TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */
562 TCA_ATM_ADDR, /* PVC address (for output only) */
563 TCA_ATM_STATE, /* VC state (ATM_VS_*; for output only) */
564 __TCA_ATM_MAX,
565};
566
567#define TCA_ATM_MAX (__TCA_ATM_MAX - 1)
568
569/* Network emulator */460/* Network emulator */
570 461
571enum {462enum {