History

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

Pull networking changes from Paolo Abeni: "Core: - Refactor the forward memory allocation to better cope with memory pressure with many open sockets, moving from a per socket cache to a per-CPU one - Replace rwlocks with RCU for better fairness in ping, raw sockets and IP multicast router. - Network-side support for IO uring zero-copy send. - A few skb drop reason improvements, including codegen the source file with string mapping instead of using macro magic. - Rename reference tracking helpers to a more consistent netdev_* schema. - Adapt u64_stats_t type to address load/store tearing issues. - Refine debug helper usage to reduce the log noise caused by bots. BPF: - Improve socket map performance, avoiding skb cloning on read operation. - Add support for 64 bits enum, to match types exposed by kernel. - Introduce support for sleepable uprobes program. - Introduce support for enum textual representation in libbpf. - New helpers to implement synproxy with eBPF/XDP. - Improve loop performances, inlining indirect calls when possible. - Removed all the deprecated libbpf APIs. - Implement new eBPF-based LSM flavor. - Add type match support, which allow accurate queries to the eBPF used types. - A few TCP congetsion control framework usability improvements. - Add new infrastructure to manipulate CT entries via eBPF programs. - Allow for livepatch (KLP) and BPF trampolines to attach to the same kernel function. Protocols: - Introduce per network namespace lookup tables for unix sockets, increasing scalability and reducing contention. - Preparation work for Wi-Fi 7 Multi-Link Operation (MLO) support. - Add support to forciby close TIME_WAIT TCP sockets via user-space tools. - Significant performance improvement for the TLS 1.3 receive path, both for zero-copy and not-zero-copy. - Support for changing the initial MTPCP subflow priority/backup status - Introduce virtually contingus buffers for sockets over RDMA, to cope better with memory pressure. - Extend CAN ethtool support with timestamping capabilities - Refactor CAN build infrastructure to allow building only the needed features. Driver API: - Remove devlink mutex to allow parallel commands on multiple links. - Add support for pause stats in distributed switch. - Implement devlink helpers to query and flash line cards. - New helper for phy mode to register conversion. New hardware / drivers: - Ethernet DSA driver for the rockchip mt7531 on BPI-R2 Pro. - Ethernet DSA driver for the Renesas RZ/N1 A5PSW switch. - Ethernet DSA driver for the Microchip LAN937x switch. - Ethernet PHY driver for the Aquantia AQR113C EPHY. - CAN driver for the OBD-II ELM327 interface. - CAN driver for RZ/N1 SJA1000 CAN controller. - Bluetooth: Infineon CYW55572 Wi-Fi plus Bluetooth combo device. Drivers: - Intel Ethernet NICs: - i40e: add support for vlan pruning - i40e: add support for XDP framented packets - ice: improved vlan offload support - ice: add support for PPPoE offload - Mellanox Ethernet (mlx5) - refactor packet steering offload for performance and scalability - extend support for TC offload - refactor devlink code to clean-up the locking schema - support stacked vlans for bridge offloads - use TLS objects pool to improve connection rate - Netronome Ethernet NICs (nfp): - extend support for IPv6 fields mangling offload - add support for vepa mode in HW bridge - better support for virtio data path acceleration (VDPA) - enable TSO by default - Microsoft vNIC driver (mana) - add support for XDP redirect - Others Ethernet drivers: - bonding: add per-port priority support - microchip lan743x: extend phy support - Fungible funeth: support UDP segmentation offload and XDP xmit - Solarflare EF100: add support for virtual function representors - MediaTek SoC: add XDP support - Mellanox Ethernet/IB switch (mlxsw): - dropped support for unreleased H/W (XM router). - improved stats accuracy - unified bridge model coversion improving scalability (parts 1-6) - support for PTP in Spectrum-2 asics - Broadcom PHYs - add PTP support for BCM54210E - add support for the BCM53128 internal PHY - Marvell Ethernet switches (prestera): - implement support for multicast forwarding offload - Embedded Ethernet switches: - refactor OcteonTx MAC filter for better scalability - improve TC H/W offload for the Felix driver - refactor the Microchip ksz8 and ksz9477 drivers to share the probe code (parts 1, 2), add support for phylink mac configuration - Other WiFi: - Microchip wilc1000: diable WEP support and enable WPA3 - Atheros ath10k: encapsulation offload support Old code removal: - Neterion vxge ethernet driver: this is untouched since more than 10 years" * tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1890 commits) doc: sfp-phylink: Fix a broken reference wireguard: selftests: support UML wireguard: allowedips: don't corrupt stack when detecting overflow wireguard: selftests: update config fragments wireguard: ratelimiter: use hrtimer in selftest net/mlx5e: xsk: Discard unaligned XSK frames on striding RQ net: usb: ax88179_178a: Bind only to vendor-specific interface selftests: net: fix IOAM test skip return code net: usb: make USB_RTL8153_ECM non user configurable net: marvell: prestera: remove reduntant code octeontx2-pf: Reduce minimum mtu size to 60 net: devlink: Fix missing mutex_unlock() call net/tls: Remove redundant workqueue flush before destroy net: txgbe: Fix an error handling path in txgbe_probe() net: dsa: Fix spelling mistakes and cleanup code Documentation: devlink: add add devlink-selftests to the table of contents dccp: put dccp_qpolicy_full() and dccp_qpolicy_push() in the same lock net: ionic: fix error check for vlan flags in ionic_set_nic_features() net: ice: fix error NETIF_F_HW_VLAN_CTAG_FILTER check in ice_vsi_sync_fltr() nfp: flower: add support for tunnel offload without key ID ...

Linus Torvalds committed 4 years ago

Commit f86d1fb2 parents 526942b 7c6327c1753 files · +93690 −64652Browse files

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

Unified · Split

3 files
  1. tools/include/uapi/linux/bpf.h +91 −5
  2. tools/include/uapi/linux/btf.h +14 −3
  3. tools/include/uapi/linux/if_link.h +1 −0
tools/include/uapi/linux/bpf.h+91−5
@@ -998,6 +998,7 @@ enum bpf_attach_type { · 997 unmodified lines
998998 BPF_SK_REUSEPORT_SELECT_OR_MIGRATE,
999999 BPF_PERF_EVENT,
10001000 BPF_TRACE_KPROBE_MULTI,
1001+ BPF_LSM_CGROUP,
10011002 __MAX_BPF_ATTACH_TYPE
10021003 };
10031004
@@ -1431,6 +1432,7 @@ union bpf_attr { · 427 unmodified lines
14311432 __u32 attach_flags;
14321433 __aligned_u64 prog_ids;
14331434 __u32 prog_cnt;
1435+ __aligned_u64 prog_attach_flags; /* output: per-program attach_flags */
14341436 } query;
14351437
14361438 struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
@@ -2359,7 +2361,8 @@ union bpf_attr { · 922 unmodified lines
23592361 * Pull in non-linear data in case the *skb* is non-linear and not
23602362 * all of *len* are part of the linear section. Make *len* bytes
23612363 * from *skb* readable and writable. If a zero value is passed for
2362− * *len*, then the whole length of the *skb* is pulled.
2364+ * *len*, then all bytes in the linear part of *skb* will be made
2365+ * readable and writable.
23632366 *
23642367 * This helper is only needed for reading and writing with direct
23652368 * packet access.
@@ -3597,10 +3600,11 @@ union bpf_attr { · 1231 unmodified lines
35973600 *
35983601 * *iph* points to the start of the IPv4 or IPv6 header, while
35993602 * *iph_len* contains **sizeof**\ (**struct iphdr**) or
3600− * **sizeof**\ (**struct ip6hdr**).
3603+ * **sizeof**\ (**struct ipv6hdr**).
36013604 *
36023605 * *th* points to the start of the TCP header, while *th_len*
3603− * contains **sizeof**\ (**struct tcphdr**).
3606+ * contains the length of the TCP header (at least
3607+ * **sizeof**\ (**struct tcphdr**)).
36043608 * Return
36053609 * 0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
36063610 * error otherwise.
@@ -3783,10 +3787,11 @@ union bpf_attr { · 176 unmodified lines
37833787 *
37843788 * *iph* points to the start of the IPv4 or IPv6 header, while
37853789 * *iph_len* contains **sizeof**\ (**struct iphdr**) or
3786− * **sizeof**\ (**struct ip6hdr**).
3790+ * **sizeof**\ (**struct ipv6hdr**).
37873791 *
37883792 * *th* points to the start of the TCP header, while *th_len*
3789− * contains the length of the TCP header.
3793+ * contains the length of the TCP header with options (at least
3794+ * **sizeof**\ (**struct tcphdr**)).
37903795 * Return
37913796 * On success, lower 32 bits hold the generated SYN cookie in
37923797 * followed by 16 bits which hold the MSS value for that cookie,
@@ -5252,6 +5257,80 @@ union bpf_attr { · 1459 unmodified lines
52525257 * Pointer to the underlying dynptr data, NULL if the dynptr is
52535258 * read-only, if the dynptr is invalid, or if the offset and length
52545259 * is out of bounds.
5260+ *
5261+ * s64 bpf_tcp_raw_gen_syncookie_ipv4(struct iphdr *iph, struct tcphdr *th, u32 th_len)
5262+ * Description
5263+ * Try to issue a SYN cookie for the packet with corresponding
5264+ * IPv4/TCP headers, *iph* and *th*, without depending on a
5265+ * listening socket.
5266+ *
5267+ * *iph* points to the IPv4 header.
5268+ *
5269+ * *th* points to the start of the TCP header, while *th_len*
5270+ * contains the length of the TCP header (at least
5271+ * **sizeof**\ (**struct tcphdr**)).
5272+ * Return
5273+ * On success, lower 32 bits hold the generated SYN cookie in
5274+ * followed by 16 bits which hold the MSS value for that cookie,
5275+ * and the top 16 bits are unused.
5276+ *
5277+ * On failure, the returned value is one of the following:
5278+ *
5279+ * **-EINVAL** if *th_len* is invalid.
5280+ *
5281+ * s64 bpf_tcp_raw_gen_syncookie_ipv6(struct ipv6hdr *iph, struct tcphdr *th, u32 th_len)
5282+ * Description
5283+ * Try to issue a SYN cookie for the packet with corresponding
5284+ * IPv6/TCP headers, *iph* and *th*, without depending on a
5285+ * listening socket.
5286+ *
5287+ * *iph* points to the IPv6 header.
5288+ *
5289+ * *th* points to the start of the TCP header, while *th_len*
5290+ * contains the length of the TCP header (at least
5291+ * **sizeof**\ (**struct tcphdr**)).
5292+ * Return
5293+ * On success, lower 32 bits hold the generated SYN cookie in
5294+ * followed by 16 bits which hold the MSS value for that cookie,
5295+ * and the top 16 bits are unused.
5296+ *
5297+ * On failure, the returned value is one of the following:
5298+ *
5299+ * **-EINVAL** if *th_len* is invalid.
5300+ *
5301+ * **-EPROTONOSUPPORT** if CONFIG_IPV6 is not builtin.
5302+ *
5303+ * long bpf_tcp_raw_check_syncookie_ipv4(struct iphdr *iph, struct tcphdr *th)
5304+ * Description
5305+ * Check whether *iph* and *th* contain a valid SYN cookie ACK
5306+ * without depending on a listening socket.
5307+ *
5308+ * *iph* points to the IPv4 header.
5309+ *
5310+ * *th* points to the TCP header.
5311+ * Return
5312+ * 0 if *iph* and *th* are a valid SYN cookie ACK.
5313+ *
5314+ * On failure, the returned value is one of the following:
5315+ *
5316+ * **-EACCES** if the SYN cookie is not valid.
5317+ *
5318+ * long bpf_tcp_raw_check_syncookie_ipv6(struct ipv6hdr *iph, struct tcphdr *th)
5319+ * Description
5320+ * Check whether *iph* and *th* contain a valid SYN cookie ACK
5321+ * without depending on a listening socket.
5322+ *
5323+ * *iph* points to the IPv6 header.
5324+ *
5325+ * *th* points to the TCP header.
5326+ * Return
5327+ * 0 if *iph* and *th* are a valid SYN cookie ACK.
5328+ *
5329+ * On failure, the returned value is one of the following:
5330+ *
5331+ * **-EACCES** if the SYN cookie is not valid.
5332+ *
5333+ * **-EPROTONOSUPPORT** if CONFIG_IPV6 is not builtin.
52555334 */
52565335 #define __BPF_FUNC_MAPPER(FN) \
52575336 FN(unspec), \
@@ -5458,6 +5537,10 @@ union bpf_attr { · 200 unmodified lines
54585537 FN(dynptr_read), \
54595538 FN(dynptr_write), \
54605539 FN(dynptr_data), \
5540+ FN(tcp_raw_gen_syncookie_ipv4), \
5541+ FN(tcp_raw_gen_syncookie_ipv6), \
5542+ FN(tcp_raw_check_syncookie_ipv4), \
5543+ FN(tcp_raw_check_syncookie_ipv6), \
54615544 /* */
54625545
54635546 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -5998,6 +6081,8 @@ struct bpf_prog_info { · 534 unmodified lines
59986081 __u64 run_cnt;
59996082 __u64 recursion_misses;
60006083 __u32 verified_insns;
6084+ __u32 attach_btf_obj_id;
6085+ __u32 attach_btf_id;
60016086 } __attribute__((aligned(8)));
60026087
60036088 struct bpf_map_info {
@@ -6705,6 +6790,7 @@ enum bpf_core_relo_kind { · 701 unmodified lines
67056790 BPF_CORE_TYPE_SIZE = 9, /* type size in bytes */
67066791 BPF_CORE_ENUMVAL_EXISTS = 10, /* enum value existence in target kernel */
67076792 BPF_CORE_ENUMVAL_VALUE = 11, /* enum value integer value */
6793+ BPF_CORE_TYPE_MATCHES = 12, /* type match in target kernel */
67086794 };
67096795
67106796 /*
tools/include/uapi/linux/btf.h+14−3
@@ -36,10 +36,10 @@ struct btf_type { · 35 unmodified lines
3636 * bits 24-28: kind (e.g. int, ptr, array...etc)
3737 * bits 29-30: unused
3838 * bit 31: kind_flag, currently used by
39− * struct, union and fwd
39+ * struct, union, enum, fwd and enum64
4040 */
4141 __u32 info;
42− /* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
42+ /* "size" is used by INT, ENUM, STRUCT, UNION, DATASEC and ENUM64.
4343 * "size" tells the size of the type it is describing.
4444 *
4545 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
@@ -63,7 +63,7 @@ enum { · 17 unmodified lines
6363 BTF_KIND_ARRAY = 3, /* Array */
6464 BTF_KIND_STRUCT = 4, /* Struct */
6565 BTF_KIND_UNION = 5, /* Union */
66− BTF_KIND_ENUM = 6, /* Enumeration */
66+ BTF_KIND_ENUM = 6, /* Enumeration up to 32-bit values */
6767 BTF_KIND_FWD = 7, /* Forward */
6868 BTF_KIND_TYPEDEF = 8, /* Typedef */
6969 BTF_KIND_VOLATILE = 9, /* Volatile */
@@ -76,6 +76,7 @@ enum { · 6 unmodified lines
7676 BTF_KIND_FLOAT = 16, /* Floating point */
7777 BTF_KIND_DECL_TAG = 17, /* Decl Tag */
7878 BTF_KIND_TYPE_TAG = 18, /* Type Tag */
79+ BTF_KIND_ENUM64 = 19, /* Enumeration up to 64-bit values */
7980
8081 NR_BTF_KINDS,
8182 BTF_KIND_MAX = NR_BTF_KINDS - 1,
@@ -186,4 +187,14 @@ struct btf_decl_tag { · 104 unmodified lines
186187 __s32 component_idx;
187188 };
188189
190+/* BTF_KIND_ENUM64 is followed by multiple "struct btf_enum64".
191+ * The exact number of btf_enum64 is stored in the vlen (of the
192+ * info in "struct btf_type").
193+ */
194+struct btf_enum64 {
195+ __u32 name_off;
196+ __u32 val_lo32;
197+ __u32 val_hi32;
198+};
199+
189200 #endif /* _UAPI__LINUX_BTF_H__ */
tools/include/uapi/linux/if_link.h+1−0
@@ -890,6 +890,7 @@ enum { · 889 unmodified lines
890890 IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
891891 IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
892892 IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
893+ IFLA_BOND_SLAVE_PRIO,
893894 __IFLA_BOND_SLAVE_MAX,
894895 };
895896

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t