History

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

Pull networking fixes from Jakub Kicinski. "Including fixes from bpf and netfilter. Current release - regressions: - sock: fix parameter order in sock_setsockopt() Current release - new code bugs: - netfilter: nft_last: - fix incorrect arithmetic when restoring last used - honor NFTA_LAST_SET on restoration Previous releases - regressions: - udp: properly flush normal packet at GRO time - sfc: ensure correct number of XDP queues; don't allow enabling the feature if there isn't sufficient resources to Tx from any CPU - dsa: sja1105: fix address learning getting disabled on the CPU port - mptcp: addresses a rmem accounting issue that could keep packets in subflow receive buffers longer than necessary, delaying MPTCP-level ACKs - ip_tunnel: fix mtu calculation for ETHER tunnel devices - do not reuse skbs allocated from skbuff_fclone_cache in the napi skb cache, we'd try to return them to the wrong slab cache - tcp: consistently disable header prediction for mptcp Previous releases - always broken: - bpf: fix subprog poke descriptor tracking use-after-free - ipv6: - allocate enough headroom in ip6_finish_output2() in case iptables TEE is used - tcp: drop silly ICMPv6 packet too big messages to avoid expensive and pointless lookups (which may serve as a DDOS vector) - make sure fwmark is copied in SYNACK packets - fix 'disable_policy' for forwarded packets (align with IPv4) - netfilter: conntrack: - do not renew entry stuck in tcp SYN_SENT state - do not mark RST in the reply direction coming after SYN packet for an out-of-sync entry - mptcp: cleanly handle error conditions with MP_JOIN and syncookies - mptcp: fix double free when rejecting a join due to port mismatch - validate lwtstate->data before returning from skb_tunnel_info() - tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path - mt76: mt7921: continue to probe driver when fw already downloaded - bonding: fix multiple issues with offloading IPsec to (thru?) bond - stmmac: ptp: fix issues around Qbv support and setting time back - bcmgenet: always clear wake-up based on energy detection Misc: - sctp: move 198 addresses from unusable to private scope - ptp: support virtual clocks and timestamping - openvswitch: optimize operation for key comparison" * tag 'net-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (158 commits) net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave() sfc: add logs explaining XDP_TX/REDIRECT is not available sfc: ensure correct number of XDP queues sfc: fix lack of XDP TX queues - error XDP TX failed (-22) net: fddi: fix UAF in fza_probe net: dsa: sja1105: fix address learning getting disabled on the CPU port net: ocelot: fix switchdev objects synced for wrong netdev with LAG offload net: Use nlmsg_unicast() instead of netlink_unicast() octeontx2-pf: Fix uninitialized boolean variable pps ipv6: allocate enough headroom in ip6_finish_output2() net: hdlc: rename 'mod_init' & 'mod_exit' functions to be module-specific net: bridge: multicast: fix MRD advertisement router port marking race net: bridge: multicast: fix PIM hello router port marking race net: phy: marvell10g: fix differentiation of 88X3310 from 88X3340 dsa: fix for_each_child.cocci warnings virtio_net: check virtqueue_add_sgs() return value mptcp: properly account bulk freed memory selftests: mptcp: fix case multiple subflows limited by server mptcp: avoid processing packet if a subflow reset mptcp: fix syncookie process if mptcp can not_accept new subflow ...

Linus Torvalds committed 5 years ago

Commit 8096acd2 parents d1d488d bcb9928191 files · +3595 −2346Browse files

Showing the changes to include/uapi (4 of 191 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/ethtool_netlink.h +15 −0
  2. include/uapi/linux/net_tstamp.h +15 −2
  3. include/uapi/linux/netfilter/nfnetlink_log.h +1 −1
  4. include/uapi/linux/netfilter/nfnetlink_queue.h +2 −2
include/uapi/linux/ethtool_netlink.h+15−0
@@ -46,6 +46,7 @@ enum { · 45 unmodified lines
46 ETHTOOL_MSG_FEC_SET,46 ETHTOOL_MSG_FEC_SET,
47 ETHTOOL_MSG_MODULE_EEPROM_GET,47 ETHTOOL_MSG_MODULE_EEPROM_GET,
48 ETHTOOL_MSG_STATS_GET,48 ETHTOOL_MSG_STATS_GET,
49 ETHTOOL_MSG_PHC_VCLOCKS_GET,
49 50
50 /* add new constants above here */51 /* add new constants above here */
51 __ETHTOOL_MSG_USER_CNT,52 __ETHTOOL_MSG_USER_CNT,
@@ -88,6 +89,7 @@ enum { · 36 unmodified lines
88 ETHTOOL_MSG_FEC_NTF,89 ETHTOOL_MSG_FEC_NTF,
89 ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,90 ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,
90 ETHTOOL_MSG_STATS_GET_REPLY,91 ETHTOOL_MSG_STATS_GET_REPLY,
92 ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY,
91 93
92 /* add new constants above here */94 /* add new constants above here */
93 __ETHTOOL_MSG_KERNEL_CNT,95 __ETHTOOL_MSG_KERNEL_CNT,
@@ -440,6 +442,19 @@ enum { · 346 unmodified lines
440 ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)442 ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
441};443};
442 444
445/* PHC VCLOCKS */
446
447enum {
448 ETHTOOL_A_PHC_VCLOCKS_UNSPEC,
449 ETHTOOL_A_PHC_VCLOCKS_HEADER, /* nest - _A_HEADER_* */
450 ETHTOOL_A_PHC_VCLOCKS_NUM, /* u32 */
451 ETHTOOL_A_PHC_VCLOCKS_INDEX, /* array, s32 */
452
453 /* add new constants above here */
454 __ETHTOOL_A_PHC_VCLOCKS_CNT,
455 ETHTOOL_A_PHC_VCLOCKS_MAX = (__ETHTOOL_A_PHC_VCLOCKS_CNT - 1)
456};
457
443/* CABLE TEST */458/* CABLE TEST */
444 459
445enum {460enum {
include/uapi/linux/net_tstamp.h+15−2
@@ -13,7 +13,7 @@ · 12 unmodified lines
13#include <linux/types.h>13#include <linux/types.h>
14#include <linux/socket.h> /* for SO_TIMESTAMPING */14#include <linux/socket.h> /* for SO_TIMESTAMPING */
15 15
16/* SO_TIMESTAMPING gets an integer bit field comprised of these values */16/* SO_TIMESTAMPING flags */
17enum {17enum {
18 SOF_TIMESTAMPING_TX_HARDWARE = (1<<0),18 SOF_TIMESTAMPING_TX_HARDWARE = (1<<0),
19 SOF_TIMESTAMPING_TX_SOFTWARE = (1<<1),19 SOF_TIMESTAMPING_TX_SOFTWARE = (1<<1),
@@ -30,8 +30,9 @@ enum { · 10 unmodified lines
30 SOF_TIMESTAMPING_OPT_STATS = (1<<12),30 SOF_TIMESTAMPING_OPT_STATS = (1<<12),
31 SOF_TIMESTAMPING_OPT_PKTINFO = (1<<13),31 SOF_TIMESTAMPING_OPT_PKTINFO = (1<<13),
32 SOF_TIMESTAMPING_OPT_TX_SWHW = (1<<14),32 SOF_TIMESTAMPING_OPT_TX_SWHW = (1<<14),
33 SOF_TIMESTAMPING_BIND_PHC = (1 << 15),
33 34
34 SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TX_SWHW,35 SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_BIND_PHC,
35 SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |36 SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
36 SOF_TIMESTAMPING_LAST37 SOF_TIMESTAMPING_LAST
37};38};
@@ -46,6 +47,18 @@ enum { · 8 unmodified lines
46 SOF_TIMESTAMPING_TX_SCHED | \47 SOF_TIMESTAMPING_TX_SCHED | \
47 SOF_TIMESTAMPING_TX_ACK)48 SOF_TIMESTAMPING_TX_ACK)
48 49
50/**
51 * struct so_timestamping - SO_TIMESTAMPING parameter
52 *
53 * @flags: SO_TIMESTAMPING flags
54 * @bind_phc: Index of PTP virtual clock bound to sock. This is available
55 * if flag SOF_TIMESTAMPING_BIND_PHC is set.
56 */
57struct so_timestamping {
58 int flags;
59 int bind_phc;
60};
61
49/**62/**
50 * struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter63 * struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
51 *64 *
include/uapi/linux/netfilter/nfnetlink_log.h+1−1
@@ -61,7 +61,7 @@ enum nfulnl_attr_type { · 60 unmodified lines
61 NFULA_HWTYPE, /* hardware type */61 NFULA_HWTYPE, /* hardware type */
62 NFULA_HWHEADER, /* hardware header */62 NFULA_HWHEADER, /* hardware header */
63 NFULA_HWLEN, /* hardware header length */63 NFULA_HWLEN, /* hardware header length */
64 NFULA_CT, /* nf_conntrack_netlink.h */64 NFULA_CT, /* nfnetlink_conntrack.h */
65 NFULA_CT_INFO, /* enum ip_conntrack_info */65 NFULA_CT_INFO, /* enum ip_conntrack_info */
66 NFULA_VLAN, /* nested attribute: packet vlan info */66 NFULA_VLAN, /* nested attribute: packet vlan info */
67 NFULA_L2HDR, /* full L2 header */67 NFULA_L2HDR, /* full L2 header */
include/uapi/linux/netfilter/nfnetlink_queue.h+2−2
@@ -51,11 +51,11 @@ enum nfqnl_attr_type { · 50 unmodified lines
51 NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */51 NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
52 NFQA_HWADDR, /* nfqnl_msg_packet_hw */52 NFQA_HWADDR, /* nfqnl_msg_packet_hw */
53 NFQA_PAYLOAD, /* opaque data payload */53 NFQA_PAYLOAD, /* opaque data payload */
54 NFQA_CT, /* nf_conntrack_netlink.h */54 NFQA_CT, /* nfnetlink_conntrack.h */
55 NFQA_CT_INFO, /* enum ip_conntrack_info */55 NFQA_CT_INFO, /* enum ip_conntrack_info */
56 NFQA_CAP_LEN, /* __u32 length of captured packet */56 NFQA_CAP_LEN, /* __u32 length of captured packet */
57 NFQA_SKB_INFO, /* __u32 skb meta information */57 NFQA_SKB_INFO, /* __u32 skb meta information */
58 NFQA_EXP, /* nf_conntrack_netlink.h */58 NFQA_EXP, /* nfnetlink_conntrack.h */
59 NFQA_UID, /* __u32 sk uid */59 NFQA_UID, /* __u32 sk uid */
60 NFQA_GID, /* __u32 sk gid */60 NFQA_GID, /* __u32 sk gid */
61 NFQA_SECCTX, /* security context string */61 NFQA_SECCTX, /* security context string */