IPoIB: Handle case when P_Key is deleted and re-added at same index

If a P_Key is deleted and then re-added at the same index, then IPoIB
gets confused because __ipoib_ib_dev_flush() only checks whether the
index is the same without checking whether the P_Key was present, so
the interface is stopped when the P_Key is deleted, but the event when
the P_Key is re-added gets ignored and the interface never gets
restarted.

Also, switch to using ib_find_pkey() instead of ib_find_cached_pkey()
everywhere in IPoIB, since none of the places that look for P_Keys are
in a fast path or in non-sleeping context, and in general we want to
kill off the whole caching infrastructure eventually.  This also fixes
consistency problems caused because some IPoIB queries were cached and
some were uncached during the window where the cache was not updated.

Thanks to Venkata Subramonyam <vsubramo@cisco.com> for debugging this
problem and testing this fix.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 9d411f21460..9db7b0bd913 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1007,9 +1007,9 @@ static int ipoib_cm_modify_tx_init(struct net_device *dev,
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_qp_attr qp_attr;
         int qp_attr_mask, ret;
-        ret = ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &qp_attr.pkey_index);
+        ret = ib_find_pkey(priv->ca, priv->port, priv->pkey, &qp_attr.pkey_index);
         if (ret) {
-                ipoib_warn(priv, "pkey 0x%x not in cache: %d\n", priv->pkey, ret);
+                ipoib_warn(priv, "pkey 0x%x not found: %d\n", priv->pkey, ret);
                 return ret;
         }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 8b4ff69ecb8..0205eb7c1bd 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -594,7 +594,7 @@ static 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_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
+        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
                 clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
         else
                 set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
@@ -835,13 +835,13 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, int pkey_event)
                         clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
                         ipoib_ib_dev_down(dev, 0);
                         ipoib_ib_dev_stop(dev, 0);
-                        ipoib_pkey_dev_delay_open(dev);
-                        return;
+                        if (ipoib_pkey_dev_delay_open(dev))
+                                return;
                 }
-                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
 
                 /* restart QP only if P_Key index is changed */
-                if (new_index == priv->pkey_index) {
+                if (test_and_set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags) &&
+                    new_index == priv->pkey_index) {
                         ipoib_dbg(priv, "Not flushing - P_Key index not changed.\n");
                         return;
                 }