Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull main rdma updates from Doug Ledford:
 "This is the main pull request for the rdma stack this release.  The
  code has been through 0day and I had it tagged for linux-next testing
  for a couple days.

  Summary:

   - updates to mlx5

   - updates to mlx4 (two conflicts, both minor and easily resolved)

   - updates to iw_cxgb4 (one conflict, not so obvious to resolve,
     proper resolution is to keep the code in cxgb4_main.c as it is in
     Linus' tree as attach_uld was refactored and moved into
     cxgb4_uld.c)

   - improvements to uAPI (moved vendor specific API elements to uAPI
     area)

   - add hns-roce driver and hns and hns-roce ACPI reset support

   - conversion of all rdma code away from deprecated
     create_singlethread_workqueue

   - security improvement: remove unsafe ib_get_dma_mr (breaks lustre in
     staging)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (75 commits)
  staging/lustre: Disable InfiniBand support
  iw_cxgb4: add fast-path for small REG_MR operations
  cxgb4: advertise support for FR_NSMR_TPTE_WR
  IB/core: correctly handle rdma_rw_init_mrs() failure
  IB/srp: Fix infinite loop when FMR sg[0].offset != 0
  IB/srp: Remove an unused argument
  IB/core: Improve ib_map_mr_sg() documentation
  IB/mlx4: Fix possible vl/sl field mismatch in LRH header in QP1 packets
  IB/mthca: Move user vendor structures
  IB/nes: Move user vendor structures
  IB/ocrdma: Move user vendor structures
  IB/mlx4: Move user vendor structures
  IB/cxgb4: Move user vendor structures
  IB/cxgb3: Move user vendor structures
  IB/mlx5: Move and decouple user vendor structures
  IB/{core,hw}: Add constant for node_desc
  ipoib: Make ipoib_warn ratelimited
  IB/mlx4/alias_GUID: Remove deprecated create_singlethread_workqueue
  IB/ipoib_verbs: Remove deprecated create_singlethread_workqueue
  IB/ipoib: Remove deprecated create_singlethread_workqueue
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/multicast.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cq.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/t4.h
Simple merge

diff --cc drivers/infiniband/hw/hfi1/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_cm.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/cq.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/mad.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/mcg.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/mlx4_ib.h
Simple merge

diff --cc drivers/infiniband/hw/mlx4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/cq.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
index 551aa0e,f4160d5..2217477
--- 1/drivers/infiniband/hw/mlx5/main.c
--- 2/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -1853,9 -2050,9 +2058,10 @@@ static struct ib_flow *mlx5_ib_create_f
                                           int domain)
  {
        struct mlx5_ib_dev *dev = to_mdev(qp->device);
 +      struct mlx5_ib_qp *mqp = to_mqp(qp);
        struct mlx5_ib_flow_handler *handler = NULL;
        struct mlx5_flow_destination *dst = NULL;
+       struct mlx5_ib_flow_prio *ft_prio_tx = NULL;
        struct mlx5_ib_flow_prio *ft_prio;
        int err;
  
@@@ -1878,12 -2075,17 +2084,20 @@@
                err = PTR_ERR(ft_prio);
                goto unlock;
        }
+       if (flow_attr->type == IB_FLOW_ATTR_SNIFFER) {
+               ft_prio_tx = get_flow_table(dev, flow_attr, MLX5_IB_FT_TX);
+               if (IS_ERR(ft_prio_tx)) {
+                       err = PTR_ERR(ft_prio_tx);
+                       ft_prio_tx = NULL;
+                       goto destroy_ft;
+               }
+       }
  
        dst->type = MLX5_FLOW_DESTINATION_TYPE_TIR;
 -      dst->tir_num = to_mqp(qp)->raw_packet_qp.rq.tirn;
 +      if (mqp->flags & MLX5_IB_QP_RSS)
 +              dst->tir_num = mqp->rss_qp.tirn;
 +      else
 +              dst->tir_num = mqp->raw_packet_qp.rq.tirn;
  
        if (flow_attr->type == IB_FLOW_ATTR_NORMAL) {
                if (flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP)  {

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib.h
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 28e653e,f6099d0..2125903
--- 1/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
--- 2/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@@ -347,9 -347,9 +347,10 @@@ struct adapter_params 
        unsigned int ofldq_wr_cred;
        bool ulptx_memwrite_dsgl;          /* use of T5 DSGL allowed */
  
 +      unsigned int nsched_cls;          /* number of traffic classes */
        unsigned int max_ordird_qp;       /* Max read depth per RDMA QP */
        unsigned int max_ird_adapter;     /* Max read depth per adapter */
+       bool fr_nsmr_tpte_wr_support;     /* FW support for FR_NSMR_TPTE_WR */
  };
  
  /* State needed to monitor the forward progress of SGE Ingress DMA activities

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
index b4b2d20,aac6e44..0945fa4
--- 1/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
--- 2/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
@@@ -550,6 -454,6 +550,7 @@@ static void uld_init(struct adapter *ad
        lld->max_ird_adapter = adap->params.max_ird_adapter;
        lld->ulptx_memwrite_dsgl = adap->params.ulptx_memwrite_dsgl;
        lld->nodeid = dev_to_node(adap->pdev_dev);
++      lld->fr_nsmr_tpte_wr_support = adap->params.fr_nsmr_tpte_wr_support;
  }
  
  static void uld_attach(struct adapter *adap, unsigned int uld)

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

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

diff --cc drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/fw.c
index f9cbc67,d87bbe6..c41ab31
--- 1/drivers/net/ethernet/mellanox/mlx4/fw.c
--- 2/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@@ -159,7 -159,7 +159,8 @@@ static void dump_dev_cap_flags2(struct 
                [32] = "Loopback source checks support",
                [33] = "RoCEv2 support",
                [34] = "DMFS Sniffer support (UC & MC)",
 +              [35] = "QinQ VST mode support",
+               [36] = "sl to vl mapping table change event support"
        };
        int i;
  

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc drivers/nvme/target/rdma.c
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
Simple merge

diff --cc include/linux/mlx4/device.h
index 59b50d3,062d10a..f6a1642
--- 1/include/linux/mlx4/device.h
--- 2/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -221,7 -222,7 +222,8 @@@ enum 
        MLX4_DEV_CAP_FLAG2_ROCE_V1_V2           = 1ULL <<  33,
        MLX4_DEV_CAP_FLAG2_DMFS_UC_MC_SNIFFER   = 1ULL <<  34,
        MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT        = 1ULL <<  35,
 -      MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 1ULL << 36,
 +      MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP          = 1ULL <<  36,
++      MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 1ULL << 37,
  };
  
  enum {

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc net/sunrpc/xprtrdma/verbs.c
Simple merge