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

Pull infiniband updates from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.19:

   - On-demand paging support in core midlayer and mlx5 driver.  This
     lets userspace create non-pinned memory regions and have the
     adapter HW trigger page faults.
   - iSER and IPoIB updates and fixes.
   - Low-level HW driver updates for cxgb4, mlx4 and ocrdma.
   - Other miscellaneous fixes"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (56 commits)
  IB/mlx5: Implement on demand paging by adding support for MMU notifiers
  IB/mlx5: Add support for RDMA read/write responder page faults
  IB/mlx5: Handle page faults
  IB/mlx5: Page faults handling infrastructure
  IB/mlx5: Add mlx5_ib_update_mtt to update page tables after creation
  IB/mlx5: Changes in memory region creation to support on-demand paging
  IB/mlx5: Implement the ODP capability query verb
  mlx5_core: Add support for page faults events and low level handling
  mlx5_core: Re-add MLX5_DEV_CAP_FLAG_ON_DMND_PG flag
  IB/srp: Allow newline separator for connection string
  IB/core: Implement support for MMU notifiers regarding on demand paging regions
  IB/core: Add support for on demand paging regions
  IB/core: Add flags for on demand paging support
  IB/core: Add support for extended query device caps
  IB/mlx5: Add function to read WQE from user-space
  IB/core: Add umem function to read data from user-space
  IB/core: Replace ib_umem's offset field with a full address
  IB/mlx5: Enhance UMR support to allow partial page table update
  IB/mlx5: Remove per-MR pas and dma pointers
  RDMA/ocrdma: Always resolve destination mac from GRH for UD QPs
  ...

4 files changed, 174 insertions, 4 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index b935bf3d0bb3..943cbd47d832 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -171,9 +171,9 @@ int mlx4_check_port_params(struct mlx4_dev *dev,
 {
         int i;
 
-        for (i = 0; i < dev->caps.num_ports - 1; i++) {
-                if (port_type[i] != port_type[i + 1]) {
-                        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_DPDP)) {
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_DPDP)) {
+                for (i = 0; i < dev->caps.num_ports - 1; i++) {
+                        if (port_type[i] != port_type[i + 1]) {
                                 mlx4_err(dev, "Only same port types supported on this HCA, aborting\n");
                                 return -EINVAL;
                         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index ab684463780b..da82991239a8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -157,6 +157,8 @@ static const char *eqe_type_str(u8 type)
                 return "MLX5_EVENT_TYPE_CMD";
         case MLX5_EVENT_TYPE_PAGE_REQUEST:
                 return "MLX5_EVENT_TYPE_PAGE_REQUEST";
+        case MLX5_EVENT_TYPE_PAGE_FAULT:
+                return "MLX5_EVENT_TYPE_PAGE_FAULT";
         default:
                 return "Unrecognized event";
         }
@@ -279,6 +281,11 @@ static int mlx5_eq_int(struct mlx5_core_dev *dev, struct mlx5_eq *eq)
                         }
                         break;
 
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+                case MLX5_EVENT_TYPE_PAGE_FAULT:
+                        mlx5_eq_pagefault(dev, eqe);
+                        break;
+#endif
 
                 default:
                         mlx5_core_warn(dev, "Unhandled event 0x%x on EQ 0x%x\n",
@@ -446,8 +453,12 @@ void mlx5_eq_cleanup(struct mlx5_core_dev *dev)
 int mlx5_start_eqs(struct mlx5_core_dev *dev)
 {
         struct mlx5_eq_table *table = &dev->priv.eq_table;
+        u32 async_event_mask = MLX5_ASYNC_EVENT_MASK;
         int err;
 
+        if (dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
+                async_event_mask |= (1ull << MLX5_EVENT_TYPE_PAGE_FAULT);
+
         err = mlx5_create_map_eq(dev, &table->cmd_eq, MLX5_EQ_VEC_CMD,
                                  MLX5_NUM_CMD_EQE, 1ull << MLX5_EVENT_TYPE_CMD,
                                  "mlx5_cmd_eq", &dev->priv.uuari.uars[0]);
@@ -459,7 +470,7 @@ int mlx5_start_eqs(struct mlx5_core_dev *dev)
         mlx5_cmd_use_events(dev);
 
         err = mlx5_create_map_eq(dev, &table->async_eq, MLX5_EQ_VEC_ASYNC,
-                                 MLX5_NUM_ASYNC_EQE, MLX5_ASYNC_EVENT_MASK,
+                                 MLX5_NUM_ASYNC_EQE, async_event_mask,
                                  "mlx5_async_eq", &dev->priv.uuari.uars[0]);
         if (err) {
                 mlx5_core_warn(dev, "failed to create async EQ %d\n", err);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index 087c4c797deb..06f9036acd83 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -69,6 +69,46 @@ int mlx5_cmd_query_hca_cap(struct mlx5_core_dev *dev, struct mlx5_caps *caps)
         return mlx5_core_get_caps(dev, caps, HCA_CAP_OPMOD_GET_CUR);
 }
 
+int mlx5_query_odp_caps(struct mlx5_core_dev *dev, struct mlx5_odp_caps *caps)
+{
+        u8 in[MLX5_ST_SZ_BYTES(query_hca_cap_in)];
+        int out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);
+        void *out;
+        int err;
+
+        if (!(dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG))
+                return -ENOTSUPP;
+
+        memset(in, 0, sizeof(in));
+        out = kzalloc(out_sz, GFP_KERNEL);
+        if (!out)
+                return -ENOMEM;
+        MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);
+        MLX5_SET(query_hca_cap_in, in, op_mod, HCA_CAP_OPMOD_GET_ODP_CUR);
+        err = mlx5_cmd_exec(dev, in, sizeof(in), out, out_sz);
+        if (err)
+                goto out;
+
+        err = mlx5_cmd_status_to_err_v2(out);
+        if (err) {
+                mlx5_core_warn(dev, "query cur hca ODP caps failed, %d\n", err);
+                goto out;
+        }
+
+        memcpy(caps, MLX5_ADDR_OF(query_hca_cap_out, out, capability_struct),
+               sizeof(*caps));
+
+        mlx5_core_dbg(dev, "on-demand paging capabilities:\nrc: %08x\nuc: %08x\nud: %08x\n",
+                be32_to_cpu(caps->per_transport_caps.rc_odp_caps),
+                be32_to_cpu(caps->per_transport_caps.uc_odp_caps),
+                be32_to_cpu(caps->per_transport_caps.ud_odp_caps));
+
+out:
+        kfree(out);
+        return err;
+}
+EXPORT_SYMBOL(mlx5_query_odp_caps);
+
 int mlx5_cmd_init_hca(struct mlx5_core_dev *dev)
 {
         struct mlx5_cmd_init_hca_mbox_in in;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
index 5261a2b0da43..575d853dbe05 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
@@ -88,6 +88,95 @@ void mlx5_rsc_event(struct mlx5_core_dev *dev, u32 rsn, int event_type)
         mlx5_core_put_rsc(common);
 }
 
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+void mlx5_eq_pagefault(struct mlx5_core_dev *dev, struct mlx5_eqe *eqe)
+{
+        struct mlx5_eqe_page_fault *pf_eqe = &eqe->data.page_fault;
+        int qpn = be32_to_cpu(pf_eqe->flags_qpn) & MLX5_QPN_MASK;
+        struct mlx5_core_rsc_common *common = mlx5_get_rsc(dev, qpn);
+        struct mlx5_core_qp *qp =
+                container_of(common, struct mlx5_core_qp, common);
+        struct mlx5_pagefault pfault;
+
+        if (!qp) {
+                mlx5_core_warn(dev, "ODP event for non-existent QP %06x\n",
+                               qpn);
+                return;
+        }
+
+        pfault.event_subtype = eqe->sub_type;
+        pfault.flags = (be32_to_cpu(pf_eqe->flags_qpn) >> MLX5_QPN_BITS) &
+                (MLX5_PFAULT_REQUESTOR | MLX5_PFAULT_WRITE | MLX5_PFAULT_RDMA);
+        pfault.bytes_committed = be32_to_cpu(
+                pf_eqe->bytes_committed);
+
+        mlx5_core_dbg(dev,
+                      "PAGE_FAULT: subtype: 0x%02x, flags: 0x%02x,\n",
+                      eqe->sub_type, pfault.flags);
+
+        switch (eqe->sub_type) {
+        case MLX5_PFAULT_SUBTYPE_RDMA:
+                /* RDMA based event */
+                pfault.rdma.r_key =
+                        be32_to_cpu(pf_eqe->rdma.r_key);
+                pfault.rdma.packet_size =
+                        be16_to_cpu(pf_eqe->rdma.packet_length);
+                pfault.rdma.rdma_op_len =
+                        be32_to_cpu(pf_eqe->rdma.rdma_op_len);
+                pfault.rdma.rdma_va =
+                        be64_to_cpu(pf_eqe->rdma.rdma_va);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: qpn: 0x%06x, r_key: 0x%08x,\n",
+                              qpn, pfault.rdma.r_key);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: rdma_op_len: 0x%08x,\n",
+                              pfault.rdma.rdma_op_len);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: rdma_va: 0x%016llx,\n",
+                              pfault.rdma.rdma_va);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: bytes_committed: 0x%06x\n",
+                              pfault.bytes_committed);
+                break;
+
+        case MLX5_PFAULT_SUBTYPE_WQE:
+                /* WQE based event */
+                pfault.wqe.wqe_index =
+                        be16_to_cpu(pf_eqe->wqe.wqe_index);
+                pfault.wqe.packet_size =
+                        be16_to_cpu(pf_eqe->wqe.packet_length);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: qpn: 0x%06x, wqe_index: 0x%04x,\n",
+                              qpn, pfault.wqe.wqe_index);
+                mlx5_core_dbg(dev,
+                              "PAGE_FAULT: bytes_committed: 0x%06x\n",
+                              pfault.bytes_committed);
+                break;
+
+        default:
+                mlx5_core_warn(dev,
+                               "Unsupported page fault event sub-type: 0x%02hhx, QP %06x\n",
+                               eqe->sub_type, qpn);
+                /* Unsupported page faults should still be resolved by the
+                 * page fault handler
+                 */
+        }
+
+        if (qp->pfault_handler) {
+                qp->pfault_handler(qp, &pfault);
+        } else {
+                mlx5_core_err(dev,
+                              "ODP event for QP %08x, without a fault handler in QP\n",
+                              qpn);
+                /* Page fault will remain unresolved. QP will hang until it is
+                 * destroyed
+                 */
+        }
+
+        mlx5_core_put_rsc(common);
+}
+#endif
+
 int mlx5_core_create_qp(struct mlx5_core_dev *dev,
                         struct mlx5_core_qp *qp,
                         struct mlx5_create_qp_mbox_in *in,
@@ -322,3 +411,33 @@ int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn)
         return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_core_xrcd_dealloc);
+
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+int mlx5_core_page_fault_resume(struct mlx5_core_dev *dev, u32 qpn,
+                                u8 flags, int error)
+{
+        struct mlx5_page_fault_resume_mbox_in in;
+        struct mlx5_page_fault_resume_mbox_out out;
+        int err;
+
+        memset(&in, 0, sizeof(in));
+        memset(&out, 0, sizeof(out));
+        in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_PAGE_FAULT_RESUME);
+        in.hdr.opmod = 0;
+        flags &= (MLX5_PAGE_FAULT_RESUME_REQUESTOR |
+                  MLX5_PAGE_FAULT_RESUME_WRITE     |
+                  MLX5_PAGE_FAULT_RESUME_RDMA);
+        flags |= (error ? MLX5_PAGE_FAULT_RESUME_ERROR : 0);
+        in.flags_qpn = cpu_to_be32((qpn & MLX5_QPN_MASK) |
+                                   (flags << MLX5_QPN_BITS));
+        err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
+        if (err)
+                return err;
+
+        if (out.hdr.status)
+                err = mlx5_cmd_status_to_err(&out.hdr);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_core_page_fault_resume);
+#endif