Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e4194e7 authored by Feras Daoud's avatar Feras Daoud Committed by Greg Kroah-Hartman
Browse files

IB/ipoib: Replace list_del of the neigh->list with list_del_init 




[ Upstream commit c586071d1dc8227a7182179b8e50ee92cc43f6d2 ]

In order to resolve a situation where a few process delete
the same list element in sequence and cause panic, list_del
is replaced with list_del_init. In this case if the first
process that calls list_del releases the lock before acquiring
it again, other processes who can acquire the lock will call
list_del_init.

Fixes: b63b70d8 ("IPoIB: Use a private hash table for path lookup")
Signed-off-by: default avatarFeras Daoud <ferasda@mellanox.com>
Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Reviewed-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d8a5bbc

drivers/infiniband/ulp/ipoib/ipoib_main.c

+4 −4
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
						   rcu_dereference_protected(neigh->hnext,

									     lockdep_is_held(&priv->lock)));

				/* remove from path/mc list */

				list_del(&neigh->list);

				list_del_init(&neigh->list);

				call_rcu(&neigh->rcu, ipoib_neigh_reclaim);

			} else {

				np = &neigh->hnext;
@@ -1121,7 +1121,7 @@ void ipoib_neigh_free(struct ipoib_neigh *neigh) 
					   rcu_dereference_protected(neigh->hnext,

								     lockdep_is_held(&priv->lock)));

			/* remove from parent list */

			list_del(&neigh->list);

			list_del_init(&neigh->list);

			call_rcu(&neigh->rcu, ipoib_neigh_reclaim);

			return;

		} else {
@@ -1206,7 +1206,7 @@ void ipoib_del_neighs_by_gid(struct net_device *dev, u8 *gid) 
						   rcu_dereference_protected(neigh->hnext,

									     lockdep_is_held(&priv->lock)));

				/* remove from parent list */

				list_del(&neigh->list);

				list_del_init(&neigh->list);

				call_rcu(&neigh->rcu, ipoib_neigh_reclaim);

			} else {

				np = &neigh->hnext;
@@ -1248,7 +1248,7 @@ static void ipoib_flush_neighs(struct ipoib_dev_priv *priv) 
					   rcu_dereference_protected(neigh->hnext,

								     lockdep_is_held(&priv->lock)));

			/* remove from path/mc list */

			list_del(&neigh->list);

			list_del_init(&neigh->list);

			call_rcu(&neigh->rcu, ipoib_neigh_reclaim);

		}

	}