| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Feras Daoud <ferasda@mellanox.com> |
| Date: Wed, 28 Dec 2016 14:47:28 +0200 |
| Subject: IB/ipoib: Change list_del to list_del_init in the tx object |
| |
| From: Feras Daoud <ferasda@mellanox.com> |
| |
| |
| [ 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> |
| --- |
| drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c |
| +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c |
| @@ -1392,7 +1392,7 @@ static void ipoib_cm_tx_reap(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); |
