| Message ID | 20190404.184718.1193600058567939028.davem@davemloft.net |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [GIT] Networking | expand |
The pull request you sent on Thu, 04 Apr 2019 18:47:18 -0700 (PDT):
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net refs/heads/master
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0548740e53e6fe674f850d36db51eccb0557d938
Thank you!
On 4/5/19 3:47 AM, David Miller wrote: > ... > > David S. Miller (15): > Merge branch 'thunderx-fix-receive-buffer-page-recycling' > Merge tag 'batadv-net-for-davem-20190328' of git://git.open-mesh.org/linux-merge > Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue > Merge branch 'nfp-fix-retcode-and-disable-netpoll-on-representors' > Revert "cxgb4: Update 1.23.3.0 as the latest firmware supported." > Merge tag 'mlx5-fixes-2019-03-29' of git://git.kernel.org/.../saeed/linux > Merge git://git.kernel.org/.../bpf/bpf > Merge branch 'net-stmmac-fix-handling-of-oversized-frames' > Merge branch 'tipc-a-batch-of-uninit-value-fixes-for-netlink_compat' > Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs' > Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit' > Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue > Merge branch 'net-hns-bugfixes-for-HNS-Driver' > Merge branch 'sch_cake-fixes' > Merge git://git.kernel.org/.../bpf/bpf > > > Paolo Abeni (3): > net: datagram: fix unbounded loop in __skb_try_recv_datagram() > net: sched: introduce and use qstats read helpers > net: sched: introduce and use qdisc tree flush/purge helpers > Could it be that these changes, especially the ones from net: sched: fix stats accounting for child NOLOCK qdiscs are fixing the long-standing issue of random ethernet card adapter resets that were introduces somewhere between 4.14.xx and 4.19.xx? There are numerous reports of different nics failing (mine is a igb), with no real solution found yet. https://bugzilla.kernel.org/show_bug.cgi?id=199783 has a few examples. I'm certainly no expert, but my kernel trace seems to point to that area: [88273.078248] ------------[ cut here ]------------ [88273.083042] NETDEV WATCHDOG: enp2s0 (igb): transmit queue 2 timed out [88273.089827] WARNING: CPU: 2 PID: 0 at net/sched/sch_generic.c:461 dev_watchdog+0x1ee/0x200 [88273.098253] Modules linked in: ctr ccm xt_limit nfsd nfs_acl lockd grace sunrpc nf_log_ipv4 nf_log_common xt_LOG ipt_MASQUERADE xt_conntrack iptable_nat nf_nat_ipv4 iptable_filter nf_nat_ftp nf_nat nf_conntrack_ftp nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 libcrc32c bridge stp ipv6 crc_ccitt arc4 amd64_edac_mod kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ath10k_pci crc32c_intel ath10k_core ghash_clmulni_intel sdhci_pci ath pcbc mac80211 cqhci aesni_intel ehci_pci aes_x86_64 sdhci leds_apu xhci_pci crypto_simd ehci_hcd mmc_core fam15h_power cryptd glue_helper igb xhci_hcd k10temp cfg80211 pcspkr rtc_cmos ptp hwmon dca usbcore usb_common ccp fuse [88273.157981] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 4.19.31 #1 [88273.164223] Hardware name: PC Engines APU2/APU2, BIOS 4.0.7 02/28/2017 [88273.170918] RIP: 0010:dev_watchdog+0x1ee/0x200 [88273.175457] Code: 00 48 63 4d e0 eb 93 4c 89 e7 c6 05 f1 2a b1 00 01 e8 e6 14 fd ff 89 d9 48 89 c2 4c 89 e6 48 c7 c7 38 24 dd 81 e8 02 ef aa ff <0f> 0b eb c0 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 48 c7 47 08 [88273.194827] RSP: 0018:ffff88811ab03e88 EFLAGS: 00010286 [88273.200160] RAX: 0000000000000000 RBX: 0000000000000002 RCX: 0000000000000000 [88273.207484] RDX: 0000000000040400 RSI: 00000000000000f6 RDI: 0000000000000300 [88273.214941] RBP: ffff888117fd4480 R08: 0000000000000266 R09: 0000000000000007 [88273.222315] R10: 0000000000000082 R11: ffffffff824d188d R12: ffff888117fd4000 [88273.229669] R13: 0000000000000002 R14: ffffffff82005100 R15: 0000000000000001 [88273.236965] FS: 0000000000000000(0000) GS:ffff88811ab00000(0000) knlGS:0000000000000000 [88273.245318] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [88273.251170] CR2: 00007f68d06d8000 CR3: 000000011332e000 CR4: 00000000000406e0 [88273.258571] Call Trace: [88273.261124] <IRQ> [88273.263204] ? qdisc_reset+0xe0/0xe0 [88273.266841] call_timer_fn+0x2b/0x130 [88273.270620] expire_timers+0x8e/0xe0 [88273.274328] run_timer_softirq+0xb9/0x160 [88273.278480] ? __hrtimer_run_queues+0x133/0x2b0 [88273.283175] ? ktime_get+0x39/0x90 [88273.286655] __do_softirq+0xd7/0x2f8 [88273.290338] irq_exit+0xb2/0xc0 [88273.293559] smp_apic_timer_interrupt+0x79/0x130 [88273.298414] apic_timer_interrupt+0xf/0x20 [88273.302664] </IRQ> [88273.304873] RIP: 0010:cpuidle_enter_state+0xab/0x310 [88273.310016] Code: e8 ca c6 b5 ff 48 89 c3 8b 05 39 7a b9 00 85 c0 0f 8f 33 01 00 00 31 ff e8 92 cf b5 ff 45 84 f6 0f 85 f1 00 00 00 fb 4c 29 fb <48> ba cf f7 53 e3 a5 9b c4 20 48 89 d8 48 c1 fb 3f 48 f7 ea b8 ff [88273.329275] RSP: 0018:ffffc900006a3e90 EFLAGS: 00000216 ORIG_RAX: ffffffffffffff13 [88273.337073] RAX: ffff88811ab20bc0 RBX: 00000000032f0f7e RCX: 000000000000001f [88273.344368] RDX: 00005048ad789efb RSI: 00000000803d7d59 RDI: 0000000000000000 [88273.351650] RBP: 0000000000000002 R08: 0000000000000002 R09: 0000000000020480 [88273.359007] R10: ffffc900006a3e78 R11: 0000000000002e10 R12: ffffffff8207d0f8 [88273.366481] R13: ffff888119647400 R14: 0000000000000000 R15: 00005048aa498f7d [88273.373838] do_idle+0x1d8/0x230 [88273.377134] cpu_startup_entry+0x6a/0x70 [88273.381189] start_secondary+0x183/0x1b0 [88273.385202] secondary_startup_64+0xa4/0xb0 [88273.389521] ---[ end trace 267a09c97ff9e7fd ]---
1) Several hash table refcount fixes in batman-adv, from Sven Eckelmann. 2) Use after free in bpf_evict_inode(), from Daniel Borkmann. 3) Fix mdio bus registration in ixgbe, from Ivan Vecera. 4) Unbounded loop in __skb_try_recv_datagram(), from Paolo Abeni. 5) ila rhashtable corruption fix from Herbert Xu. 6) Don't allow upper-devices to be added to vrf devices, from Sabrina Dubroca. 7) Add qmi_wwan device ID for Olicard 600, from Bjørn Mork. 8) Don't leave skb->next poisoned in __netif_receive_skb_list_ptype, from Alexander Lobakin. 9) Missing IDR checks in mlx5 driver, from Aditya Pakki. 10) Fix false connection termination in ktls, from Jakub Kicinski. 11) Work around some ASPM issues with r8169 by disabling rx interrupt coalescing on certain chips. From Heiner Kallweit. 12) Properly use per-cpu qstat values on NOLOCK qdiscs, from Paolo Abeni. 13) Fully initialize sockaddr_in structures in SCTP, from Xin Long. 14) Various BPF flow dissector fixes from Stanislav Fomichev. 15) Divide by zero in act_sample, from Davide Caratti. 16) Fix bridging multicast regression introduced by rhashtable conversion, from Nikolay Aleksandrov. Please pull, thanks a lot! The following changes since commit 1a9df9e29c2afecf6e3089442d429b377279ca3c: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2019-03-27 12:22:57 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net for you to fetch changes up to bbd669a868bba591ffd38b7bc75a7b361bb54b04: ibmvnic: Fix completion structure initialization (2019-04-04 18:36:07 -0700) ---------------------------------------------------------------- Aaro Koskinen (6): net: stmmac: use correct DMA buffer size in the RX descriptor net: stmmac: ratelimit RX error logs net: stmmac: don't stop NAPI processing when dropping a packet net: stmmac: don't overwrite discard_frame status net: stmmac: fix dropping of multi-descriptor RX frames net: stmmac: don't log oversized frames Aditya Pakki (1): net: mlx5: Add a missing check on idr_find, free buf Alexander Lobakin (1): net: core: netif_receive_skb_list: unlist skb before passing to pt->func Alexei Starovoitov (2): Merge branch 'fix-verifier-warning' Merge branch 'fix-btf_dedup' Anders Roxell (1): batman-adv: fix warning in function batadv_v_elp_get_throughput Andrea Righi (1): openvswitch: fix flow actions reallocation Andrii Nakryiko (2): libbpf: fix btf_dedup equivalence check handling of different kinds selftests/bpf: add btf_dedup test for VOID equivalence check Artemy Kovalyov (1): net/mlx5: Decrease default mr cache size Arvind Sankar (1): igb: Fix WARN_ONCE on runtime suspend Aya Levin (2): net/mlx5: ethtool, Fix type analysis of advertised link-mode net/mlx5: ethtool, Allow legacy link-modes configuration via non-extended ptys Bert Kenward (1): MAINTAINERS: net: update Solarflare maintainers Björn Töpel (4): libbpf: add xsk.h to install_headers target libbpf: add libelf dependency to shared library build i40e: move i40e_xsk_umem function i40e: add tracking of AF_XDP ZC state for each queue pair Bjørn Mork (1): qmi_wwan: add Olicard 600 Chris Leech (1): vlan: conditional inclusion of FCoE hooks to match netdevice.h and bnx2x Claudiu Manoil (1): net: mii: Fix PAUSE cap advertisement from linkmode_adv_to_lcl_adv_t() helper Daniel Borkmann (3): bpf: fix use after free in bpf_evict_inode bpf, libbpf: fix quiet install_headers Merge branch 'bpf-flow-dissector-fixes' David S. Miller (15): Merge branch 'thunderx-fix-receive-buffer-page-recycling' Merge tag 'batadv-net-for-davem-20190328' of git://git.open-mesh.org/linux-merge Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge branch 'nfp-fix-retcode-and-disable-netpoll-on-representors' Revert "cxgb4: Update 1.23.3.0 as the latest firmware supported." Merge tag 'mlx5-fixes-2019-03-29' of git://git.kernel.org/.../saeed/linux Merge git://git.kernel.org/.../bpf/bpf Merge branch 'net-stmmac-fix-handling-of-oversized-frames' Merge branch 'tipc-a-batch-of-uninit-value-fixes-for-netlink_compat' Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs' Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit' Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge branch 'net-hns-bugfixes-for-HNS-Driver' Merge branch 'sch_cake-fixes' Merge git://git.kernel.org/.../bpf/bpf Davide Caratti (1): net/sched: act_sample: fix divide by zero in the traffic path Dean Nelson (2): thunderx: enable page recycling for non-XDP case thunderx: eliminate extra calls to put_page() for pages held for recycling Dmytro Linkin (1): net/mlx5e: Allow IPv4 ttl & IPv6 hop_limit rewrite for all L4 protocols Dust Li (1): tcp: fix a potential NULL pointer dereference in tcp_sk_exit Eli Britstein (1): net/mlx5e: Consider tunnel type for encap contexts Eric Dumazet (1): netns: provide pure entropy for net_hash_mix() Florian Fainelli (1): MAINTAINERS: Fix documentation file name for PHY Library Gavi Teitz (1): net/mlx5e: Fix error handling when refreshing TIRs Haiyang Zhang (1): hv_netvsc: Fix unwanted wakeup after tx_disable Heiner Kallweit (2): net: dsa: mv88e6xxx: fix few issues in mv88e6390x_port_set_cmode r8169: disable default rx interrupt coalescing on RTL8168 Herbert Xu (1): ila: Fix rhashtable walker list corruption Huy Nguyen (3): net/mlx5: E-Switch, fix syndrome (0x678139) when turn on vepa net/mlx5e: Update xoff formula net/mlx5e: Update xon formula Ivan Vecera (1): ixgbe: fix mdio bus registration Jacob Keller (1): i40e: fix i40e_ptp_adjtime when given a negative delta Jakub Kicinski (3): nfp: validate the return code from dev_queue_xmit() nfp: disable netpoll on representors net: tls: prevent false connection termination with offload Jesper Dangaard Brouer (2): bpf, doc: fix BTF docs reflow of bullet list xdp: fix cpumap redirect SKB creation bug Jiri Slaby (1): kcm: switch order of device registration to fix a crash Junwei Hu (1): ipv6: Fix dangling pointer when ipv6 fragment Koen De Schepper (1): tcp: Ensure DCTCP reacts to losses Konstantin Khorenko (1): bonding: show full hw address in sysfs for slave entries Li RongQing (1): net: ethtool: not call vzalloc for zero sized memory request Liubin Shu (1): net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw() Lorenzo Bianconi (2): net: thunderx: fix NULL pointer dereference in nicvf_open/nicvf_stop ipv6: sit: reset ip header pointer in ipip6_rcv Mao Wenan (1): net: rds: force to destroy connection if t_sock is NULL in rds_tcp_kill_sock(). Nicolas Dichtel (1): net/sched: fix ->get helper of the matchall cls Nikolay Aleksandrov (1): net: bridge: always clear mcast matching struct on reports and leaves Omri Kahalon (1): net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands Paolo Abeni (3): net: datagram: fix unbounded loop in __skb_try_recv_datagram() net: sched: introduce and use qstats read helpers net: sched: introduce and use qdisc tree flush/purge helpers Paul Chaignon (2): bpf: remove incorrect 'verifier bug' warning selftests/bpf: test case for invalid call stack in dead code Pieter Jansen van Vuuren (2): nfp: flower: replace CFI with vlan present nfp: flower: remove vlan CFI bit from push vlan action Roi Dayan (2): net/mlx5: E-Switch, Fix access to invalid memory when toggling esw modes net/mlx5: E-Switch, Protect from invalid memory access in offload fdb table Sabrina Dubroca (1): vrf: prevent adding upper devices Sheena Mira-ato (1): ip6_tunnel: Match to ARPHRD_TUNNEL6 for dev type Stanislav Fomichev (6): selftests/bpf: fix vlan handling in flow dissector program net/flow_dissector: pass flow_keys->n_proto to BPF programs flow_dissector: fix clamping of BPF flow_keys for non-zero nhoff flow_dissector: allow access only to a subset of __sk_buff fields flow_dissector: document BPF flow dissector environment flow_dissector: rst'ify documentation Stefan Assmann (1): i40e: fix WoL support check Steffen Klassert (1): net-gro: Fix GRO flush when receiving a GSO packet. Stephen Suryaputra (1): vrf: check accept_source_route on the original netdevice Sven Eckelmann (4): batman-adv: Reduce claim hash refcnt only for removed entry batman-adv: Reduce tt_local hash refcnt only for removed entry batman-adv: Reduce tt_global hash refcnt only for removed entry batman-adv: Fix genl notification for throughput_override Thomas Falcon (1): ibmvnic: Fix completion structure initialization Toke Høiland-Jørgensen (2): sch_cake: Use tc_skb_protocol() helper for getting packet protocol sch_cake: Make sure we can write the IP header before changing DSCP bits Tonghao Zhang (1): net/mlx5e: Correctly use the namespace type when allocating pedit action Varun Prakash (1): libcxgb: fix incorrect ppmax calculation Vishal Kulkarni (1): cxgb4: Update 1.23.3.0 as the latest firmware supported. Xi Wang (1): net: hns3: fix compile error Xin Long (4): tipc: check bearer name with right length in tipc_nl_compat_bearer_enable tipc: check link name with right length in tipc_nl_compat_link_set tipc: handle the err returned from cmd header function sctp: initialize _pad of sockaddr_in before copying to user memory Yonglong Liu (5): net: hns: Use NAPI_POLL_WEIGHT for hns driver net: hns: Fix probabilistic memory overwrite when HNS driver initialized net: hns: fix ICMP6 neighbor solicitation messages discard problem net: hns: Fix WARNING when remove HNS driver with SMMU enabled net: hns: Fix sparse: some warnings in HNS drivers Yue Haibing (1): fm10k: Fix a potential NULL pointer dereference YueHaibing (1): dccp: Fix memleak in __feat_register_sp Yuval Avnery (1): net/mlx5e: Add a lock on tir list xiaofeis (1): net: dsa: Implement flow_dissect callback for tag_qca Documentation/bpf/btf.rst | 8 ++--- Documentation/networking/bpf_flow_dissector.rst | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Documentation/networking/index.rst | 1 + MAINTAINERS | 4 +-- drivers/net/bonding/bond_sysfs_slave.c | 4 ++- drivers/net/dsa/mv88e6xxx/port.c | 24 ++++++++++----- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 20 +++++++----- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 30 +++++++++--------- drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 9 +++++- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 ++- drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 +-- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 53 ++++++++++++++++++++------------ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 2 ++ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 6 ++-- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 4 +-- drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 4 +-- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 12 ++++---- drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 12 +++----- drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- drivers/net/ethernet/hisilicon/hns_mdio.c | 18 +++++------ drivers/net/ethernet/ibm/ibmvnic.c | 5 +-- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++ drivers/net/ethernet/intel/i40e/i40e.h | 16 ++-------- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 5 +-- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 3 ++ drivers/net/ethernet/intel/igb/e1000_defines.h | 2 ++ drivers/net/ethernet/intel/igb/igb_main.c | 57 +++++----------------------------- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 16 +++++----- drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 3 -- drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c | 39 +++++++++++++----------- drivers/net/ethernet/mellanox/mlx5/core/en_common.c | 13 ++++++-- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 52 ++++++++++++++++++++----------- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 82 ++++++++++++++++++++++++++++++++++++++++--------- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9 +++--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 14 +++++++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 20 ------------ drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 3 +- drivers/net/ethernet/netronome/nfp/flower/match.c | 27 ++++++++--------- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 4 +-- drivers/net/ethernet/realtek/r8169.c | 2 +- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 22 +++++++++----- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 22 ++++++++++---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 12 +++++--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 34 ++++++++++++--------- drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc.c | 6 ++-- drivers/net/hyperv/netvsc_drv.c | 32 ++++++++++++++++---- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/vrf.c | 1 + include/linux/mii.h | 2 +- include/linux/mlx5/driver.h | 2 ++ include/net/ip.h | 2 +- include/net/net_namespace.h | 1 + include/net/netns/hash.h | 10 ++---- include/net/sch_generic.h | 44 ++++++++++++++++++++++----- kernel/bpf/cpumap.c | 13 ++++++-- kernel/bpf/inode.c | 32 +++++++++++--------- kernel/bpf/verifier.c | 5 +-- net/8021q/vlan_dev.c | 26 +++++++++------- net/batman-adv/bat_v_elp.c | 6 ++-- net/batman-adv/bridge_loop_avoidance.c | 16 ++++++++-- net/batman-adv/sysfs.c | 7 +++-- net/batman-adv/translation-table.c | 32 +++++++++++++++----- net/bridge/br_multicast.c | 3 ++ net/core/datagram.c | 2 +- net/core/dev.c | 4 ++- net/core/ethtool.c | 46 ++++++++++++++++++---------- net/core/filter.c | 16 ++-------- net/core/flow_dissector.c | 4 ++- net/core/net_namespace.c | 1 + net/core/skbuff.c | 2 +- net/dccp/feat.c | 7 ++++- net/dsa/tag_qca.c | 10 ++++++ net/ipv4/ip_input.c | 7 ++--- net/ipv4/ip_options.c | 4 +-- net/ipv4/tcp_dctcp.c | 36 +++++++++++----------- net/ipv4/tcp_ipv4.c | 3 +- net/ipv6/ila/ila_xlat.c | 1 + net/ipv6/ip6_output.c | 4 ++- net/ipv6/ip6_tunnel.c | 4 +-- net/ipv6/sit.c | 4 +++ net/kcm/kcmsock.c | 16 +++++----- net/openvswitch/flow_netlink.c | 4 +-- net/rds/tcp.c | 2 +- net/sched/act_sample.c | 10 ++++-- net/sched/cls_matchall.c | 5 +++ net/sched/sch_cake.c | 13 +++++++- net/sched/sch_cbq.c | 10 +++--- net/sched/sch_drr.c | 16 +++------- net/sched/sch_hfsc.c | 19 +++--------- net/sched/sch_htb.c | 22 ++++---------- net/sched/sch_mq.c | 2 +- net/sched/sch_mqprio.c | 3 +- net/sched/sch_multiq.c | 10 +++--- net/sched/sch_prio.c | 10 ++---- net/sched/sch_qfq.c | 14 ++------- net/sched/sch_red.c | 3 +- net/sched/sch_sfb.c | 3 +- net/sched/sch_taprio.c | 2 +- net/sched/sch_tbf.c | 3 +- net/sctp/protocol.c | 1 + net/tipc/netlink_compat.c | 24 ++++++++++++--- net/tls/tls_sw.c | 2 ++ tools/lib/bpf/Makefile | 7 +++-- tools/lib/bpf/btf.c | 3 ++ tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 68 +++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/bpf_flow.c | 19 +++++------- tools/testing/selftests/bpf/test_btf.c | 47 ++++++++++++++++++++++++++++ tools/testing/selftests/bpf/verifier/calls.c | 38 +++++++++++++++++++++++ tools/testing/selftests/tc-testing/tc-tests/actions/sample.json | 24 +++++++++++++++ 122 files changed, 1096 insertions(+), 563 deletions(-) create mode 100644 Documentation/networking/bpf_flow_dissector.rst