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

Commit 1bc7b863 authored by santosh.shilimkar@oracle.com's avatar santosh.shilimkar@oracle.com Committed by David S. Miller
Browse files

RDS: destroy the ib state earlier during shutdown 



Destroy ib state early during shutdown. Otherwise we can get callbacks
after the QP isn't really able to handle them.

Reviewed-by: default avatarAjaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43962dd7

net/rds/ib_cm.c

+10 −8
Original line number Diff line number Diff line
@@ -640,6 +640,16 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) 
			   (atomic_read(&ic->i_signaled_sends) == 0));

		tasklet_kill(&ic->i_recv_tasklet);



		/* first destroy the ib state that generates callbacks */

		if (ic->i_cm_id->qp)

			rdma_destroy_qp(ic->i_cm_id);

		if (ic->i_send_cq)

			ib_destroy_cq(ic->i_send_cq);

		if (ic->i_recv_cq)

			ib_destroy_cq(ic->i_recv_cq);

		rdma_destroy_id(ic->i_cm_id);



		/* then free the resources that ib callbacks use */

		if (ic->i_send_hdrs)

			ib_dma_free_coherent(dev,

					   ic->i_send_ring.w_nr *
@@ -663,14 +673,6 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) 
		if (ic->i_recvs)

			rds_ib_recv_clear_ring(ic);



		if (ic->i_cm_id->qp)

			rdma_destroy_qp(ic->i_cm_id);

		if (ic->i_send_cq)

			ib_destroy_cq(ic->i_send_cq);

		if (ic->i_recv_cq)

			ib_destroy_cq(ic->i_recv_cq);

		rdma_destroy_id(ic->i_cm_id);



		/*

		 * Move connection back to the nodev list.

		 */