| From foo@baz Thu Dec 21 09:02:40 CET 2017 |
| From: Sagi Grimberg <sagi@grimberg.me> |
| Date: Wed, 8 Mar 2017 22:00:52 +0200 |
| Subject: IB/core: Protect against self-requeue of a cq work item |
| |
| From: Sagi Grimberg <sagi@grimberg.me> |
| |
| |
| [ Upstream commit 86f46aba8d1ac3ed0904542158a9b9cb9c7a143c ] |
| |
| We need to make sure that the cq work item does not |
| run when we are destroying the cq. Unlike flush_work, |
| cancel_work_sync protects against self-requeue of the |
| work item (which we can do in ib_cq_poll_work). |
| |
| Signed-off-by: Sagi Grimberg <sagi@grimberg.me> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com> |
| Reviewed-by: Leon Romanovsky <leonro@mellanox.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/core/cq.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/infiniband/core/cq.c |
| +++ b/drivers/infiniband/core/cq.c |
| @@ -196,7 +196,7 @@ void ib_free_cq(struct ib_cq *cq) |
| irq_poll_disable(&cq->iop); |
| break; |
| case IB_POLL_WORKQUEUE: |
| - flush_work(&cq->work); |
| + cancel_work_sync(&cq->work); |
| break; |
| default: |
| WARN_ON_ONCE(1); |
