Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

 1) Significantly shrink the core networking routing structures. Result
    of http://vger.kernel.org/~davem/seoul2017_netdev_keynote.pdf

 2) Add netdevsim driver for testing various offloads, from Jakub
    Kicinski.

 3) Support cross-chip FDB operations in DSA, from Vivien Didelot.

 4) Add a 2nd listener hash table for TCP, similar to what was done for
    UDP. From Martin KaFai Lau.

 5) Add eBPF based queue selection to tun, from Jason Wang.

 6) Lockless qdisc support, from John Fastabend.

 7) SCTP stream interleave support, from Xin Long.

 8) Smoother TCP receive autotuning, from Eric Dumazet.

 9) Lots of erspan tunneling enhancements, from William Tu.

10) Add true function call support to BPF, from Alexei Starovoitov.

11) Add explicit support for GRO HW offloading, from Michael Chan.

12) Support extack generation in more netlink subsystems. From Alexander
    Aring, Quentin Monnet, and Jakub Kicinski.

13) Add 1000BaseX, flow control, and EEE support to mvneta driver. From
    Russell King.

14) Add flow table abstraction to netfilter, from Pablo Neira Ayuso.

15) Many improvements and simplifications to the NFP driver bpf JIT,
    from Jakub Kicinski.

16) Support for ipv6 non-equal cost multipath routing, from Ido
    Schimmel.

17) Add resource abstration to devlink, from Arkadi Sharshevsky.

18) Packet scheduler classifier shared filter block support, from Jiri
    Pirko.

19) Avoid locking in act_csum, from Davide Caratti.

20) devinet_ioctl() simplifications from Al viro.

21) More TCP bpf improvements from Lawrence Brakmo.

22) Add support for onlink ipv6 route flag, similar to ipv4, from David
    Ahern.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1925 commits)
  tls: Add support for encryption using async offload accelerator
  ip6mr: fix stale iterator
  net/sched: kconfig: Remove blank help texts
  openvswitch: meter: Use 64-bit arithmetic instead of 32-bit
  tcp_nv: fix potential integer overflow in tcpnv_acked
  r8169: fix RTL8168EP take too long to complete driver initialization.
  qmi_wwan: Add support for Quectel EP06
  rtnetlink: enable IFLA_IF_NETNSID for RTM_NEWLINK
  ipmr: Fix ptrdiff_t print formatting
  ibmvnic: Wait for device response when changing MAC
  qlcnic: fix deadlock bug
  tcp: release sk_frag.page in tcp_disconnect
  ipv4: Get the address of interface correctly.
  net_sched: gen_estimator: fix lockdep splat
  net: macb: Handle HRESP error
  net/mlx5e: IPoIB, Fix copy-paste bug in flow steering refactoring
  ipv6: addrconf: break critical section in addrconf_verify_rtnl()
  ipv6: change route cache aging logic
  i40e/i40evf: Update DESC_NEEDED value to reflect larger value
  bnxt_en: cleanup DIM work on device shutdown
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/lib/Makefile
index 69a473919260bf1daa5592ac56c34f656fd3a28d,25a972c61b0ae9816a817eb9681f4cd374e9e32a..91e9700cc6dcd2152f7488740ad3f9a6e1b766c4
--- 1/arch/x86/lib/Makefile
--- 2/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -26,8 -26,8 +26,9 @@@ lib-y += memcpy_$(BITS).
  lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
  lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o
  lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
+ lib-$(CONFIG_FUNCTION_ERROR_INJECTION)        += error-inject.o
  lib-$(CONFIG_RETPOLINE) += retpoline.o
 +OBJECT_FILES_NON_STANDARD_retpoline.o :=y
  
  obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o
  

diff --cc drivers/base/property.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 351f4bf37ca9e1e13fce420f7086e90b0d300830,4294673642199d3d40753508ca8a8426e1b41bbb..9040e13ce4b77845bb814b55f65704a8b8f946aa
--- 1/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
--- 2/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@@ -1712,14 -1739,6 +1752,16 @@@ void free_rspq_fl(struct adapter *adap
  void free_tx_desc(struct adapter *adap, struct sge_txq *q,
                  unsigned int n, bool unmap);
  void free_txq(struct adapter *adap, struct sge_txq *q);
 +void cxgb4_reclaim_completed_tx(struct adapter *adap,
 +                              struct sge_txq *q, bool unmap);
 +int cxgb4_map_skb(struct device *dev, const struct sk_buff *skb,
 +                dma_addr_t *addr);
 +void cxgb4_inline_tx_skb(const struct sk_buff *skb, const struct sge_txq *q,
 +                       void *pos);
 +void cxgb4_write_sgl(const struct sk_buff *skb, struct sge_txq *q,
 +                   struct ulptx_sgl *sgl, u64 *end, unsigned int start,
 +                   const dma_addr_t *addr);
 +void cxgb4_ring_tx_db(struct adapter *adap, struct sge_txq *q, int n);
+ int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,
+                   u16 vlan);
  #endif /* __CXGB4_H__ */

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
index 6c7b0ac0b48b04ed1b0b395f8bd157e1711c46aa,a7af71bf14fbb6a345d6c0192232e14eed77f835..6e310a0da7c9702b7079d76897a78b73b0bcbc4d
--- 1/drivers/net/ethernet/chelsio/cxgb4/sge.c
--- 2/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@@ -1241,11 -1360,14 +1360,14 @@@ out_free:    dev_kfree_skb_any(skb)
                return NETDEV_TX_BUSY;
        }
  
-       if (is_eth_imm(skb))
+       if (is_eth_imm(skb, chip_ver))
                immediate = true;
  
+       if (skb->encapsulation && chip_ver > CHELSIO_T5)
+               tnl_type = cxgb_encap_offload_supported(skb);
+ 
        if (!immediate &&
 -          unlikely(map_skb(adap->pdev_dev, skb, addr) < 0)) {
 +          unlikely(cxgb4_map_skb(adap->pdev_dev, skb, addr) < 0)) {
                q->mapping_err++;
                if (ptp_enabled)
                        spin_unlock(&adap->ptp_lock);

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_spq.c
Simple merge

diff --cc drivers/net/tap.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/scsi/qedf/qedf_main.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_fw.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge

diff --cc drivers/tty/serdev/core.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/free-space-cache.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

diff --cc include/linux/module.h
Simple merge

diff --cc include/linux/net.h
Simple merge

diff --cc include/linux/property.h
Simple merge

diff --cc include/linux/rtnetlink.h
Simple merge

diff --cc include/linux/serdev.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/inet_connection_sock.h
Simple merge

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/uapi/linux/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/atm/common.c
Simple merge

diff --cc net/batman-adv/icmp_socket.c
Simple merge

diff --cc net/batman-adv/log.c
Simple merge

diff --cc net/bluetooth/af_bluetooth.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/dccp/proto.c
Simple merge

diff --cc net/decnet/af_decnet.c
Simple merge

diff --cc net/ipv4/netfilter/arp_tables.c
Simple merge

diff --cc net/ipv4/netfilter/ip_tables.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_tables.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/phonet/socket.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/smc/af_smc.c
index 449f62e1e270995e00a91b20f49e0f67b7345fef,267e6837911068000fbce7edbd48919c1b54304c..3583c8ab1baee60ef73830e7219252cce8f062fc
--- 1/net/smc/af_smc.c
--- 2/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -1107,26 -1138,20 +1138,20 @@@ out
        return rc;
  }
  
 -static unsigned int smc_accept_poll(struct sock *parent)
 +static __poll_t smc_accept_poll(struct sock *parent)
  {
-       struct smc_sock *isk;
-       struct sock *sk;
- 
-       lock_sock(parent);
-       list_for_each_entry(isk, &smc_sk(parent)->accept_q, accept_q) {
-               sk = (struct sock *)isk;
+       struct smc_sock *isk = smc_sk(parent);
+       int mask = 0;
  
-               if (sk->sk_state == SMC_ACTIVE) {
-                       release_sock(parent);
-                       return POLLIN | POLLRDNORM;
-               }
-       }
-       release_sock(parent);
+       spin_lock(&isk->accept_q_lock);
+       if (!list_empty(&isk->accept_q))
+               mask = POLLIN | POLLRDNORM;
+       spin_unlock(&isk->accept_q_lock);
  
-       return 0;
+       return mask;
  }
  
 -static unsigned int smc_poll(struct file *file, struct socket *sock,
 +static __poll_t smc_poll(struct file *file, struct socket *sock,
                             poll_table *wait)
  {
        struct sock *sk = sock->sk;

diff --cc net/smc/smc_clc.c
index 511548085d168bcb5ec334627442cb077ce1033c,abf7ceb6690b13dd4e7cf7ebea7b0bfb80b6fb5a..8ac51583a063ca27449c52b296e0b3372d635261
--- 1/net/smc/smc_clc.c
--- 2/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@@ -86,12 -129,13 +132,12 @@@ int smc_clc_wait_msg(struct smc_sock *s
        }
  
        /* receive the complete CLC message */
 -      vec.iov_base = buf;
 -      vec.iov_len = buflen;
        memset(&msg, 0, sizeof(struct msghdr));
 +      iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1, buflen);
        krflags = MSG_WAITALL;
        smc->clcsock->sk->sk_rcvtimeo = CLC_WAIT_TIME;
 -      len = kernel_recvmsg(smc->clcsock, &msg, &vec, 1, datlen, krflags);
 +      len = sock_recvmsg(smc->clcsock, &msg, krflags);
-       if (len < datlen) {
+       if (len < datlen || !smc_clc_msg_hdr_valid(clcm)) {
                smc->sk.sk_err = EPROTO;
                reason_code = -EPROTO;
                goto out;

diff --cc net/socket.c
Simple merge

diff --cc net/tipc/server.c
Simple merge

diff --cc net/tipc/socket.c
index 2aa46e8cd8fe0dce2a89c66fbac95b3bbf05810f,473a096b6fba9a90aa116666b63f97da9c1e3202..163f3a54750148891153feed71a7c5297e514474
--- 1/net/tipc/socket.c
--- 2/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@@ -715,8 -716,7 +716,7 @@@ static __poll_t tipc_poll(struct file *
  {
        struct sock *sk = sock->sk;
        struct tipc_sock *tsk = tipc_sk(sk);
-       struct tipc_group *grp = tsk->group;
 -      u32 revents = 0;
 +      __poll_t revents = 0;
  
        sock_poll_wait(file, sk_sleep(sk), wait);
  

diff --cc net/unix/af_unix.c
Simple merge

diff --cc tools/build/feature/Makefile
Simple merge

diff --cc tools/include/uapi/linux/perf_event.h
Simple merge