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

Pull infiniband update from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.9:

   - SRP error handling fixes from Bart Van Assche

   - Implementation of memory windows for mlx4 from Shani Michaeli

   - Lots of cxgb4 HW driver fixes from Vipul Pandya

   - Make iSER work for virtual functions, other fixes from Or Gerlitz

   - Fix for bug in qib HW driver from Mike Marciniszyn

   - IPoIB fixes from me, Itai Garbi, Shlomo Pongratz, Yan Burman

   - Various cleanups and warning fixes from Julia Lawall, Paul Bolle,
     Wei Yongjun"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (41 commits)
  IB/mlx4: Advertise MW support
  IB/mlx4: Support memory window binding
  mlx4: Implement memory windows allocation and deallocation
  mlx4_core: Enable memory windows in {INIT, QUERY}_HCA
  mlx4_core: Disable memory windows for virtual functions
  IPoIB: Free ipoib neigh on path record failure so path rec queries are retried
  IB/srp: Fail I/O requests if the transport is offline
  IB/srp: Avoid endless SCSI error handling loop
  IB/srp: Avoid sending a task management function needlessly
  IB/srp: Track connection state properly
  IB/mlx4: Remove redundant NULL check before kfree
  IB/mlx4: Fix compiler warning about uninitialized 'vlan' variable
  IB/mlx4: Convert is_xxx variables in build_mlx_header() to bool
  IB/iser: Enable iser when FMRs are not supported
  IB/iser: Avoid error prints on EAGAIN registration failures
  IB/iser: Use proper define for the commands per LUN value advertised to SCSI ML
  IB/uverbs: Implement memory windows support in uverbs
  IB/core: Add "type 2" memory windows support
  mlx4_core: Propagate MR deregistration failures to caller
  mlx4_core: Rename MPT-related functions to have mpt_ prefix
  ...

1 files changed, 56 insertions, 7 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 5997adc943d0..083fb48dc3d7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -1231,14 +1231,14 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 
         switch (op) {
         case RES_OP_RESERVE:
-                index = __mlx4_mr_reserve(dev);
+                index = __mlx4_mpt_reserve(dev);
                 if (index == -1)
                         break;
                 id = index & mpt_mask(dev);
 
                 err = add_res_range(dev, slave, id, 1, RES_MPT, index);
                 if (err) {
-                        __mlx4_mr_release(dev, index);
+                        __mlx4_mpt_release(dev, index);
                         break;
                 }
                 set_param_l(out_param, index);
@@ -1251,7 +1251,7 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                 if (err)
                         return err;
 
-                err = __mlx4_mr_alloc_icm(dev, mpt->key);
+                err = __mlx4_mpt_alloc_icm(dev, mpt->key);
                 if (err) {
                         res_abort_move(dev, slave, RES_MPT, id);
                         return err;
@@ -1586,7 +1586,7 @@ static int mpt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                 err = rem_res_range(dev, slave, id, 1, RES_MPT, 0);
                 if (err)
                         break;
-                __mlx4_mr_release(dev, index);
+                __mlx4_mpt_release(dev, index);
                 break;
         case RES_OP_MAP_ICM:
                         index = get_param_l(&in_param);
@@ -1596,7 +1596,7 @@ static int mpt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                         if (err)
                                 return err;
 
-                        __mlx4_mr_free_icm(dev, mpt->key);
+                        __mlx4_mpt_free_icm(dev, mpt->key);
                         res_end_move(dev, slave, RES_MPT, id);
                         return err;
                 break;
@@ -1796,6 +1796,26 @@ static int mr_get_mtt_size(struct mlx4_mpt_entry *mpt)
         return be32_to_cpu(mpt->mtt_sz);
 }
 
+static u32 mr_get_pd(struct mlx4_mpt_entry *mpt)
+{
+        return be32_to_cpu(mpt->pd_flags) & 0x00ffffff;
+}
+
+static int mr_is_fmr(struct mlx4_mpt_entry *mpt)
+{
+        return be32_to_cpu(mpt->pd_flags) & MLX4_MPT_PD_FLAG_FAST_REG;
+}
+
+static int mr_is_bind_enabled(struct mlx4_mpt_entry *mpt)
+{
+        return be32_to_cpu(mpt->flags) & MLX4_MPT_FLAG_BIND_ENABLE;
+}
+
+static int mr_is_region(struct mlx4_mpt_entry *mpt)
+{
+        return be32_to_cpu(mpt->flags) & MLX4_MPT_FLAG_REGION;
+}
+
 static int qp_get_mtt_addr(struct mlx4_qp_context *qpc)
 {
         return be32_to_cpu(qpc->mtt_base_addr_l) & 0xfffffff8;
@@ -1856,12 +1876,41 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,
         int mtt_base = mr_get_mtt_addr(inbox->buf) / dev->caps.mtt_entry_sz;
         int phys;
         int id;
+        u32 pd;
+        int pd_slave;
 
         id = index & mpt_mask(dev);
         err = mr_res_start_move_to(dev, slave, id, RES_MPT_HW, &mpt);
         if (err)
                 return err;
 
+        /* Disable memory windows for VFs. */
+        if (!mr_is_region(inbox->buf)) {
+                err = -EPERM;
+                goto ex_abort;
+        }
+
+        /* Make sure that the PD bits related to the slave id are zeros. */
+        pd = mr_get_pd(inbox->buf);
+        pd_slave = (pd >> 17) & 0x7f;
+        if (pd_slave != 0 && pd_slave != slave) {
+                err = -EPERM;
+                goto ex_abort;
+        }
+
+        if (mr_is_fmr(inbox->buf)) {
+                /* FMR and Bind Enable are forbidden in slave devices. */
+                if (mr_is_bind_enabled(inbox->buf)) {
+                        err = -EPERM;
+                        goto ex_abort;
+                }
+                /* FMR and Memory Windows are also forbidden. */
+                if (!mr_is_region(inbox->buf)) {
+                        err = -EPERM;
+                        goto ex_abort;
+                }
+        }
+
         phys = mr_phys_mpt(inbox->buf);
         if (!phys) {
                 err = get_res(dev, slave, mtt_base, RES_MTT, &mtt);
@@ -3480,7 +3529,7 @@ static void rem_slave_mrs(struct mlx4_dev *dev, int slave)
                         while (state != 0) {
                                 switch (state) {
                                 case RES_MPT_RESERVED:
-                                        __mlx4_mr_release(dev, mpt->key);
+                                        __mlx4_mpt_release(dev, mpt->key);
                                         spin_lock_irq(mlx4_tlock(dev));
                                         rb_erase(&mpt->com.node,
                                                  &tracker->res_tree[RES_MPT]);
@@ -3491,7 +3540,7 @@ static void rem_slave_mrs(struct mlx4_dev *dev, int slave)
                                         break;
 
                                 case RES_MPT_MAPPED:
-                                        __mlx4_mr_free_icm(dev, mpt->key);
+                                        __mlx4_mpt_free_icm(dev, mpt->key);
                                         state = RES_MPT_RESERVED;
                                         break;