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

Pull infiniband/rdma updates from Roland Dreier:
 "Main set of InfiniBand/RDMA updates for 3.17 merge window:

   - MR reregistration support
   - MAD support for RMPP in userspace
   - iSER and SRP initiator updates
   - ocrdma hardware driver updates
   - other fixes..."

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (52 commits)
  IB/srp: Fix return value check in srp_init_module()
  RDMA/ocrdma: report asic-id in query device
  RDMA/ocrdma: Update sli data structure for endianness
  RDMA/ocrdma: Obtain SL from device structure
  RDMA/uapi: Include socket.h in rdma_user_cm.h
  IB/srpt: Handle GID change events
  IB/mlx5: Use ARRAY_SIZE instead of sizeof/sizeof[0]
  IB/mlx4: Use ARRAY_SIZE instead of sizeof/sizeof[0]
  RDMA/amso1100: Check for integer overflow in c2_alloc_cq_buf()
  IPoIB: Remove unnecessary test for NULL before debugfs_remove()
  IB/mad: Add user space RMPP support
  IB/mad: add new ioctl to ABI to support new registration options
  IB/mad: Add dev_notice messages for various umad/mad registration failures
  IB/mad: Update module to [pr|dev]_* style print messages
  IB/ipoib: Avoid multicast join attempts with invalid P_key
  IB/umad: Update module to [pr|dev]_* style print messages
  IB/ipoib: Avoid flushing the workqueue from worker context
  IB/ipoib: Use P_Key change event instead of P_Key polling mechanism
  IB/ipath: Add P_Key change event support
  mlx4_core: Add support for secure-host and SMP firewall
  ...

4 files changed, 55 insertions, 101 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index c639f90cfda4..3edce617c31b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -86,7 +86,6 @@ enum {
         IPOIB_FLAG_INITIALIZED    = 1,
         IPOIB_FLAG_ADMIN_UP       = 2,
         IPOIB_PKEY_ASSIGNED       = 3,
-        IPOIB_PKEY_STOP           = 4,
         IPOIB_FLAG_SUBINTERFACE   = 5,
         IPOIB_MCAST_RUN           = 6,
         IPOIB_STOP_REAPER         = 7,
@@ -312,7 +311,6 @@ struct ipoib_dev_priv {
         struct list_head multicast_list;
         struct rb_root multicast_tree;
 
-        struct delayed_work pkey_poll_task;
         struct delayed_work mcast_task;
         struct work_struct carrier_on_task;
         struct work_struct flush_light;
@@ -473,10 +471,11 @@ void ipoib_ib_dev_flush_heavy(struct work_struct *work);
 void ipoib_pkey_event(struct work_struct *work);
 void ipoib_ib_dev_cleanup(struct net_device *dev);
 
-int ipoib_ib_dev_open(struct net_device *dev);
+int ipoib_ib_dev_open(struct net_device *dev, int flush);
 int ipoib_ib_dev_up(struct net_device *dev);
 int ipoib_ib_dev_down(struct net_device *dev, int flush);
 int ipoib_ib_dev_stop(struct net_device *dev, int flush);
+void ipoib_pkey_dev_check_presence(struct net_device *dev);
 
 int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);
 void ipoib_dev_cleanup(struct net_device *dev);
@@ -532,8 +531,7 @@ int  ipoib_set_mode(struct net_device *dev, const char *buf);
 
 void ipoib_setup(struct net_device *dev);
 
-void ipoib_pkey_poll(struct work_struct *work);
-int ipoib_pkey_dev_delay_open(struct net_device *dev);
+void ipoib_pkey_open(struct ipoib_dev_priv *priv);
 void ipoib_drain_cq(struct net_device *dev);
 
 void ipoib_set_ethtool_ops(struct net_device *dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index 50061854616e..6bd5740e2691 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -281,10 +281,8 @@ void ipoib_delete_debug_files(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        if (priv->mcg_dentry)
-                debugfs_remove(priv->mcg_dentry);
-        if (priv->path_dentry)
-                debugfs_remove(priv->path_dentry);
+        debugfs_remove(priv->mcg_dentry);
+        debugfs_remove(priv->path_dentry);
 }
 
 int ipoib_register_debugfs(void)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 6a7003ddb0be..72626c348174 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -664,17 +664,18 @@ static void ipoib_ib_tx_timer_func(unsigned long ctx)
         drain_tx_cq((struct net_device *)ctx);
 }
 
-int ipoib_ib_dev_open(struct net_device *dev)
+int ipoib_ib_dev_open(struct net_device *dev, int flush)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         int ret;
 
-        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &priv->pkey_index)) {
-                ipoib_warn(priv, "P_Key 0x%04x not found\n", priv->pkey);
-                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+        ipoib_pkey_dev_check_presence(dev);
+
+        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
+                ipoib_warn(priv, "P_Key 0x%04x is %s\n", priv->pkey,
+                           (!(priv->pkey & 0x7fff) ? "Invalid" : "not found"));
                 return -1;
         }
-        set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
 
         ret = ipoib_init_qp(dev);
         if (ret) {
@@ -705,16 +706,17 @@ int ipoib_ib_dev_open(struct net_device *dev)
 dev_stop:
         if (!test_and_set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags))
                 napi_enable(&priv->napi);
-        ipoib_ib_dev_stop(dev, 1);
+        ipoib_ib_dev_stop(dev, flush);
         return -1;
 }
 
-static void ipoib_pkey_dev_check_presence(struct net_device *dev)
+void ipoib_pkey_dev_check_presence(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
-        u16 pkey_index = 0;
 
-        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
+        if (!(priv->pkey & 0x7fff) ||
+            ib_find_pkey(priv->ca, priv->port, priv->pkey,
+                         &priv->pkey_index))
                 clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
         else
                 set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
@@ -745,14 +747,6 @@ int ipoib_ib_dev_down(struct net_device *dev, int flush)
         clear_bit(IPOIB_FLAG_OPER_UP, &priv->flags);
         netif_carrier_off(dev);
 
-        /* Shutdown the P_Key thread if still active */
-        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
-                mutex_lock(&pkey_mutex);
-                set_bit(IPOIB_PKEY_STOP, &priv->flags);
-                cancel_delayed_work_sync(&priv->pkey_poll_task);
-                mutex_unlock(&pkey_mutex);
-        }
-
         ipoib_mcast_stop_thread(dev, flush);
         ipoib_mcast_dev_flush(dev);
 
@@ -924,7 +918,7 @@ int ipoib_ib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
                     (unsigned long) dev);
 
         if (dev->flags & IFF_UP) {
-                if (ipoib_ib_dev_open(dev)) {
+                if (ipoib_ib_dev_open(dev, 1)) {
                         ipoib_transport_dev_cleanup(dev);
                         return -ENODEV;
                 }
@@ -966,13 +960,27 @@ static inline int update_parent_pkey(struct ipoib_dev_priv *priv)
 
         return 1;
 }
+/*
+ * returns 0 if pkey value was found in a different slot.
+ */
+static inline int update_child_pkey(struct ipoib_dev_priv *priv)
+{
+        u16 old_index = priv->pkey_index;
+
+        priv->pkey_index = 0;
+        ipoib_pkey_dev_check_presence(priv->dev);
+
+        if (test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags) &&
+            (old_index == priv->pkey_index))
+                return 1;
+        return 0;
+}
 
 static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
                                 enum ipoib_flush_level level)
 {
         struct ipoib_dev_priv *cpriv;
         struct net_device *dev = priv->dev;
-        u16 new_index;
         int result;
 
         down_read(&priv->vlan_rwsem);
@@ -986,16 +994,20 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
 
         up_read(&priv->vlan_rwsem);
 
-        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) {
-                /* for non-child devices must check/update the pkey value here */
-                if (level == IPOIB_FLUSH_HEAVY &&
-                    !test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))
-                        update_parent_pkey(priv);
+        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags) &&
+            level != IPOIB_FLUSH_HEAVY) {
                 ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_INITIALIZED not set.\n");
                 return;
         }
 
         if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags)) {
+                /* interface is down. update pkey and leave. */
+                if (level == IPOIB_FLUSH_HEAVY) {
+                        if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))
+                                update_parent_pkey(priv);
+                        else
+                                update_child_pkey(priv);
+                }
                 ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_ADMIN_UP not set.\n");
                 return;
         }
@@ -1005,20 +1017,13 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
                  * (parent) devices should always takes what present in pkey index 0
                  */
                 if (test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
-                        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &new_index)) {
-                                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-                                ipoib_ib_dev_down(dev, 0);
-                                ipoib_ib_dev_stop(dev, 0);
-                                if (ipoib_pkey_dev_delay_open(dev))
-                                        return;
-                        }
-                        /* restart QP only if P_Key index is changed */
-                        if (test_and_set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags) &&
-                            new_index == priv->pkey_index) {
+                        result = update_child_pkey(priv);
+                        if (result) {
+                                /* restart QP only if P_Key index is changed */
                                 ipoib_dbg(priv, "Not flushing - P_Key index not changed.\n");
                                 return;
                         }
-                        priv->pkey_index = new_index;
+
                 } else {
                         result = update_parent_pkey(priv);
                         /* restart QP only if P_Key value changed */
@@ -1038,8 +1043,12 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
                 ipoib_ib_dev_down(dev, 0);
 
         if (level == IPOIB_FLUSH_HEAVY) {
-                ipoib_ib_dev_stop(dev, 0);
-                ipoib_ib_dev_open(dev);
+                if (test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags))
+                        ipoib_ib_dev_stop(dev, 0);
+                if (ipoib_ib_dev_open(dev, 0) != 0)
+                        return;
+                if (netif_queue_stopped(dev))
+                        netif_start_queue(dev);
         }
 
         /*
@@ -1094,54 +1103,4 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
         ipoib_transport_dev_cleanup(dev);
 }
 
-/*
- * Delayed P_Key Assigment Interim Support
- *
- * The following is initial implementation of delayed P_Key assigment
- * mechanism. It is using the same approach implemented for the multicast
- * group join. The single goal of this implementation is to quickly address
- * Bug #2507. This implementation will probably be removed when the P_Key
- * change async notification is available.
- */
-
-void ipoib_pkey_poll(struct work_struct *work)
-{
-        struct ipoib_dev_priv *priv =
-                container_of(work, struct ipoib_dev_priv, pkey_poll_task.work);
-        struct net_device *dev = priv->dev;
-
-        ipoib_pkey_dev_check_presence(dev);
-
-        if (test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags))
-                ipoib_open(dev);
-        else {
-                mutex_lock(&pkey_mutex);
-                if (!test_bit(IPOIB_PKEY_STOP, &priv->flags))
-                        queue_delayed_work(ipoib_workqueue,
-                                           &priv->pkey_poll_task,
-                                           HZ);
-                mutex_unlock(&pkey_mutex);
-        }
-}
-
-int ipoib_pkey_dev_delay_open(struct net_device *dev)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-
-        /* Look for the interface pkey value in the IB Port P_Key table and */
-        /* set the interface pkey assigment flag                            */
-        ipoib_pkey_dev_check_presence(dev);
 
-        /* P_Key value not assigned yet - start polling */
-        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
-                mutex_lock(&pkey_mutex);
-                clear_bit(IPOIB_PKEY_STOP, &priv->flags);
-                queue_delayed_work(ipoib_workqueue,
-                                   &priv->pkey_poll_task,
-                                   HZ);
-                mutex_unlock(&pkey_mutex);
-                return 1;
-        }
-
-        return 0;
-}
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 4e675f4fecc9..1310acf6bf92 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -108,11 +108,11 @@ int ipoib_open(struct net_device *dev)
 
         set_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags);
 
-        if (ipoib_pkey_dev_delay_open(dev))
-                return 0;
-
-        if (ipoib_ib_dev_open(dev))
+        if (ipoib_ib_dev_open(dev, 1)) {
+                if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags))
+                        return 0;
                 goto err_disable;
+        }
 
         if (ipoib_ib_dev_up(dev))
                 goto err_stop;
@@ -1379,7 +1379,6 @@ void ipoib_setup(struct net_device *dev)
         INIT_LIST_HEAD(&priv->dead_ahs);
         INIT_LIST_HEAD(&priv->multicast_list);
 
-        INIT_DELAYED_WORK(&priv->pkey_poll_task, ipoib_pkey_poll);
         INIT_DELAYED_WORK(&priv->mcast_task,   ipoib_mcast_join_task);
         INIT_WORK(&priv->carrier_on_task, ipoib_mcast_carrier_on_task);
         INIT_WORK(&priv->flush_light,   ipoib_ib_dev_flush_light);