Pull networking fixes from David Miller: 1) Limit xt_hashlimit hash table size to avoid OOM or hung tasks, from Cong Wang. 2) Fix deadlock in xsk by publishing global consumer pointers when NAPI is finished, from Magnus Karlsson. 3) Set table field properly to RT_TABLE_COMPAT when necessary, from Jethro Beekman. 4) NLA_STRING attributes are not necessary NULL terminated, deal wiht that in IFLA_ALT_IFNAME. From Eric Dumazet. 5) Fix checksum handling in atlantic driver, from Dmitry Bezrukov. 6) Handle mtu==0 devices properly in wireguard, from Jason A. Donenfeld. 7) Fix several lockdep warnings in bonding, from Taehee Yoo. 8) Fix cls_flower port blocking, from Jason Baron. 9) Sanitize internal map names in libbpf, from Toke Høiland-Jørgensen. 10) Fix RDMA race in qede driver, from Michal Kalderon. 11) Fix several false lockdep warnings by adding conditions to list_for_each_entry_rcu(), from Madhuparna Bhowmik. 12) Fix sleep in atomic in mlx5 driver, from Huy Nguyen. 13) Fix potential deadlock in bpf_map_do_batch(), from Yonghong Song. 14) Hey, variables declared in switch statement before any case statements are not initialized. I learn something every day. Get rids of this stuff in several parts of the networking, from Kees Cook. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (99 commits) bnxt_en: Issue PCIe FLR in kdump kernel to cleanup pending DMAs. bnxt_en: Improve device shutdown method. net: netlink: cap max groups which will be considered in netlink_bind() net: thunderx: workaround BGX TX Underflow issue ionic: fix fw_status read net: disable BRIDGE_NETFILTER by default net: macb: Properly handle phylink on at91rm9200 s390/qeth: fix off-by-one in RX copybreak check s390/qeth: don't warn for napi with 0 budget s390/qeth: vnicc Fix EOPNOTSUPP precedence openvswitch: Distribute switch variables for initialization net: ip6_gre: Distribute switch variables for initialization net: core: Distribute switch variables for initialization udp: rehash on disconnect net/tls: Fix to avoid gettig invalid tls record bpf: Fix a potential deadlock with bpf_map_do_batch bpf: Do not grab the bucket spinlock by default on htab batch ops ice: Wait for VF to be reset/ready before configuration ice: Don't tell the OS that link is going down ice: Don't reject odd values of usecs set by user ...
Showing the changes to include/uapi/linux (2 of 104 files). Show all
Unified · Split
| @@ -1045,9 +1045,9 @@ union bpf_attr { · 1044 unmodified lines | ||
| 1045 | 1045 | * supports redirection to the egress interface, and accepts no |
| 1046 | 1046 | * flag at all. |
| 1047 | 1047 | * |
| 1048 | − * The same effect can be attained with the more generic | |
| 1049 | − * **bpf_redirect_map**\ (), which requires specific maps to be | |
| 1050 | − * used but offers better performance. | |
| 1048 | + * The same effect can also be attained with the more generic | |
| 1049 | + * **bpf_redirect_map**\ (), which uses a BPF map to store the | |
| 1050 | + * redirect target instead of providing it directly to the helper. | |
| 1051 | 1051 | * Return |
| 1052 | 1052 | * For XDP, the helper returns **XDP_REDIRECT** on success or |
| 1053 | 1053 | * **XDP_ABORTED** on error. For other program types, the values |
| @@ -1611,13 +1611,11 @@ union bpf_attr { · 557 unmodified lines | ||
| 1611 | 1611 | * the caller. Any higher bits in the *flags* argument must be |
| 1612 | 1612 | * unset. |
| 1613 | 1613 | * |
| 1614 | − * When used to redirect packets to net devices, this helper | |
| 1615 | − * provides a high performance increase over **bpf_redirect**\ (). | |
| 1616 | − * This is due to various implementation details of the underlying | |
| 1617 | − * mechanisms, one of which is the fact that **bpf_redirect_map**\ | |
| 1618 | − * () tries to send packet as a "bulk" to the device. | |
| 1614 | + * See also bpf_redirect(), which only supports redirecting to an | |
| 1615 | + * ifindex, but doesn't require a map to do so. | |
| 1619 | 1616 | * Return |
| 1620 | − * **XDP_REDIRECT** on success, or **XDP_ABORTED** on error. | |
| 1617 | + * **XDP_REDIRECT** on success, or the value of the two lower bits | |
| 1618 | + * of the **flags* argument on error. | |
| 1621 | 1619 | * |
| 1622 | 1620 | * int bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags) |
| 1623 | 1621 | * Description |
| @@ -97,6 +97,15 @@ enum ip_conntrack_status { · 96 unmodified lines | ||
| 97 | 97 | IPS_UNTRACKED_BIT = 12, |
| 98 | 98 | IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT), |
| 99 | 99 | |
| 100 | +#ifdef __KERNEL__ | |
| 101 | + /* Re-purposed for in-kernel use: | |
| 102 | + * Tags a conntrack entry that clashed with an existing entry | |
| 103 | + * on insert. | |
| 104 | + */ | |
| 105 | + IPS_NAT_CLASH_BIT = IPS_UNTRACKED_BIT, | |
| 106 | + IPS_NAT_CLASH = IPS_UNTRACKED, | |
| 107 | +#endif | |
| 108 | + | |
| 100 | 109 | /* Conntrack got a helper explicitly attached via CT target. */ |
| 101 | 110 | IPS_HELPER_BIT = 13, |
| 102 | 111 | IPS_HELPER = (1 << IPS_HELPER_BIT), |
| @@ -110,7 +119,8 @@ enum ip_conntrack_status { · 7 unmodified lines | ||
| 110 | 119 | */ |
| 111 | 120 | IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK | |
| 112 | 121 | IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING | |
| 113 | − IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_OFFLOAD), | |
| 122 | + IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_UNTRACKED | | |
| 123 | + IPS_OFFLOAD), | |
| 114 | 124 | |
| 115 | 125 | __IPS_MAX_BIT = 15, |
| 116 | 126 | }; |