Commit 66172c09 authored by Shlomo Pongratz's avatar Shlomo Pongratz Committed by Roland Dreier

IPoIB: Fix memory leak in the neigh table deletion flow

If the neighbours hash table is empty when unloading the module, then
ipoib_flush_neighs(), the cleanup routine, isn't called and the
memory used for the hash table itself leaked.

To fix this, ipoib_flush_neighs() is allways called, and another
completion object is added to signal when the table is freed.

Once invoked, ipoib_flush_neighs() flushes all the neighbours (if
there are any), calls the the hash table RCU free routine, which now
signals completion of the deletion process, and waits for the last
neighbour to be freed.
Signed-off-by: default avatarShlomo Pongratz <shlomop@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent fea7a08a
...@@ -262,7 +262,10 @@ struct ipoib_ethtool_st { ...@@ -262,7 +262,10 @@ struct ipoib_ethtool_st {
u16 max_coalesced_frames; u16 max_coalesced_frames;
}; };
struct ipoib_neigh_table;
struct ipoib_neigh_hash { struct ipoib_neigh_hash {
struct ipoib_neigh_table *ntbl;
struct ipoib_neigh __rcu **buckets; struct ipoib_neigh __rcu **buckets;
struct rcu_head rcu; struct rcu_head rcu;
u32 mask; u32 mask;
...@@ -274,6 +277,7 @@ struct ipoib_neigh_table { ...@@ -274,6 +277,7 @@ struct ipoib_neigh_table {
rwlock_t rwlock; rwlock_t rwlock;
atomic_t entries; atomic_t entries;
struct completion flushed; struct completion flushed;
struct completion deleted;
}; };
/* /*
......
...@@ -1095,6 +1095,7 @@ static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv) ...@@ -1095,6 +1095,7 @@ static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv)
htbl->mask = (size - 1); htbl->mask = (size - 1);
htbl->buckets = buckets; htbl->buckets = buckets;
ntbl->htbl = htbl; ntbl->htbl = htbl;
htbl->ntbl = ntbl;
atomic_set(&ntbl->entries, 0); atomic_set(&ntbl->entries, 0);
/* start garbage collection */ /* start garbage collection */
...@@ -1111,9 +1112,11 @@ static void neigh_hash_free_rcu(struct rcu_head *head) ...@@ -1111,9 +1112,11 @@ static void neigh_hash_free_rcu(struct rcu_head *head)
struct ipoib_neigh_hash, struct ipoib_neigh_hash,
rcu); rcu);
struct ipoib_neigh __rcu **buckets = htbl->buckets; struct ipoib_neigh __rcu **buckets = htbl->buckets;
struct ipoib_neigh_table *ntbl = htbl->ntbl;
kfree(buckets); kfree(buckets);
kfree(htbl); kfree(htbl);
complete(&ntbl->deleted);
} }
void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid) void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid)
...@@ -1164,7 +1167,9 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv) ...@@ -1164,7 +1167,9 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv)
struct ipoib_neigh_table *ntbl = &priv->ntbl; struct ipoib_neigh_table *ntbl = &priv->ntbl;
struct ipoib_neigh_hash *htbl; struct ipoib_neigh_hash *htbl;
unsigned long flags; unsigned long flags;
int i; int i, wait_flushed = 0;
init_completion(&priv->ntbl.flushed);
write_lock_bh(&ntbl->rwlock); write_lock_bh(&ntbl->rwlock);
...@@ -1173,6 +1178,10 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv) ...@@ -1173,6 +1178,10 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv)
if (!htbl) if (!htbl)
goto out_unlock; goto out_unlock;
wait_flushed = atomic_read(&priv->ntbl.entries);
if (!wait_flushed)
goto free_htbl;
for (i = 0; i < htbl->size; i++) { for (i = 0; i < htbl->size; i++) {
struct ipoib_neigh *neigh; struct ipoib_neigh *neigh;
struct ipoib_neigh __rcu **np = &htbl->buckets[i]; struct ipoib_neigh __rcu **np = &htbl->buckets[i];
...@@ -1190,11 +1199,14 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv) ...@@ -1190,11 +1199,14 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv)
} }
} }
free_htbl:
rcu_assign_pointer(ntbl->htbl, NULL); rcu_assign_pointer(ntbl->htbl, NULL);
call_rcu(&htbl->rcu, neigh_hash_free_rcu); call_rcu(&htbl->rcu, neigh_hash_free_rcu);
out_unlock: out_unlock:
write_unlock_bh(&ntbl->rwlock); write_unlock_bh(&ntbl->rwlock);
if (wait_flushed)
wait_for_completion(&priv->ntbl.flushed);
} }
static void ipoib_neigh_hash_uninit(struct net_device *dev) static void ipoib_neigh_hash_uninit(struct net_device *dev)
...@@ -1203,7 +1215,7 @@ static void ipoib_neigh_hash_uninit(struct net_device *dev) ...@@ -1203,7 +1215,7 @@ static void ipoib_neigh_hash_uninit(struct net_device *dev)
int stopped; int stopped;
ipoib_dbg(priv, "ipoib_neigh_hash_uninit\n"); ipoib_dbg(priv, "ipoib_neigh_hash_uninit\n");
init_completion(&priv->ntbl.flushed); init_completion(&priv->ntbl.deleted);
set_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags); set_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags);
/* Stop GC if called at init fail need to cancel work */ /* Stop GC if called at init fail need to cancel work */
...@@ -1211,10 +1223,9 @@ static void ipoib_neigh_hash_uninit(struct net_device *dev) ...@@ -1211,10 +1223,9 @@ static void ipoib_neigh_hash_uninit(struct net_device *dev)
if (!stopped) if (!stopped)
cancel_delayed_work(&priv->neigh_reap_task); cancel_delayed_work(&priv->neigh_reap_task);
if (atomic_read(&priv->ntbl.entries)) { ipoib_flush_neighs(priv);
ipoib_flush_neighs(priv);
wait_for_completion(&priv->ntbl.flushed); wait_for_completion(&priv->ntbl.deleted);
}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment