From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941018AbcKNWIt (ORCPT ); Mon, 14 Nov 2016 17:08:49 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:41998 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940520AbcKNWIo (ORCPT ); Mon, 14 Nov 2016 17:08:44 -0500 Date: Mon, 14 Nov 2016 17:08:37 -0500 (EST) Message-Id: <20161114.170837.2215610637139790979.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Networking From: David Miller X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 14 Nov 2016 13:09:09 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id uAEM8uKV023288 1) Fix off by one wrt. indexing when dumping /proc/net/route entries, from Alexander Duyck. 2) Fix lockdep splats in iwlwifi, from Johannes Berg. 3) Cure panic when inserting certain netfilter rules when NFT_SET_HASH is disabled, from Liping Zhang. 4) Memory leak when nft_expr_clone() fails, also from Liping Zhang. 5) Disable UFO when path will apply IPSEC tranformations, from Jakub Sitnicki. 6) Don't bogusly double cwnd in dctcp module, from Florian Westphal. 7) skb_checksum_help() should never actually use the value "0" for the resulting checksum, that has a special meaning, use CSUM_MANGLED_0 instead. From Eric Dumazet. 8) Per-tx/rx queue statistic strings are wrong in qed driver, fix from Yuval MIntz. 9) Fix SCTP reference counting of associations and transports in sctp_diag. From Xin Long. 10) When we hit ip6tunnel_xmit() we could have come from an ipv4 path in a previous layer or similar, so explicitly clear the ipv6 control block in the skb. From Eli Cooper. 11) Fix bogus sleeping inside of inet_wait_for_connect(), from WANG Cong. 12) Correct deivce ID of T6 adapter in cxgb4 driver, from Hariprasad Shenai. 13) Fix potential access past the end of the skb page frag array in tcp_sendmsg(). From Eric Dumazet. 14) 'skb' can legitimately be NULL in inet{,6}_exact_dif_match(). Fix from David Ahern. 15) Don't return an error in tcp_sendmsg() if we wronte any bytes successfully, from Eric Dumazet. 16) Extraneous unlocks in netlink_diag_dump(), we removed the locking but forgot to purge these unlock calls. From Eric Dumazet. 17) Fix memory leak in error path of __genl_register_family(). We leak the attrbuf, from WANG Cong. 18) cgroupstats netlink policy table is mis-sized, from WANG Cong. 19) Several XDP bug fixes in mlx5, from Saeed Mahameed. 20) Fix several device refcount leaks in network drivers, from Johan Hovold. 21) icmp6_send() should use skb dst device not skb->dev to determine L3 routing domain. From David Ahern. 22) ip_vs_genl_family sets maxattr incorrectly, from WANG Cong. 23) We leak new macvlan port in some cases of maclan_common_netlink() errors. Fix from Gao Feng. 24) Similar to the icmp6_send() fix, icmp_route_lookup() should determine L3 routing domain using skb_dst(skb)->dev not skb->dev. Also from David Ahern. 25) Several fixes for route offloading and FIB notification handling in mlxsw driver, from Jiri Pirko. 26) Properly cap __skb_flow_dissect()'s return value, from Eric Dumazet. 27) Fix long standing regression in ipv4 redirect handling, wrt. validating the new neighbour's reachability. From Stephen Suryaputra Lin. 28) If sk_filter() trims the packet excessively, handle it reasonably in tcp input instead of exploding. From Eric Dumazet. 29) Fix handling of napi hash state when copying channels in sfc driver, from Bert Kenward. Please pull, thanks a lot! The following changes since commit 2a26d99b251b8625d27aed14e97fc10707a3a81f: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-10-29 20:33:20 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git for you to fetch changes up to ac571de999e14b87890cb960ad6f03fbdde6abc8: mlxsw: spectrum_router: Flush FIB tables during fini (2016-11-14 16:45:16 -0500) ---------------------------------------------------------------- Alexander Duyck (1): fib_trie: Correct /proc/net/route off by one error Allan Chou (1): Net Driver: Add Cypress GX3 VID=04b4 PID=3610. Andy Gospodarek (1): bgmac: stop clearing DMA receive control register right after it is set Arkadi Sharshevsky (1): mlxsw: spectrum_router: Correctly dump neighbour activity Arnd Bergmann (3): brcmfmac: avoid maybe-uninitialized warning in brcmf_cfg80211_start_ap netfilter: ip_vs_sync: fix bogus maybe-uninitialized warning vxlan: hide unused local variable Baoquan He (2): Revert "bnx2: Reset device during driver initialization" bnx2: Wait for in-flight DMA to complete at probe stage Baruch Siach (1): net: bpqether.h: remove if_ether.h guard Benjamin Poirier (1): bna: Add synchronization for tx ring. Bert Kenward (1): sfc: clear napi_hash state when copying channels Christophe Jaillet (1): net/mlx5: Simplify a test Colin Ian King (2): net: ethernet: ixp4xx_eth: fix spelling mistake in debug message ps3_gelic: fix spelling mistake in debug message Daniel Borkmann (2): bpf: fix htab map destruction when extra reserve is in use bpf: fix map not being uncharged during map creation failure David Ahern (4): net: tcp: check skb is non-NULL for exact match on lookups net: icmp6_send should use dst dev to determine L3 domain net: icmp_route_lookup should use rt dev to determine L3 domain net: tcp response should set oif only if it is L3 master David S. Miller (14): Merge tag 'wireless-drivers-for-davem-2016-10-30' of git://git.kernel.org/.../kvalo/wireless-drivers Merge branch 'sctp-hold-transport-fixes' Merge tag 'linux-can-fixes-for-4.9-20161031' of git://git.kernel.org/.../mkl/linux-can Merge branch 'xgene-coalescing-bugs' Merge branch 'mlx5-fixes' Merge branch 'phy-ref-leaks' Merge branch 'qcom-emac-pause' Merge git://git.kernel.org/.../pablo/nf Merge branch 'qed-fixes' Merge branch 'mlxsw-fixes' Merge branch 'fix-bpf_redirect' Merge branch 'bnxt_en-fixes' Merge branch 'mlxsw-fixes' Merge branch 'bnx2-kdump-fix' Dongli Zhang (2): xen-netfront: do not cast grant table reference to signed short xen-netfront: cast grant table reference first to type int Eli Cooper (2): ip6_tunnel: Clear IP6CB in ip6tunnel_xmit() ip6_udp_tunnel: remove unused IPCB related codes Eric Dumazet (12): net: clear sk_err_soft in sk_clone_lock() net: mangle zero checksum in skb_checksum_help() tcp: fix potential memory corruption tcp: fix return value for partial writes dccp: do not release listeners too soon dccp: do not send reset to already closed sockets dccp: fix out of bound access in dccp_v4_err() netlink: netlink_diag_dump() runs without locks ipv6: dccp: fix out of bound access in dccp_v6_err() ipv6: dccp: add missing bind_conflict to dccp_ipv6_mapped net: __skb_flow_dissect() must cap its return value tcp: take care of truncations done by sk_filter() Fabian Mewes (1): Documentation: networking: dsa: Update tagging protocols Florian Fainelli (1): net: stmmac: Fix lack of link transition for fixed PHYs Florian Westphal (5): netfilter: conntrack: avoid excess memory allocation dctcp: avoid bogus doubling of cwnd after loss netfilter: connmark: ignore skbs with magic untracked conntrack objects netfilter: conntrack: fix CT target for UNSPEC helpers netfilter: conntrack: refine gc worker heuristics Gao Feng (1): driver: macvlan: Destroy new macvlan port if macvlan_common_newlink failed. Guenter Roeck (1): r8152: Fix error path in open function Guilherme G. Piccoli (1): ehea: fix operation state report Haim Dreyfuss (1): iwlwifi: mvm: comply with fw_restart mod param on suspend Hariprasad Shenai (1): cxgb4: correct device ID of T6 adapter Huy Nguyen (1): net/mlx5: Fix invalid pointer reference when prof_sel parameter is invalid Ido Schimmel (2): mlxsw: spectrum: Fix incorrect reuse of MID entries mlxsw: spectrum_router: Flush FIB tables during fini Isaac Boukris (1): unix: escape all null bytes in abstract unix domain socket Iyappan Subramanian (2): drivers: net: xgene: fix: Disable coalescing on v1 hardware drivers: net: xgene: fix: Coalescing values for v2 hardware Jakub Sitnicki (1): ipv6: Don't use ufo handling on later transformed packets Jiri Pirko (2): mlxsw: spectrum_router: Fix handling of neighbour structure mlxsw: spectrum_router: Ignore FIB notification events for non-init namespaces Johan Hovold (4): phy: fix device reference leaks net: ethernet: ti: cpsw: fix device and of_node leaks net: ethernet: ti: davinci_emac: fix device reference leak net: hns: fix device reference leaks Johannes Berg (1): iwlwifi: pcie: mark command queue lock with separate lockdep class John Allen (1): ibmvnic: Start completion queue negotiation at server-provided optimum values John W. Linville (1): netfilter: nf_tables: fix type mismatch with error return from nft_parse_u32_check Kalle Valo (1): Merge tag 'iwlwifi-for-kalle-2015-10-25' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Lance Richardson (2): ipv4: allow local fragmentation in ip_finish_output_gso() ipv4: update comment to document GSO fragmentation cases. Liping Zhang (6): netfilter: nft_dynset: fix panic if NFT_SET_HASH is not enabled netfilter: nf_tables: fix *leak* when expr clone fail netfilter: nf_tables: fix race when create new element in dynset netfilter: nf_tables: destroy the set if fail to add transaction netfilter: nft_dup: do not use sreg_dev if the user doesn't specify it netfilter: nf_tables: fix oops when inserting an element into a verdict map Luca Coelho (4): iwlwifi: mvm: use ssize_t for len in iwl_debugfs_mem_read() iwlwifi: mvm: fix d3_test with unified D0/D3 images iwlwifi: pcie: fix SPLC structure parsing iwlwifi: mvm: fix netdetect starting/stopping for unified images Lukas Resch (1): can: sja1000: plx_pci: Add support for Moxa CAN devices Maciej Żenczykowski (1): net-ipv6: on device mtu change do not add mtu to mtu-less routes Marcelo Ricardo Leitner (1): sctp: assign assoc_id earlier in __sctp_connect Mark Lord (1): r8152: Fix broken RX checksums. Martin KaFai Lau (2): bpf: Fix bpf_redirect to an ipip/ip6tnl dev bpf: Add test for bpf_redirect to ipip/ip6tnl Mathias Krause (1): rtnl: reset calcit fptr in rtnl_unregister() Michael Chan (2): bnxt_en: Fix ring arithmetic in bnxt_setup_tc(). bnxt_en: Fix VF virtual link state. Michael S. Tsirkin (1): virtio-net: drop legacy features in virtio 1 mode Mike Frysinger (1): Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" Mintz, Yuval (2): qede: Fix statistics' strings for Tx/Rx queues qede: Correctly map aggregation replacement pages Oliver Hartkopp (1): can: bcm: fix warning in bcm_connect/proc_register Or Gerlitz (3): net/mlx5e: Disallow changing name-space for VF representors net/mlx5e: Handle matching on vlan priority for offloaded TC rules net/mlx5: E-Switch, Set the actions for offloaded rules properly Rafał Miłecki (1): net: bgmac: fix reversed checks for clock control flag Ram Amrani (2): qed: configure ll2 RoCE v1/v2 flavor correctly qed: Correct rdma params configuration Russell King (1): net: mv643xx_eth: ensure coalesce settings survive read-modify-write Saeed Mahameed (3): MAINTAINERS: Update MELLANOX MLX5 core VPI driver maintainers net/mlx5e: Fix XDP error path of mlx5e_open_channel() net/mlx5e: Re-arrange XDP SQ/CQ creation Sara Sharon (1): iwlwifi: mvm: wake the wait queue when the RX sync counter is zero Soheil Hassas Yeganeh (1): sock: fix sendmmsg for partial sendmsg Stephen Suryaputra Lin (1): ipv4: use new_gw for redirect neigh lookup Tariq Toukan (1): Revert "net/mlx4_en: Fix panic during reboot" Thomas Falcon (2): ibmvnic: Unmap ibmvnic_statistics structure ibmvnic: Fix size of debugfs name buffer Timur Tabi (3): net: qcom/emac: use correct value for SGMII_LN_UCDR_SO_GAIN_MODE0 net: qcom/emac: configure the external phy to allow pause frames net: qcom/emac: enable flow control if requested Ulrich Weber (1): netfilter: nf_conntrack_sip: extend request line validation WANG Cong (4): inet: fix sleeping inside inet_wait_for_connect() genetlink: fix a memory leak on error path taskstats: fix the length of cgroupstats_cmd_get_policy ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr Xin Long (5): ipv6: add mtu lock check in __ip6_rt_update_pmtu sctp: hold transport instead of assoc in sctp_diag sctp: return back transport in __sctp_rcv_init_lookup sctp: hold transport instead of assoc when lookup assoc in rx path sctp: change sk state only when it has assocs in sctp_shutdown Yotam Gigi (1): mlxsw: spectrum: Fix refcount bug on span entries Documentation/networking/dsa/dsa.txt | 3 +- MAINTAINERS | 1 + drivers/net/can/sja1000/plx_pci.c | 18 ++++++++++ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 12 ------- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 ++ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 +- drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 12 ++++--- drivers/net/ethernet/broadcom/bgmac.c | 9 +++-- drivers/net/ethernet/broadcom/bnx2.c | 48 +++++++++++++++++++------- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++--- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 +-- drivers/net/ethernet/brocade/bna/bnad.c | 4 +-- drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 8 ++++- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 ++ drivers/net/ethernet/ibm/ibmvnic.c | 10 +++--- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 ++ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 31 +++++++++-------- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 ++- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 134 ++++++++++++++++++++++++++++++++++++---------------------------------- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 14 ++++---- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 3 -- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 + drivers/net/ethernet/qlogic/qed/qed_main.c | 17 +++++---- drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 25 +++++++++----- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qualcomm/emac/emac-mac.c | 15 +++++--- drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 2 +- drivers/net/ethernet/sfc/efx.c | 3 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++ drivers/net/ethernet/ti/cpsw-phy-sel.c | 3 ++ drivers/net/ethernet/ti/davinci_emac.c | 10 +++--- drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- drivers/net/macvlan.c | 31 ++++++++++++----- drivers/net/phy/phy_device.c | 2 ++ drivers/net/usb/ax88179_178a.c | 17 +++++++++ drivers/net/usb/r8152.c | 21 ++++++----- drivers/net/virtio_net.c | 30 ++++++++++------ drivers/net/vxlan.c | 4 ++- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 49 ++++++++++++++++++++------ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +-- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 33 ++++++++++++++---- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 79 +++++++++++++++++++++++++----------------- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 +++++ drivers/net/xen-netfront.c | 4 +-- include/linux/ipv6.h | 2 +- include/linux/netdevice.h | 15 ++++++++ include/net/ip.h | 3 +- include/net/ip6_tunnel.h | 1 + include/net/netfilter/nf_conntrack_labels.h | 3 +- include/net/netfilter/nf_tables.h | 8 +++-- include/net/sctp/sctp.h | 2 +- include/net/sock.h | 4 +-- include/net/tcp.h | 3 +- include/uapi/linux/atm_zatm.h | 1 - include/uapi/linux/bpqether.h | 2 -- kernel/bpf/hashtab.c | 3 +- kernel/bpf/syscall.c | 4 ++- kernel/taskstats.c | 6 +++- net/can/bcm.c | 32 ++++++++++++----- net/core/dev.c | 19 ++++------ net/core/filter.c | 68 +++++++++++++++++++++++++++++++----- net/core/flow_dissector.c | 11 ++++-- net/core/rtnetlink.c | 1 + net/core/sock.c | 6 ++-- net/dccp/ipv4.c | 16 +++++---- net/dccp/ipv6.c | 19 +++++----- net/dccp/proto.c | 4 +++ net/ipv4/af_inet.c | 9 +++-- net/ipv4/fib_trie.c | 21 +++++------ net/ipv4/icmp.c | 4 +-- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_output.c | 25 ++++++++------ net/ipv4/ip_tunnel_core.c | 11 ------ net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nft_dup_ipv4.c | 6 ++-- net/ipv4/route.c | 4 ++- net/ipv4/tcp.c | 4 +-- net/ipv4/tcp_dctcp.c | 13 ++++++- net/ipv4/tcp_ipv4.c | 19 +++++++++- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_output.c | 2 +- net/ipv6/ip6_udp_tunnel.c | 3 -- net/ipv6/netfilter/nft_dup_ipv6.c | 6 ++-- net/ipv6/route.c | 4 +++ net/ipv6/tcp_ipv6.c | 14 +++++--- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 7 ++-- net/netfilter/nf_conntrack_core.c | 49 +++++++++++++++++++++----- net/netfilter/nf_conntrack_helper.c | 11 ++++-- net/netfilter/nf_conntrack_sip.c | 5 ++- net/netfilter/nf_tables_api.c | 18 ++++++---- net/netfilter/nft_dynset.c | 19 ++++++---- net/netfilter/nft_set_hash.c | 19 +++++++--- net/netfilter/nft_set_rbtree.c | 2 +- net/netfilter/xt_connmark.c | 4 +-- net/netlink/diag.c | 5 +-- net/netlink/genetlink.c | 4 ++- net/sctp/input.c | 35 +++++++++---------- net/sctp/ipv6.c | 2 +- net/sctp/socket.c | 27 +++++++-------- net/socket.c | 2 ++ net/unix/af_unix.c | 3 +- samples/bpf/Makefile | 4 +++ samples/bpf/tc_l2_redirect.sh | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ samples/bpf/tc_l2_redirect_kern.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ samples/bpf/tc_l2_redirect_user.c | 73 +++++++++++++++++++++++++++++++++++++++ 120 files changed, 1358 insertions(+), 465 deletions(-) create mode 100755 samples/bpf/tc_l2_redirect.sh create mode 100644 samples/bpf/tc_l2_redirect_kern.c create mode 100644 samples/bpf/tc_l2_redirect_user.c