summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeras Daoud <ferasda@mellanox.com>2016-12-28 14:47:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-15 17:13:11 +0100
commit3652b0b6f2c2184bebe9e8da00076cfd458ff868 (patch)
treee9ac7bd2537108ade08d28465b889daa055e8356
parentaa4af0fca1016e1962154572fdc8ccdd1cb0a2b5 (diff)
downloadlinux-stable-3652b0b6f2c2184bebe9e8da00076cfd458ff868.tar.gz
linux-stable-3652b0b6f2c2184bebe9e8da00076cfd458ff868.tar.bz2
linux-stable-3652b0b6f2c2184bebe9e8da00076cfd458ff868.zip
IB/ipoib: Change list_del to list_del_init in the tx object
[ Upstream commit 27d41d29c7f093f6f77843624fbb080c1b4a8b9c ] Since ipoib_cm_tx_start function and ipoib_cm_tx_reap function belong to different work queues, they can run in parallel. In this case if ipoib_cm_tx_reap calls list_del and release the lock, ipoib_cm_tx_start may acquire it and call list_del_init on the already deleted object. Changing list_del to list_del_init in ipoib_cm_tx_reap fixes the problem. Fixes: 839fcaba355a ("IPoIB: Connected mode experimental support") Signed-off-by: Feras Daoud <ferasda@mellanox.com> Signed-off-by: Erez Shitrit <erezsh@mellanox.com> Reviewed-by: Alex Vesker <valex@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> Signed-off-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 2018d24344de..f74b11542603 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1373,7 +1373,7 @@ static void ipoib_cm_tx_reap(struct work_struct *work)
while (!list_empty(&priv->cm.reap_list)) {
p = list_entry(priv->cm.reap_list.next, typeof(*p), list);
- list_del(&p->list);
+ list_del_init(&p->list);
spin_unlock_irqrestore(&priv->lock, flags);
netif_tx_unlock_bh(dev);
ipoib_cm_tx_destroy(p);