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

Commit 527dbf12 authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Doug Ledford
Browse files

IB/qib, IB/hfi1: Fix grh creation in ud loopback 



Instead of copying the actual GRH of type struct ib_grh, existing code
copies the struct ib_global_route into the sge. This patch fixes that
and constructs the actual GRH from ib_global_route and copies the GRH
into the sge.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b736a469

drivers/infiniband/hw/hfi1/ud.c

+6 −2
Original line number Diff line number Diff line
@@ -184,8 +184,12 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe) 
	}



	if (ah_attr->ah_flags & IB_AH_GRH) {

		hfi1_copy_sge(&qp->r_sge, &ah_attr->grh,

			      sizeof(struct ib_grh), 1, 0);

		struct ib_grh grh;

		struct ib_global_route grd = ah_attr->grh;



		hfi1_make_grh(ibp, &grh, &grd, 0, 0);

		hfi1_copy_sge(&qp->r_sge, &grh,

			      sizeof(grh), 1, 0);

		wc.wc_flags |= IB_WC_GRH;

	} else {

		hfi1_skip_sge(&qp->r_sge, sizeof(struct ib_grh), 1);

drivers/infiniband/hw/qib/qib_ud.c

+6 −2
Original line number Diff line number Diff line
@@ -169,8 +169,12 @@ static void qib_ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe) 
	}



	if (ah_attr->ah_flags & IB_AH_GRH) {

		qib_copy_sge(&qp->r_sge, &ah_attr->grh,

			     sizeof(struct ib_grh), 1);

		struct ib_grh grh;

		struct ib_global_route grd = ah_attr->grh;



		qib_make_grh(ibp, &grh, &grd, 0, 0);

		qib_copy_sge(&qp->r_sge, &grh,

			     sizeof(grh), 1);

		wc.wc_flags |= IB_WC_GRH;

	} else

		qib_skip_sge(&qp->r_sge, sizeof(struct ib_grh), 1);