[GIT] Networking
From: David Miller
Date: Fri Dec 15 2017 - 16:04:26 EST
1) Clamp timeouts to INT_MAX in conntrack, from Jay Elliot.
2) Fix broken UAPI for BPF_PROG_TYPE_PERF_EVENT, from Hendrik Brueckner.
3) Fix locking in ieee80211_sta_tear_down_BA_sessions, from Johannes
Berg.
4) Add missing barriers to ptr_ring, from Michael S. Tsirkin.
5) Don't advertise gigabit in sh_eth when not available, from Thomas
Petazzoni.
6) Check network namespace when delivering to netlink taps, from
Kevin Cernekee.
7) Kill a race in raw_sendmsg(), from Mohamed Ghannam.
8) Use correct address in TCP md5 lookups when replying to an incoming
segment, from Christoph Paasch.
9) Add schedule points to BPF map alloc/free, from Eric Dumazet.
10) Don't allow silly mtu values to be used in ipv4/ipv6 multicast,
also from Eric Dumazet.
11) Fix SKB leak in tipc, from Jon Maloy.
12) Disable MAC learning on OVS ports of mlxsw, from Yuval Mintz.
13) SKB leak fix in skB_complete_tx_timestamp(), from Willem de Bruijn.
14) Add some new qmi_wwan device IDs, from Daniele Palmas.
15) Fix static key imbalance in ingress qdisc, from Jiri Pirko.
Please pull, thanks a lot!
The following changes since commit f335195adf043168ee69d78ea72ac3e30f0c57ce:
kmemcheck: rip it out for real (2017-12-08 13:40:17 -0800)
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 043ee1debd0b29c16c4c4b11a348ca667bfe9144:
net: qcom/emac: Reduce timeout for mdio read/write (2017-12-15 15:46:19 -0500)
----------------------------------------------------------------
Alexei Starovoitov (1):
Merge branch 'bpf-misc-fixes'
Arnd Bergmann (1):
netfilter: ipt_CLUSTERIP: fix clusterip_net_exit build regression
Branislav Radocaj (1):
net: ethernet: arc: fix error handling in emac_rockchip_probe
Christoph Paasch (1):
tcp md5sig: Use skb's saddr when replying to an incoming segment
Colin Ian King (2):
netfilter: remove redundant assignment to e
net: phy: meson-gxl: make function meson_gxl_read_status static
Daniel Borkmann (3):
bpf: fix corruption on concurrent perf_event_output calls
bpf: fix build issues on um due to mising bpf_perf_event.h
bpf: fix broken BPF selftest build
Daniele Palmas (1):
net: usb: qmi_wwan: add Telit ME910 PID 0x1101 support
David S. Miller (8):
Merge tag 'mac80211-for-davem-2017-12-11' of git://git.kernel.org/.../jberg/mac80211
Merge git://git.kernel.org/.../pablo/nf
Merge branch 'mlx4-misc-fixes'
Merge git://git.kernel.org/.../bpf/bpf
Merge tag 'batadv-net-for-davem-20171215' of git://git.open-mesh.org/linux-merge
Merge branch 's390-fixes'
Merge branch 'aquantia-fixes'
Merge branch 'net-sched-Make-qdisc-offload-uapi-uniform'
Eran Ben Elisha (2):
net/mlx4_core: Fix wrong calculation of free counters
net/mlx4_en: Fill all counters under one call of stats lock
Eric Dumazet (4):
bpf: add schedule points to map alloc/free
ipv6: mcast: better catch silly mtu values
ipv4: igmp: guard against silly MTU values
tcp: refresh tcp_mstamp from timers callbacks
Eric Sesterhenn (2):
netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function
netfilter: nf_ct_h323: Extend nf_h323_error_boundary to work on bits as well
Eugenia Emantayev (1):
net/mlx4_en: Fix selftest for small MTUs
Florian Westphal (2):
netfilter: conntrack: lower timeout to RETRANS seconds if window is 0
netfilter: exthdr: add missign attributes to policy
Geert Uytterhoeven (1):
Revert "ravb: add workaround for clock when resuming with WoL enabled"
Haishuang Yan (1):
ip_gre: fix wrong return value of erspan_rcv
Hemanth Puranik (1):
net: qcom/emac: Reduce timeout for mdio read/write
Igor Russkikh (9):
net: aquantia: Fix actual speed capabilities reporting
net: aquantia: Fix hardware DMA stream overload on large MRRS
net: aquantia: Extend stat counters to 64bit values
net: aquantia: Fill ndev stat couters from hardware
net: aquantia: Fill in multicast counter in ndev stats from hardware
net: aquantia: Improve link state and statistics check interval callback
net: aquantia: Update hw counters on hw init
net: aquantia: Fix typo in ethtool statistics names
net: aquantia: Increment driver version
Jann Horn (1):
netfilter: xt_bpf: add overflow checks
Jay Elliott (1):
netfilter: conntrack: clamp timeouts to INT_MAX
Jerome Brunet (1):
net: phy: meson-gxl: detect LPA corruption
Jia-Ju Bai (1):
hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close
Jie Deng (1):
dwc-xlgmac: Add co-maintainer
Jiri Pirko (2):
net: sched: fix clsact init error path
net: sched: fix static key imbalance in case of ingress/clsact_init error
Johannes Berg (3):
wireless: replace usage of hexdump with od/sed
wireless: don't write C files on failures
mac80211: fix locking in ieee80211_sta_tear_down_BA_sessions
Jon Maloy (1):
tipc: eliminate potential memory leak
Julian Wiedmann (4):
s390/qeth: apply takeover changes when mode is toggled
s390/qeth: don't apply takeover changes to RXIP
s390/qeth: lock IP table while applying takeover changes
s390/qeth: update takeover IPs after configuration change
Kevin Cernekee (4):
netfilter: nfnetlink_cthelper: Add missing permission checks
netfilter: xt_osf: Add missing permission checks
netlink: Add netns check on taps
net: igmp: Use correct source address on IGMPv3 reports
Konstantin Khlebnikov (1):
netfilter: ip6t_MASQUERADE: add dependency on conntrack module
Michael S. Tsirkin (1):
ptr_ring: add barriers
Mohamed Ghannam (1):
net: ipv4: fix for a race condition in raw_sendmsg
Pravin Shedge (1):
net: remove duplicate includes
Russell King (5):
net: dsa: allow XAUI phy interface mode
ARM: dts: vf610-zii-dev: use XAUI for DSA link ports
net: phy: fix resume handling
of_mdio / mdiobus: ensure mdio devices have fwnode correctly populated
net: phy: marvell: avoid configuring fiber page for SGMII-to-Copper
Sebastian Sjoholm (1):
net: qmi_wwan: add Sierra EM7565 1199:9091
Stephen Hemminger (1):
skge: remove redundunt free_irq under spinlock
Sven Eckelmann (4):
batman-adv: Always initialize fragment header priority
batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
batman-adv: Fix kernel-doc for timer functions
batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
Thomas Petazzoni (1):
net: sh_eth: do not advertise Gigabit capabilities when not available
Vasily Averin (1):
netfilter: exit_net cleanup check added
Wei Wang (1):
tcp: fix potential underestimation on rcv_rtt
Willem de Bruijn (1):
sock: free skb in skb_complete_tx_timestamp on error
Xin Long (2):
sctp: make sure stream nums can match optlen in sctp_setsockopt_reset_streams
fou: fix some member types in guehdr
Yuval Mintz (4):
mlxsw: spectrum: Disable MAC learning for ovs port
net: sched: Add TCA_HW_OFFLOAD
net: sched: Move to new offload indication in RED
pkt_sched: Remove TC_RED_OFFLOADED from uapi
MAINTAINERS | 1 +
arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 +--
arch/um/include/asm/Kbuild | 1 +
drivers/net/dsa/mv88e6xxx/port.c | 1 +
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 5 ++--
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c | 16 ++++++------
drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 29 ++++++++++++++++++---
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 82 +++++++++++++++++++++++++++++++++++++++-------------------
drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 5 ++--
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 17 +++++++++++-
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 29 ++++++++++++++++++++-
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 6 +++++
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 80 ++++++++++++++++++---------------------------------------
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h | 6 ++---
drivers/net/ethernet/aquantia/atlantic/ver.h | 6 +++--
drivers/net/ethernet/arc/emac_rockchip.c | 10 +++++---
drivers/net/ethernet/marvell/skge.c | 1 -
drivers/net/ethernet/mellanox/mlx4/en_port.c | 57 ++++++++++++++++++++++-------------------
drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +++
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 1 -
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 18 +++++++++++++
drivers/net/ethernet/qualcomm/emac/emac-phy.c | 7 ++---
drivers/net/ethernet/renesas/ravb_main.c | 27 ++-----------------
drivers/net/ethernet/renesas/sh_eth.c | 10 ++++++++
drivers/net/hippi/rrunner.c | 2 +-
drivers/net/phy/at803x.c | 4 ---
drivers/net/phy/marvell.c | 4 +++
drivers/net/phy/mdio_bus.c | 1 +
drivers/net/phy/meson-gxl.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
drivers/net/phy/phy.c | 9 +++----
drivers/net/phy/phy_device.c | 10 +++++---
drivers/net/usb/qmi_wwan.c | 2 ++
drivers/of/of_mdio.c | 3 +++
drivers/s390/net/qeth_core.h | 6 ++---
drivers/s390/net/qeth_core_main.c | 6 ++---
drivers/s390/net/qeth_l3.h | 2 +-
drivers/s390/net/qeth_l3_main.c | 36 ++++++++++++++++++++++----
drivers/s390/net/qeth_l3_sys.c | 75 +++++++++++++++++++++++++++++------------------------
include/linux/ptr_ring.h | 9 +++++++
include/net/gue.h | 18 ++++++-------
include/net/ip.h | 1 +
include/net/sch_generic.h | 1 +
include/uapi/linux/pkt_sched.h | 1 -
include/uapi/linux/rtnetlink.h | 1 +
kernel/bpf/hashtab.c | 2 ++
kernel/trace/bpf_trace.c | 19 +++++++++-----
net/batman-adv/bat_iv_ogm.c | 4 +--
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/fragmentation.c | 2 ++
net/batman-adv/tp_meter.c | 4 +--
net/core/netprio_cgroup.c | 1 -
net/core/skbuff.c | 6 ++++-
net/dsa/slave.c | 1 -
net/ipv4/devinet.c | 2 +-
net/ipv4/igmp.c | 44 +++++++++++++++++++++++--------
net/ipv4/ip_gre.c | 2 +-
net/ipv4/ip_tunnel.c | 4 +--
net/ipv4/netfilter/arp_tables.c | 1 -
net/ipv4/netfilter/ip_tables.c | 1 -
net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 ++-
net/ipv4/raw.c | 15 +++++++----
net/ipv4/tcp_input.c | 10 +++++---
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/tcp_timer.c | 2 ++
net/ipv6/mcast.c | 25 ++++++++++--------
net/ipv6/netfilter/ip6_tables.c | 1 -
net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 +++++-
net/ipv6/tcp_ipv6.c | 2 +-
net/mac80211/ht.c | 5 ++--
net/netfilter/nf_conntrack_h323_asn1.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
net/netfilter/nf_conntrack_netlink.c | 13 +++++++---
net/netfilter/nf_conntrack_proto_tcp.c | 3 +++
net/netfilter/nf_tables_api.c | 7 +++++
net/netfilter/nfnetlink_cthelper.c | 10 ++++++++
net/netfilter/nfnetlink_log.c | 5 ++++
net/netfilter/nfnetlink_queue.c | 5 ++++
net/netfilter/nft_exthdr.c | 2 ++
net/netfilter/x_tables.c | 9 +++++++
net/netfilter/xt_bpf.c | 6 +++++
net/netfilter/xt_osf.c | 7 +++++
net/netlink/af_netlink.c | 3 +++
net/sched/act_meta_mark.c | 1 -
net/sched/act_meta_skbtcindex.c | 1 -
net/sched/cls_api.c | 5 ++--
net/sched/cls_u32.c | 1 -
net/sched/sch_api.c | 2 ++
net/sched/sch_ingress.c | 15 +++++------
net/sched/sch_red.c | 31 +++++++++++-----------
net/sctp/socket.c | 6 ++++-
net/tipc/socket.c | 2 +-
net/wireless/Makefile | 48 ++++++++++++++++++++++++++--------
tools/include/uapi/asm/bpf_perf_event.h | 7 +++++
tools/testing/selftests/bpf/Makefile | 13 +---------
95 files changed, 802 insertions(+), 387 deletions(-)
create mode 100644 tools/include/uapi/asm/bpf_perf_event.h