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

Pull rdma updates from Doug Ledford:
 "This is the complete update for the rdma stack for this release cycle.

  Most of it is typical driver and core updates, but there is the
  entirely new VMWare pvrdma driver. You may have noticed that there
  were changes in DaveM's pull request to the bnxt Ethernet driver to
  support a RoCE RDMA driver. The bnxt_re driver was tentatively set to
  be pulled in this release cycle, but it simply wasn't ready in time
  and was dropped (a few review comments still to address, and some
  multi-arch build issues like prefetch() not working across all
  arches).

  Summary:

   - shared mlx5 updates with net stack (will drop out on merge if
     Dave's tree has already been merged)

   - driver updates: cxgb4, hfi1, hns-roce, i40iw, mlx4, mlx5, qedr, rxe

   - debug cleanups

   - new connection rejection helpers

   - SRP updates

   - various misc fixes

   - new paravirt driver from vmware"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (210 commits)
  IB: Add vmw_pvrdma driver
  IB/mlx4: fix improper return value
  IB/ocrdma: fix bad initialization
  infiniband: nes: return value of skb_linearize should be handled
  MAINTAINERS: Update Intel RDMA RNIC driver maintainers
  MAINTAINERS: Remove Mitesh Ahuja from emulex maintainers
  IB/core: fix unmap_sg argument
  qede: fix general protection fault may occur on probe
  IB/mthca: Replace pci_pool_alloc by pci_pool_zalloc
  mlx5, calc_sq_size(): Make a debug message more informative
  mlx5: Remove a set-but-not-used variable
  mlx5: Use { } instead of { 0 } to init struct
  IB/srp: Make writing the add_target sysfs attr interruptible
  IB/srp: Make mapping failures easier to debug
  IB/srp: Make login failures easier to debug
  IB/srp: Introduce a local variable in srp_add_one()
  IB/srp: Fix CONFIG_DYNAMIC_DEBUG=n build
  IB/multicast: Check ib_find_pkey() return value
  IPoIB: Avoid reading an uninitialized member variable
  IB/mad: Fix an array index check
  ...

18 files changed, 631 insertions, 51 deletions

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index a5f0fbedf1e7..57bec544e20a 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -577,7 +577,7 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits {
         u8         self_lb_en_modifiable[0x1];
         u8         reserved_at_9[0x2];
         u8         max_lso_cap[0x5];
-        u8         reserved_at_10[0x2];
+        u8         multi_pkt_send_wqe[0x2];
         u8         wqe_inline_mode[0x2];
         u8         rss_ind_tbl_cap[0x4];
         u8         reg_umr_sq[0x1];
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a5e6c7bca610..abf4aa4691b2 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2253,6 +2253,7 @@
 #define PCI_DEVICE_ID_RASTEL_2PORT      0x2000
 
 #define PCI_VENDOR_ID_VMWARE            0x15ad
+#define PCI_DEVICE_ID_VMWARE_VMXNET3    0x07b0
 
 #define PCI_VENDOR_ID_ZOLTRIX           0x15b0
 #define PCI_DEVICE_ID_ZOLTRIX_2BD0      0x2bd0
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 92a7d85917b4..b49258b16f4e 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -603,4 +603,10 @@ struct ib_cm_sidr_rep_param {
 int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,
                         struct ib_cm_sidr_rep_param *param);
 
+/**
+ * ibcm_reject_msg - return a pointer to a reject message string.
+ * @reason: Value returned in the REJECT event status field.
+ */
+const char *__attribute_const__ ibcm_reject_msg(int reason);
+
 #endif /* IB_CM_H */
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index c8a773ffe23b..981214b3790c 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -46,7 +46,7 @@
 #define IB_MGMT_BASE_VERSION                    1
 #define OPA_MGMT_BASE_VERSION                   0x80
 
-#define OPA_SMP_CLASS_VERSION                   0x80
+#define OPA_SM_CLASS_VERSION                    0x80
 
 /* Management classes */
 #define IB_MGMT_CLASS_SUBN_LID_ROUTED           0x01
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 5ad43a487745..8029d2a51f14 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1102,6 +1102,7 @@ enum ib_qp_attr_mask {
         IB_QP_RESERVED2                 = (1<<22),
         IB_QP_RESERVED3                 = (1<<23),
         IB_QP_RESERVED4                 = (1<<24),
+        IB_QP_RATE_LIMIT                = (1<<25),
 };
 
 enum ib_qp_state {
@@ -1151,6 +1152,7 @@ struct ib_qp_attr {
         u8                      rnr_retry;
         u8                      alt_port_num;
         u8                      alt_timeout;
+        u32                     rate_limit;
 };
 
 enum ib_wr_opcode {
@@ -1592,17 +1594,19 @@ enum ib_flow_attr_type {
 /* Supported steering header types */
 enum ib_flow_spec_type {
         /* L2 headers*/
-        IB_FLOW_SPEC_ETH        = 0x20,
-        IB_FLOW_SPEC_IB         = 0x22,
+        IB_FLOW_SPEC_ETH                = 0x20,
+        IB_FLOW_SPEC_IB                 = 0x22,
         /* L3 header*/
-        IB_FLOW_SPEC_IPV4       = 0x30,
-        IB_FLOW_SPEC_IPV6       = 0x31,
+        IB_FLOW_SPEC_IPV4               = 0x30,
+        IB_FLOW_SPEC_IPV6               = 0x31,
         /* L4 headers*/
-        IB_FLOW_SPEC_TCP        = 0x40,
-        IB_FLOW_SPEC_UDP        = 0x41
+        IB_FLOW_SPEC_TCP                = 0x40,
+        IB_FLOW_SPEC_UDP                = 0x41,
+        IB_FLOW_SPEC_VXLAN_TUNNEL       = 0x50,
+        IB_FLOW_SPEC_INNER              = 0x100,
 };
 #define IB_FLOW_SPEC_LAYER_MASK 0xF0
-#define IB_FLOW_SPEC_SUPPORT_LAYERS 4
+#define IB_FLOW_SPEC_SUPPORT_LAYERS 8
 
 /* Flow steering rule priority is set according to it's domain.
  * Lower domain value means higher priority.
@@ -1630,7 +1634,7 @@ struct ib_flow_eth_filter {
 };
 
 struct ib_flow_spec_eth {
-        enum ib_flow_spec_type    type;
+        u32                       type;
         u16                       size;
         struct ib_flow_eth_filter val;
         struct ib_flow_eth_filter mask;
@@ -1644,7 +1648,7 @@ struct ib_flow_ib_filter {
 };
 
 struct ib_flow_spec_ib {
-        enum ib_flow_spec_type   type;
+        u32                      type;
         u16                      size;
         struct ib_flow_ib_filter val;
         struct ib_flow_ib_filter mask;
@@ -1669,7 +1673,7 @@ struct ib_flow_ipv4_filter {
 };
 
 struct ib_flow_spec_ipv4 {
-        enum ib_flow_spec_type     type;
+        u32                        type;
         u16                        size;
         struct ib_flow_ipv4_filter val;
         struct ib_flow_ipv4_filter mask;
@@ -1687,7 +1691,7 @@ struct ib_flow_ipv6_filter {
 };
 
 struct ib_flow_spec_ipv6 {
-        enum ib_flow_spec_type     type;
+        u32                        type;
         u16                        size;
         struct ib_flow_ipv6_filter val;
         struct ib_flow_ipv6_filter mask;
@@ -1701,15 +1705,30 @@ struct ib_flow_tcp_udp_filter {
 };
 
 struct ib_flow_spec_tcp_udp {
-        enum ib_flow_spec_type        type;
+        u32                           type;
         u16                           size;
         struct ib_flow_tcp_udp_filter val;
         struct ib_flow_tcp_udp_filter mask;
 };
 
+struct ib_flow_tunnel_filter {
+        __be32  tunnel_id;
+        u8      real_sz[0];
+};
+
+/* ib_flow_spec_tunnel describes the Vxlan tunnel
+ * the tunnel_id from val has the vni value
+ */
+struct ib_flow_spec_tunnel {
+        u32                           type;
+        u16                           size;
+        struct ib_flow_tunnel_filter  val;
+        struct ib_flow_tunnel_filter  mask;
+};
+
 union ib_flow_spec {
         struct {
-                enum ib_flow_spec_type  type;
+                u32                     type;
                 u16                     size;
         };
         struct ib_flow_spec_eth         eth;
@@ -1717,6 +1736,7 @@ union ib_flow_spec {
         struct ib_flow_spec_ipv4        ipv4;
         struct ib_flow_spec_tcp_udp     tcp_udp;
         struct ib_flow_spec_ipv6        ipv6;
+        struct ib_flow_spec_tunnel      tunnel;
 };
 
 struct ib_flow_attr {
@@ -1933,7 +1953,8 @@ struct ib_device {
                                                struct ib_udata *udata);
         int                        (*dealloc_pd)(struct ib_pd *pd);
         struct ib_ah *             (*create_ah)(struct ib_pd *pd,
-                                                struct ib_ah_attr *ah_attr);
+                                                struct ib_ah_attr *ah_attr,
+                                                struct ib_udata *udata);
         int                        (*modify_ah)(struct ib_ah *ah,
                                                 struct ib_ah_attr *ah_attr);
         int                        (*query_ah)(struct ib_ah *ah,
@@ -2581,6 +2602,24 @@ void ib_dealloc_pd(struct ib_pd *pd);
 struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
 
 /**
+ * ib_get_gids_from_rdma_hdr - Get sgid and dgid from GRH or IPv4 header
+ *   work completion.
+ * @hdr: the L3 header to parse
+ * @net_type: type of header to parse
+ * @sgid: place to store source gid
+ * @dgid: place to store destination gid
+ */
+int ib_get_gids_from_rdma_hdr(const union rdma_network_hdr *hdr,
+                              enum rdma_network_type net_type,
+                              union ib_gid *sgid, union ib_gid *dgid);
+
+/**
+ * ib_get_rdma_header_version - Get the header version
+ * @hdr: the L3 header to parse
+ */
+int ib_get_rdma_header_version(const union rdma_network_hdr *hdr);
+
+/**
  * ib_init_ah_from_wc - Initializes address handle attributes from a
  *   work completion.
  * @device: Device on which the received message arrived.
@@ -3357,4 +3396,7 @@ int ib_sg_to_pages(struct ib_mr *mr, struct scatterlist *sgl, int sg_nents,
 void ib_drain_rq(struct ib_qp *qp);
 void ib_drain_sq(struct ib_qp *qp);
 void ib_drain_qp(struct ib_qp *qp);
+
+int ib_resolve_eth_dmac(struct ib_device *device,
+                        struct ib_ah_attr *ah_attr);
 #endif /* IB_VERBS_H */
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
index 6d0065c322b7..5cd7701db148 100644
--- a/include/rdma/iw_cm.h
+++ b/include/rdma/iw_cm.h
@@ -253,4 +253,10 @@ int iw_cm_disconnect(struct iw_cm_id *cm_id, int abrupt);
 int iw_cm_init_qp_attr(struct iw_cm_id *cm_id, struct ib_qp_attr *qp_attr,
                        int *qp_attr_mask);
 
+/**
+ * iwcm_reject_msg - return a pointer to a reject message string.
+ * @reason: Value returned in the REJECT event status field.
+ */
+const char *__attribute_const__ iwcm_reject_msg(int reason);
+
 #endif /* IW_CM_H */
diff --git a/include/rdma/opa_smi.h b/include/rdma/opa_smi.h
index 4a529ef47995..f7896117936e 100644
--- a/include/rdma/opa_smi.h
+++ b/include/rdma/opa_smi.h
@@ -44,8 +44,6 @@
 #define OPA_MAX_SLS                             32
 #define OPA_MAX_SCS                             32
 
-#define OPA_SMI_CLASS_VERSION                   0x80
-
 #define OPA_LID_PERMISSIVE                      cpu_to_be32(0xFFFFFFFF)
 
 struct opa_smp {
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index 81fb1d15e8bb..d3968b561f86 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -388,4 +388,29 @@ int rdma_set_afonly(struct rdma_cm_id *id, int afonly);
  */
 __be64 rdma_get_service_id(struct rdma_cm_id *id, struct sockaddr *addr);
 
+/**
+ * rdma_reject_msg - return a pointer to a reject message string.
+ * @id: Communication identifier that received the REJECT event.
+ * @reason: Value returned in the REJECT event status field.
+ */
+const char *__attribute_const__ rdma_reject_msg(struct rdma_cm_id *id,
+                                                int reason);
+/**
+ * rdma_is_consumer_reject - return true if the consumer rejected the connect
+ *                           request.
+ * @id: Communication identifier that received the REJECT event.
+ * @reason: Value returned in the REJECT event status field.
+ */
+bool rdma_is_consumer_reject(struct rdma_cm_id *id, int reason);
+
+/**
+ * rdma_consumer_reject_data - return the consumer reject private data and
+ *                             length, if any.
+ * @id: Communication identifier that received the REJECT event.
+ * @ev: RDMA CM reject event.
+ * @data_len: Pointer to the resulting length of the consumer data.
+ */
+const void *rdma_consumer_reject_data(struct rdma_cm_id *id,
+                                      struct rdma_cm_event *ev, u8 *data_len);
+
 #endif /* RDMA_CM_H */
diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index e31502107a58..861e23eaebda 100644
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -185,6 +185,27 @@ struct rvt_driver_provided {
          * check_support() for details.
          */
 
+        /* hot path calldowns in a single cacheline */
+
+        /*
+         * Give the driver a notice that there is send work to do. It is up to
+         * the driver to generally push the packets out, this just queues the
+         * work with the driver. There are two variants here. The no_lock
+         * version requires the s_lock not to be held. The other assumes the
+         * s_lock is held.
+         */
+        void (*schedule_send)(struct rvt_qp *qp);
+        void (*schedule_send_no_lock)(struct rvt_qp *qp);
+
+        /* Driver specific work request checking */
+        int (*check_send_wqe)(struct rvt_qp *qp, struct rvt_swqe *wqe);
+
+        /*
+         * Sometimes rdmavt needs to kick the driver's send progress. That is
+         * done by this call back.
+         */
+        void (*do_send)(struct rvt_qp *qp);
+
         /* Passed to ib core registration. Callback to create syfs files */
         int (*port_callback)(struct ib_device *, u8, struct kobject *);
 
@@ -223,22 +244,6 @@ struct rvt_driver_provided {
         void (*notify_qp_reset)(struct rvt_qp *qp);
 
         /*
-         * Give the driver a notice that there is send work to do. It is up to
-         * the driver to generally push the packets out, this just queues the
-         * work with the driver. There are two variants here. The no_lock
-         * version requires the s_lock not to be held. The other assumes the
-         * s_lock is held.
-         */
-        void (*schedule_send)(struct rvt_qp *qp);
-        void (*schedule_send_no_lock)(struct rvt_qp *qp);
-
-        /*
-         * Sometimes rdmavt needs to kick the driver's send progress. That is
-         * done by this call back.
-         */
-        void (*do_send)(struct rvt_qp *qp);
-
-        /*
          * Get a path mtu from the driver based on qp attributes.
          */
         int (*get_pmtu_from_attr)(struct rvt_dev_info *rdi, struct rvt_qp *qp,
@@ -324,9 +329,6 @@ struct rvt_driver_provided {
         void (*modify_qp)(struct rvt_qp *qp, struct ib_qp_attr *attr,
                           int attr_mask, struct ib_udata *udata);
 
-        /* Driver specific work request checking */
-        int (*check_send_wqe)(struct rvt_qp *qp, struct rvt_swqe *wqe);
-
         /* Notify driver a mad agent has been created */
         void (*notify_create_mad_agent)(struct rvt_dev_info *rdi, int port_idx);
 
@@ -355,12 +357,12 @@ struct rvt_dev_info {
         /* post send table */
         const struct rvt_operation_params *post_parms;
 
-        struct rvt_mregion __rcu *dma_mr;
-        struct rvt_lkey_table lkey_table;
-
         /* Driver specific helper functions */
         struct rvt_driver_provided driver_f;
 
+        struct rvt_mregion __rcu *dma_mr;
+        struct rvt_lkey_table lkey_table;
+
         /* Internal use */
         int n_pds_allocated;
         spinlock_t n_pds_lock; /* Protect pd allocated count */
diff --git a/include/rdma/rdmavt_mr.h b/include/rdma/rdmavt_mr.h
index 6b3c6c8b6b77..de59de28b6a2 100644
--- a/include/rdma/rdmavt_mr.h
+++ b/include/rdma/rdmavt_mr.h
@@ -90,11 +90,15 @@ struct rvt_mregion {
 #define RVT_MAX_LKEY_TABLE_BITS 23
 
 struct rvt_lkey_table {
-        spinlock_t lock; /* protect changes in this struct */
-        u32 next;               /* next unused index (speeds search) */
-        u32 gen;                /* generation count */
+        /* read mostly fields */
         u32 max;                /* size of the table */
+        u32 shift;              /* lkey/rkey shift */
         struct rvt_mregion __rcu **table;
+        /* writeable fields */
+        /* protect changes in this struct */
+        spinlock_t lock ____cacheline_aligned_in_smp;
+        u32 next;               /* next unused index (speeds search) */
+        u32 gen;                /* generation count */
 };
 
 /*
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 2c5183ef0243..f3dbd157ae5c 100644
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -51,6 +51,7 @@
 #include <rdma/rdma_vt.h>
 #include <rdma/ib_pack.h>
 #include <rdma/ib_verbs.h>
+#include <rdma/rdmavt_cq.h>
 /*
  * Atomic bit definitions for r_aflags.
  */
@@ -485,6 +486,23 @@ static inline void rvt_put_qp(struct rvt_qp *qp)
 }
 
 /**
+ * rvt_put_swqe - drop mr refs held by swqe
+ * @wqe - the send wqe
+ *
+ * This drops any mr references held by the swqe
+ */
+static inline void rvt_put_swqe(struct rvt_swqe *wqe)
+{
+        int i;
+
+        for (i = 0; i < wqe->wr.num_sge; i++) {
+                struct rvt_sge *sge = &wqe->sg_list[i];
+
+                rvt_put_mr(sge->mr);
+        }
+}
+
+/**
  * rvt_qp_wqe_reserve - reserve operation
  * @qp - the rvt qp
  * @wqe - the send wqe
@@ -527,6 +545,65 @@ static inline void rvt_qp_wqe_unreserve(
         }
 }
 
+extern const enum ib_wc_opcode ib_rvt_wc_opcode[];
+
+/**
+ * rvt_qp_swqe_complete() - insert send completion
+ * @qp - the qp
+ * @wqe - the send wqe
+ * @status - completion status
+ *
+ * Insert a send completion into the completion
+ * queue if the qp indicates it should be done.
+ *
+ * See IBTA 10.7.3.1 for info on completion
+ * control.
+ */
+static inline void rvt_qp_swqe_complete(
+        struct rvt_qp *qp,
+        struct rvt_swqe *wqe,
+        enum ib_wc_status status)
+{
+        if (unlikely(wqe->wr.send_flags & RVT_SEND_RESERVE_USED))
+                return;
+        if (!(qp->s_flags & RVT_S_SIGNAL_REQ_WR) ||
+            (wqe->wr.send_flags & IB_SEND_SIGNALED) ||
+             status != IB_WC_SUCCESS) {
+                struct ib_wc wc;
+
+                memset(&wc, 0, sizeof(wc));
+                wc.wr_id = wqe->wr.wr_id;
+                wc.status = status;
+                wc.opcode = ib_rvt_wc_opcode[wqe->wr.opcode];
+                wc.qp = &qp->ibqp;
+                wc.byte_len = wqe->length;
+                rvt_cq_enter(ibcq_to_rvtcq(qp->ibqp.send_cq), &wc,
+                             status != IB_WC_SUCCESS);
+        }
+}
+
+/**
+ * @qp - the qp pair
+ * @len - the length
+ *
+ * Perform a shift based mtu round up divide
+ */
+static inline u32 rvt_div_round_up_mtu(struct rvt_qp *qp, u32 len)
+{
+        return (len + qp->pmtu - 1) >> qp->log_pmtu;
+}
+
+/**
+ * @qp - the qp pair
+ * @len - the length
+ *
+ * Perform a shift based mtu divide
+ */
+static inline u32 rvt_div_mtu(struct rvt_qp *qp, u32 len)
+{
+        return len >> qp->log_pmtu;
+}
+
 extern const int  ib_rvt_state_ops[];
 
 struct rvt_dev_info;
diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild
index f14ab7ff5fee..82bdf5626859 100644
--- a/include/uapi/rdma/Kbuild
+++ b/include/uapi/rdma/Kbuild
@@ -14,3 +14,5 @@ header-y += mlx5-abi.h
 header-y += mthca-abi.h
 header-y += nes-abi.h
 header-y += ocrdma-abi.h
+header-y += hns-abi.h
+header-y += vmw_pvrdma-abi.h
diff --git a/include/uapi/rdma/hfi/hfi1_user.h b/include/uapi/rdma/hfi/hfi1_user.h
index d15e7289d835..587b7360e820 100644
--- a/include/uapi/rdma/hfi/hfi1_user.h
+++ b/include/uapi/rdma/hfi/hfi1_user.h
@@ -75,7 +75,7 @@
  * may not be implemented; the user code must deal with this if it
  * cares, or it must abort after initialization reports the difference.
  */
-#define HFI1_USER_SWMINOR 2
+#define HFI1_USER_SWMINOR 3
 
 /*
  * We will encode the major/minor inside a single 32bit version number.
diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
new file mode 100644
index 000000000000..5d7401963e35
--- /dev/null
+++ b/include/uapi/rdma/hns-abi.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Hisilicon Limited.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef HNS_ABI_USER_H
+#define HNS_ABI_USER_H
+
+#include <linux/types.h>
+
+struct hns_roce_ib_create_cq {
+        __u64   buf_addr;
+};
+
+struct hns_roce_ib_create_qp {
+        __u64   buf_addr;
+        __u64   db_addr;
+        __u8    log_sq_bb_count;
+        __u8    log_sq_stride;
+        __u8    sq_no_prefetch;
+        __u8    reserved[5];
+};
+
+struct hns_roce_ib_alloc_ucontext_resp {
+        __u32   qp_tab_size;
+};
+#endif /* HNS_ABI_USER_H */
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 25225ebbc7d5..dfdfe4e92d31 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -37,6 +37,7 @@
 #define IB_USER_VERBS_H
 
 #include <linux/types.h>
+#include <rdma/ib_verbs.h>
 
 /*
  * Increment this value if any changes that break userspace ABI
@@ -93,6 +94,7 @@ enum {
         IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
         IB_USER_VERBS_EX_CMD_CREATE_CQ = IB_USER_VERBS_CMD_CREATE_CQ,
         IB_USER_VERBS_EX_CMD_CREATE_QP = IB_USER_VERBS_CMD_CREATE_QP,
+        IB_USER_VERBS_EX_CMD_MODIFY_QP = IB_USER_VERBS_CMD_MODIFY_QP,
         IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
         IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
         IB_USER_VERBS_EX_CMD_CREATE_WQ,
@@ -545,6 +547,14 @@ enum {
         IB_UVERBS_CREATE_QP_SUP_COMP_MASK = IB_UVERBS_CREATE_QP_MASK_IND_TABLE,
 };
 
+enum {
+        IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
+};
+
+enum {
+        IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
+};
+
 struct ib_uverbs_ex_create_qp {
         __u64 user_handle;
         __u32 pd_handle;
@@ -684,9 +694,20 @@ struct ib_uverbs_modify_qp {
         __u64 driver_data[0];
 };
 
+struct ib_uverbs_ex_modify_qp {
+        struct ib_uverbs_modify_qp base;
+        __u32   rate_limit;
+        __u32   reserved;
+};
+
 struct ib_uverbs_modify_qp_resp {
 };
 
+struct ib_uverbs_ex_modify_qp_resp {
+        __u32  comp_mask;
+        __u32  response_length;
+};
+
 struct ib_uverbs_destroy_qp {
         __u64 response;
         __u32 qp_handle;
@@ -908,6 +929,23 @@ struct ib_uverbs_flow_spec_ipv6 {
         struct ib_uverbs_flow_ipv6_filter mask;
 };
 
+struct ib_uverbs_flow_tunnel_filter {
+        __be32 tunnel_id;
+};
+
+struct ib_uverbs_flow_spec_tunnel {
+        union {
+                struct ib_uverbs_flow_spec_hdr hdr;
+                struct {
+                        __u32 type;
+                        __u16 size;
+                        __u16 reserved;
+                };
+        };
+        struct ib_uverbs_flow_tunnel_filter val;
+        struct ib_uverbs_flow_tunnel_filter mask;
+};
+
 struct ib_uverbs_flow_attr {
         __u32 type;
         __u16 size;
diff --git a/include/uapi/rdma/mlx5-abi.h b/include/uapi/rdma/mlx5-abi.h
index f5d0f4e83b59..fae6cdaeb56d 100644
--- a/include/uapi/rdma/mlx5-abi.h
+++ b/include/uapi/rdma/mlx5-abi.h
@@ -82,6 +82,7 @@ enum mlx5_ib_alloc_ucontext_resp_mask {
 
 enum mlx5_user_cmds_supp_uhw {
         MLX5_USER_CMDS_SUPP_UHW_QUERY_DEVICE = 1 << 0,
+        MLX5_USER_CMDS_SUPP_UHW_CREATE_AH    = 1 << 1,
 };
 
 struct mlx5_ib_alloc_ucontext_resp {
@@ -124,18 +125,47 @@ struct mlx5_ib_rss_caps {
         __u8 reserved[7];
 };
 
+enum mlx5_ib_cqe_comp_res_format {
+        MLX5_IB_CQE_RES_FORMAT_HASH     = 1 << 0,
+        MLX5_IB_CQE_RES_FORMAT_CSUM     = 1 << 1,
+        MLX5_IB_CQE_RES_RESERVED        = 1 << 2,
+};
+
+struct mlx5_ib_cqe_comp_caps {
+        __u32 max_num;
+        __u32 supported_format; /* enum mlx5_ib_cqe_comp_res_format */
+};
+
+struct mlx5_packet_pacing_caps {
+        __u32 qp_rate_limit_min;
+        __u32 qp_rate_limit_max; /* In kpbs */
+
+        /* Corresponding bit will be set if qp type from
+         * 'enum ib_qp_type' is supported, e.g.
+         * supported_qpts |= 1 << IB_QPT_RAW_PACKET
+         */
+        __u32 supported_qpts;
+        __u32 reserved;
+};
+
 struct mlx5_ib_query_device_resp {
         __u32   comp_mask;
         __u32   response_length;
         struct  mlx5_ib_tso_caps tso_caps;
         struct  mlx5_ib_rss_caps rss_caps;
+        struct  mlx5_ib_cqe_comp_caps cqe_comp_caps;
+        struct  mlx5_packet_pacing_caps packet_pacing_caps;
+        __u32   mlx5_ib_support_multi_pkt_send_wqes;
+        __u32   reserved;
 };
 
 struct mlx5_ib_create_cq {
         __u64   buf_addr;
         __u64   db_addr;
         __u32   cqe_size;
-        __u32   reserved; /* explicit padding (optional on i386) */
+        __u8    cqe_comp_en;
+        __u8    cqe_comp_res_format;
+        __u16   reserved; /* explicit padding (optional on i386) */
 };
 
 struct mlx5_ib_create_cq_resp {
@@ -232,6 +262,12 @@ struct mlx5_ib_create_wq {
         __u32   reserved;
 };
 
+struct mlx5_ib_create_ah_resp {
+        __u32   response_length;
+        __u8    dmac[ETH_ALEN];
+        __u8    reserved[6];
+};
+
 struct mlx5_ib_create_wq_resp {
         __u32   response_length;
         __u32   reserved;
diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index 01923d463673..d71da36e3cd6 100644
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -110,7 +110,7 @@ struct rdma_ucm_bind {
         __u32 id;
         __u16 addr_size;
         __u16 reserved;
-        struct sockaddr_storage addr;
+        struct __kernel_sockaddr_storage addr;
 };
 
 struct rdma_ucm_resolve_ip {
@@ -126,8 +126,8 @@ struct rdma_ucm_resolve_addr {
         __u16 src_size;
         __u16 dst_size;
         __u32 reserved;
-        struct sockaddr_storage src_addr;
-        struct sockaddr_storage dst_addr;
+        struct __kernel_sockaddr_storage src_addr;
+        struct __kernel_sockaddr_storage dst_addr;
 };
 
 struct rdma_ucm_resolve_route {
@@ -164,8 +164,8 @@ struct rdma_ucm_query_addr_resp {
         __u16 pkey;
         __u16 src_size;
         __u16 dst_size;
-        struct sockaddr_storage src_addr;
-        struct sockaddr_storage dst_addr;
+        struct __kernel_sockaddr_storage src_addr;
+        struct __kernel_sockaddr_storage dst_addr;
 };
 
 struct rdma_ucm_query_path_resp {
@@ -257,7 +257,7 @@ struct rdma_ucm_join_mcast {
         __u32 id;
         __u16 addr_size;
         __u16 join_flags;
-        struct sockaddr_storage addr;
+        struct __kernel_sockaddr_storage addr;
 };
 
 struct rdma_ucm_get_event {
diff --git a/include/uapi/rdma/vmw_pvrdma-abi.h b/include/uapi/rdma/vmw_pvrdma-abi.h
new file mode 100644
index 000000000000..5016abc9ee97
--- /dev/null
+++ b/include/uapi/rdma/vmw_pvrdma-abi.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2012-2016 VMware, Inc.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of EITHER the GNU General Public License
+ * version 2 as published by the Free Software Foundation or the BSD
+ * 2-Clause License. This program is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License version 2 for more details at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program available in the file COPYING in the main
+ * directory of this source tree.
+ *
+ * The BSD 2-Clause License
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __VMW_PVRDMA_ABI_H__
+#define __VMW_PVRDMA_ABI_H__
+
+#include <linux/types.h>
+
+#define PVRDMA_UVERBS_ABI_VERSION       3               /* ABI Version. */
+#define PVRDMA_UAR_HANDLE_MASK          0x00FFFFFF      /* Bottom 24 bits. */
+#define PVRDMA_UAR_QP_OFFSET            0               /* QP doorbell. */
+#define PVRDMA_UAR_QP_SEND              BIT(30)         /* Send bit. */
+#define PVRDMA_UAR_QP_RECV              BIT(31)         /* Recv bit. */
+#define PVRDMA_UAR_CQ_OFFSET            4               /* CQ doorbell. */
+#define PVRDMA_UAR_CQ_ARM_SOL           BIT(29)         /* Arm solicited bit. */
+#define PVRDMA_UAR_CQ_ARM               BIT(30)         /* Arm bit. */
+#define PVRDMA_UAR_CQ_POLL              BIT(31)         /* Poll bit. */
+
+enum pvrdma_wr_opcode {
+        PVRDMA_WR_RDMA_WRITE,
+        PVRDMA_WR_RDMA_WRITE_WITH_IMM,
+        PVRDMA_WR_SEND,
+        PVRDMA_WR_SEND_WITH_IMM,
+        PVRDMA_WR_RDMA_READ,
+        PVRDMA_WR_ATOMIC_CMP_AND_SWP,
+        PVRDMA_WR_ATOMIC_FETCH_AND_ADD,
+        PVRDMA_WR_LSO,
+        PVRDMA_WR_SEND_WITH_INV,
+        PVRDMA_WR_RDMA_READ_WITH_INV,
+        PVRDMA_WR_LOCAL_INV,
+        PVRDMA_WR_FAST_REG_MR,
+        PVRDMA_WR_MASKED_ATOMIC_CMP_AND_SWP,
+        PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD,
+        PVRDMA_WR_BIND_MW,
+        PVRDMA_WR_REG_SIG_MR,
+};
+
+enum pvrdma_wc_status {
+        PVRDMA_WC_SUCCESS,
+        PVRDMA_WC_LOC_LEN_ERR,
+        PVRDMA_WC_LOC_QP_OP_ERR,
+        PVRDMA_WC_LOC_EEC_OP_ERR,
+        PVRDMA_WC_LOC_PROT_ERR,
+        PVRDMA_WC_WR_FLUSH_ERR,
+        PVRDMA_WC_MW_BIND_ERR,
+        PVRDMA_WC_BAD_RESP_ERR,
+        PVRDMA_WC_LOC_ACCESS_ERR,
+        PVRDMA_WC_REM_INV_REQ_ERR,
+        PVRDMA_WC_REM_ACCESS_ERR,
+        PVRDMA_WC_REM_OP_ERR,
+        PVRDMA_WC_RETRY_EXC_ERR,
+        PVRDMA_WC_RNR_RETRY_EXC_ERR,
+        PVRDMA_WC_LOC_RDD_VIOL_ERR,
+        PVRDMA_WC_REM_INV_RD_REQ_ERR,
+        PVRDMA_WC_REM_ABORT_ERR,
+        PVRDMA_WC_INV_EECN_ERR,
+        PVRDMA_WC_INV_EEC_STATE_ERR,
+        PVRDMA_WC_FATAL_ERR,
+        PVRDMA_WC_RESP_TIMEOUT_ERR,
+        PVRDMA_WC_GENERAL_ERR,
+};
+
+enum pvrdma_wc_opcode {
+        PVRDMA_WC_SEND,
+        PVRDMA_WC_RDMA_WRITE,
+        PVRDMA_WC_RDMA_READ,
+        PVRDMA_WC_COMP_SWAP,
+        PVRDMA_WC_FETCH_ADD,
+        PVRDMA_WC_BIND_MW,
+        PVRDMA_WC_LSO,
+        PVRDMA_WC_LOCAL_INV,
+        PVRDMA_WC_FAST_REG_MR,
+        PVRDMA_WC_MASKED_COMP_SWAP,
+        PVRDMA_WC_MASKED_FETCH_ADD,
+        PVRDMA_WC_RECV = 1 << 7,
+        PVRDMA_WC_RECV_RDMA_WITH_IMM,
+};
+
+enum pvrdma_wc_flags {
+        PVRDMA_WC_GRH                   = 1 << 0,
+        PVRDMA_WC_WITH_IMM              = 1 << 1,
+        PVRDMA_WC_WITH_INVALIDATE       = 1 << 2,
+        PVRDMA_WC_IP_CSUM_OK            = 1 << 3,
+        PVRDMA_WC_WITH_SMAC             = 1 << 4,
+        PVRDMA_WC_WITH_VLAN             = 1 << 5,
+        PVRDMA_WC_FLAGS_MAX             = PVRDMA_WC_WITH_VLAN,
+};
+
+struct pvrdma_alloc_ucontext_resp {
+        __u32 qp_tab_size;
+        __u32 reserved;
+};
+
+struct pvrdma_alloc_pd_resp {
+        __u32 pdn;
+        __u32 reserved;
+};
+
+struct pvrdma_create_cq {
+        __u64 buf_addr;
+        __u32 buf_size;
+        __u32 reserved;
+};
+
+struct pvrdma_create_cq_resp {
+        __u32 cqn;
+        __u32 reserved;
+};
+
+struct pvrdma_resize_cq {
+        __u64 buf_addr;
+        __u32 buf_size;
+        __u32 reserved;
+};
+
+struct pvrdma_create_srq {
+        __u64 buf_addr;
+};
+
+struct pvrdma_create_srq_resp {
+        __u32 srqn;
+        __u32 reserved;
+};
+
+struct pvrdma_create_qp {
+        __u64 rbuf_addr;
+        __u64 sbuf_addr;
+        __u32 rbuf_size;
+        __u32 sbuf_size;
+        __u64 qp_addr;
+};
+
+/* PVRDMA masked atomic compare and swap */
+struct pvrdma_ex_cmp_swap {
+        __u64 swap_val;
+        __u64 compare_val;
+        __u64 swap_mask;
+        __u64 compare_mask;
+};
+
+/* PVRDMA masked atomic fetch and add */
+struct pvrdma_ex_fetch_add {
+        __u64 add_val;
+        __u64 field_boundary;
+};
+
+/* PVRDMA address vector. */
+struct pvrdma_av {
+        __u32 port_pd;
+        __u32 sl_tclass_flowlabel;
+        __u8 dgid[16];
+        __u8 src_path_bits;
+        __u8 gid_index;
+        __u8 stat_rate;
+        __u8 hop_limit;
+        __u8 dmac[6];
+        __u8 reserved[6];
+};
+
+/* PVRDMA scatter/gather entry */
+struct pvrdma_sge {
+        __u64   addr;
+        __u32   length;
+        __u32   lkey;
+};
+
+/* PVRDMA receive queue work request */
+struct pvrdma_rq_wqe_hdr {
+        __u64 wr_id;            /* wr id */
+        __u32 num_sge;          /* size of s/g array */
+        __u32 total_len;        /* reserved */
+};
+/* Use pvrdma_sge (ib_sge) for receive queue s/g array elements. */
+
+/* PVRDMA send queue work request */
+struct pvrdma_sq_wqe_hdr {
+        __u64 wr_id;            /* wr id */
+        __u32 num_sge;          /* size of s/g array */
+        __u32 total_len;        /* reserved */
+        __u32 opcode;           /* operation type */
+        __u32 send_flags;       /* wr flags */
+        union {
+                __u32 imm_data;
+                __u32 invalidate_rkey;
+        } ex;
+        __u32 reserved;
+        union {
+                struct {
+                        __u64 remote_addr;
+                        __u32 rkey;
+                        __u8 reserved[4];
+                } rdma;
+                struct {
+                        __u64 remote_addr;
+                        __u64 compare_add;
+                        __u64 swap;
+                        __u32 rkey;
+                        __u32 reserved;
+                } atomic;
+                struct {
+                        __u64 remote_addr;
+                        __u32 log_arg_sz;
+                        __u32 rkey;
+                        union {
+                                struct pvrdma_ex_cmp_swap  cmp_swap;
+                                struct pvrdma_ex_fetch_add fetch_add;
+                        } wr_data;
+                } masked_atomics;
+                struct {
+                        __u64 iova_start;
+                        __u64 pl_pdir_dma;
+                        __u32 page_shift;
+                        __u32 page_list_len;
+                        __u32 length;
+                        __u32 access_flags;
+                        __u32 rkey;
+                } fast_reg;
+                struct {
+                        __u32 remote_qpn;
+                        __u32 remote_qkey;
+                        struct pvrdma_av av;
+                } ud;
+        } wr;
+};
+/* Use pvrdma_sge (ib_sge) for send queue s/g array elements. */
+
+/* Completion queue element. */
+struct pvrdma_cqe {
+        __u64 wr_id;
+        __u64 qp;
+        __u32 opcode;
+        __u32 status;
+        __u32 byte_len;
+        __u32 imm_data;
+        __u32 src_qp;
+        __u32 wc_flags;
+        __u32 vendor_err;
+        __u16 pkey_index;
+        __u16 slid;
+        __u8 sl;
+        __u8 dlid_path_bits;
+        __u8 port_num;
+        __u8 smac[6];
+        __u8 reserved2[7]; /* Pad to next power of 2 (64). */
+};
+
+#endif /* __VMW_PVRDMA_ABI_H__ */