aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2016-03-02 09:29:33 +0000
committerMichael Brown <mcb30@ipxe.org>2016-03-08 12:07:03 +0000
commit7544763626d67b352d4b1440336080d63c0be0b7 (patch)
treed7293c979b3dbf05df93b027c81a91005ad8a64e
parent60e205a551f07882ed18a33fa192ad7cefe548a0 (diff)
downloadipxe-7544763626d67b352d4b1440336080d63c0be0b7.zip
ipxe-7544763626d67b352d4b1440336080d63c0be0b7.tar.gz
ipxe-7544763626d67b352d4b1440336080d63c0be0b7.tar.bz2
[infiniband] Avoid multiple calls to ib_cmrc_shutdown()
When a CMRC connection is closed, the deferred shutdown process calls ib_destroy_qp(). This will cause the receive work queue entries to complete in error (since they are being cancelled), which will in turn reschedule the deferred shutdown process. This eventually leads to ib_destroy_conn() being called on a connection that has already been freed. Fix by explicitly cancelling any pending shutdown process after the shutdown process has completed. Ironically, this almost exactly reverts commit 019d4c1 ("[infiniband] Use a one-shot process for CMRC shutdown"); prior to the introduction of one-shot processes the only way to achieve a one-shot process was for the process to cancel itself. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/net/infiniband/ib_cmrc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/infiniband/ib_cmrc.c b/src/net/infiniband/ib_cmrc.c
index 1cc0fcf..513c6f4 100644
--- a/src/net/infiniband/ib_cmrc.c
+++ b/src/net/infiniband/ib_cmrc.c
@@ -117,6 +117,9 @@ static void ib_cmrc_shutdown ( struct ib_cmrc_connection *cmrc ) {
ib_destroy_cq ( cmrc->ibdev, cmrc->cq );
ib_close ( cmrc->ibdev );
+ /* Cancel any pending shutdown */
+ process_del ( &cmrc->shutdown );
+
/* Drop the remaining reference */
ref_put ( &cmrc->refcnt );
}