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

Commit c98b5ee3 authored by Kaike Wan's avatar Kaike Wan Committed by Greg Kroah-Hartman
Browse files

IB/hfi1: Unreserve a reserved request when it is completed 



[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ]

Currently, When a reserved operation is completed, its entry in the send
queue will not be unreserved, which leads to the miscalculation of
qp->s_avail and thus the triggering of a WARN_ON call trace. This patch
fixes the problem by unreserving the reserved operation when it is
completed.

Fixes: 856cc4c2 ("IB/hfi1: Add the capability for reserved operations")
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 53dedc8d

drivers/infiniband/hw/hfi1/rc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1162,6 +1162,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah) 
		if (cmp_psn(wqe->lpsn, qp->s_sending_psn) >= 0 &&

		if (cmp_psn(wqe->lpsn, qp->s_sending_psn) >= 0 &&

		    cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) <= 0)

		    cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) <= 0)

			break;

			break;

		rvt_qp_wqe_unreserve(qp, wqe);

		s_last = qp->s_last;

		s_last = qp->s_last;

		trace_hfi1_qp_send_completion(qp, wqe, s_last);

		trace_hfi1_qp_send_completion(qp, wqe, s_last);

		if (++s_last >= qp->s_size)

		if (++s_last >= qp->s_size)
@@ -1214,6 +1215,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
		u32 s_last;

		u32 s_last;





		rvt_put_swqe(wqe);

		rvt_put_swqe(wqe);

		rvt_qp_wqe_unreserve(qp, wqe);

		s_last = qp->s_last;

		s_last = qp->s_last;

		trace_hfi1_qp_send_completion(qp, wqe, s_last);

		trace_hfi1_qp_send_completion(qp, wqe, s_last);

		if (++s_last >= qp->s_size)

		if (++s_last >= qp->s_size)