Pull networking fixes from David Miller: "Various fixes, all over: 1) Fix overflow in ptp_qoriq_adjfine(), from Yangbo Lu. 2) Always store the rx queue mapping in veth, from Maciej Fijalkowski. 3) Don't allow vmlinux btf in map_create, from Alexei Starovoitov. 4) Fix memory leak in octeontx2-af from Colin Ian King. 5) Use kvalloc in bpf x86 JIT for storing jit'd addresses, from Yonghong Song. 6) Fix tx ptp stats in mlx5, from Aya Levin. 7) Check correct ip version in tun decap, fropm Roi Dayan. 8) Fix rate calculation in mlx5 E-Switch code, from arav Pandit. 9) Work item memork leak in mlx5, from Shay Drory. 10) Fix ip6ip6 tunnel crash with bpf, from Daniel Borkmann. 11) Lack of preemptrion awareness in macvlan, from Eric Dumazet. 12) Fix data race in pxa168_eth, from Pavel Andrianov. 13) Range validate stab in red_check_params(), from Eric Dumazet. 14) Inherit vlan filtering setting properly in b53 driver, from Florian Fainelli. 15) Fix rtnl locking in igc driver, from Sasha Neftin. 16) Pause handling fixes in igc driver, from Muhammad Husaini Zulkifli. 17) Missing rtnl locking in e1000_reset_task, from Vitaly Lifshits. 18) Use after free in qlcnic, from Lv Yunlong. 19) fix crash in fritzpci mISDN, from Tong Zhang. 20) Premature rx buffer reuse in igb, from Li RongQing. 21) Missing termination of ip[a driver message handler arrays, from Alex Elder. 22) Fix race between "x25_close" and "x25_xmit"/"x25_rx" in hdlc_x25 driver, from Xie He. 23) Use after free in c_can_pci_remove(), from Tong Zhang. 24) Uninitialized variable use in nl80211, from Jarod Wilson. 25) Off by one size calc in bpf verifier, from Piotr Krysiuk. 26) Use delayed work instead of deferrable for flowtable GC, from Yinjun Zhang. 27) Fix infinite loop in NPC unmap of octeontx2 driver, from Hariprasad Kelam. 28) Fix being unable to change MTU of dwmac-sun8i devices due to lack of fifo sizes, from Corentin Labbe. 29) DMA use after free in r8169 with WoL, fom Heiner Kallweit. 30) Mismatched prototypes in isdn-capi, from Arnd Bergmann. 31) Fix psample UAPI breakage, from Ido Schimmel" * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (171 commits) psample: Fix user API breakage math: Export mul_u64_u64_div_u64 ch_ktls: fix enum-conversion warning octeontx2-af: Fix memory leak of object buf ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation net: bridge: don't notify switchdev for local FDB addresses net/sched: act_ct: clear post_ct if doing ct_clear net: dsa: don't assign an error value to tag_ops isdn: capi: fix mismatched prototypes net/mlx5: SF, do not use ecpu bit for vhca state processing net/mlx5e: Fix division by 0 in mlx5e_select_queue net/mlx5e: Fix error path for ethtool set-priv-flag net/mlx5e: Offload tuple rewrite for non-CT flows net/mlx5e: Allow to match on MPLS parameters only for MPLS over UDP net/mlx5: Add back multicast stats for uplink representor net: ipconfig: ic_dev can be NULL in ic_close_devs MAINTAINERS: Combine "QLOGIC QLGE 10Gb ETHERNET DRIVER" sections into one docs: networking: Fix a typo r8169: fix DMA being used after buffer free if WoL is enabled net: ipa: fix init header command validation ...
Showing the changes to include/uapi/linux (2 of 191 files). Show all
Unified · Split
| @@ -3850,7 +3850,7 @@ union bpf_attr { · 3849 unmodified lines | ||
| 3850 | 3850 | * |
| 3851 | 3851 | * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags) |
| 3852 | 3852 | * Description |
| 3853 | − * Check ctx packet size against exceeding MTU of net device (based | |
| 3853 | + * Check packet size against exceeding MTU of net device (based | |
| 3854 | 3854 | * on *ifindex*). This helper will likely be used in combination |
| 3855 | 3855 | * with helpers that adjust/change the packet size. |
| 3856 | 3856 | * |
| @@ -3867,6 +3867,14 @@ union bpf_attr { · 10 unmodified lines | ||
| 3867 | 3867 | * against the current net device. This is practical if this isn't |
| 3868 | 3868 | * used prior to redirect. |
| 3869 | 3869 | * |
| 3870 | + * On input *mtu_len* must be a valid pointer, else verifier will | |
| 3871 | + * reject BPF program. If the value *mtu_len* is initialized to | |
| 3872 | + * zero then the ctx packet size is use. When value *mtu_len* is | |
| 3873 | + * provided as input this specify the L3 length that the MTU check | |
| 3874 | + * is done against. Remember XDP and TC length operate at L2, but | |
| 3875 | + * this value is L3 as this correlate to MTU and IP-header tot_len | |
| 3876 | + * values which are L3 (similar behavior as bpf_fib_lookup). | |
| 3877 | + * | |
| 3870 | 3878 | * The Linux kernel route table can configure MTUs on a more |
| 3871 | 3879 | * specific per route level, which is not provided by this helper. |
| 3872 | 3880 | * For route level MTU checks use the **bpf_fib_lookup**\ () |
| @@ -3891,11 +3899,9 @@ union bpf_attr { · 18 unmodified lines | ||
| 3891 | 3899 | * |
| 3892 | 3900 | * On return *mtu_len* pointer contains the MTU value of the net |
| 3893 | 3901 | * device. Remember the net device configured MTU is the L3 size, |
| 3894 | − * which is returned here and XDP and TX length operate at L2. | |
| 3902 | + * which is returned here and XDP and TC length operate at L2. | |
| 3895 | 3903 | * Helper take this into account for you, but remember when using |
| 3896 | − * MTU value in your BPF-code. On input *mtu_len* must be a valid | |
| 3897 | − * pointer and be initialized (to zero), else verifier will reject | |
| 3898 | − * BPF program. | |
| 3904 | + * MTU value in your BPF-code. | |
| 3899 | 3905 | * |
| 3900 | 3906 | * Return |
| 3901 | 3907 | * * 0 on success, and populate MTU value in *mtu_len* pointer. |
| @@ -3,7 +3,6 @@ · 2 unmodified lines | ||
| 3 | 3 | #define __UAPI_PSAMPLE_H |
| 4 | 4 | |
| 5 | 5 | enum { |
| 6 | − /* sampled packet metadata */ | |
| 7 | 6 | PSAMPLE_ATTR_IIFINDEX, |
| 8 | 7 | PSAMPLE_ATTR_OIFINDEX, |
| 9 | 8 | PSAMPLE_ATTR_ORIGSIZE, |
| @@ -11,10 +10,8 @@ enum { · 1 unmodified line | ||
| 11 | 10 | PSAMPLE_ATTR_GROUP_SEQ, |
| 12 | 11 | PSAMPLE_ATTR_SAMPLE_RATE, |
| 13 | 12 | PSAMPLE_ATTR_DATA, |
| 14 | − PSAMPLE_ATTR_TUNNEL, | |
| 15 | − | |
| 16 | − /* commands attributes */ | |
| 17 | 13 | PSAMPLE_ATTR_GROUP_REFCOUNT, |
| 14 | + PSAMPLE_ATTR_TUNNEL, | |
| 18 | 15 | |
| 19 | 16 | __PSAMPLE_ATTR_MAX |
| 20 | 17 | }; |