Commit 13d84914 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/hfi1,qib: Do not send QKey trap for UD qps 



According to IBTA spec a QKey violation should not result in a bad qkey
trap being triggered for UD queue pairs. Also since it is a silent error
we do not increment the q_key violation or the dropped packet counters.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bec7c79c

drivers/infiniband/hw/hfi1/mad.c

+5 −9
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ static void send_trap(struct hfi1_ibport *ibp, void *data, unsigned len) 
}



/*

 * Send a bad [PQ]_Key trap (ch. 14.3.8).

 * Send a bad P_Key trap (ch. 14.3.8).

 */

void hfi1_bad_pqkey(struct hfi1_ibport *ibp, __be16 trap_num, u32 key, u32 sl,

void hfi1_bad_pkey(struct hfi1_ibport *ibp, u32 key, u32 sl,

		   u32 qp1, u32 qp2, u16 lid1, u16 lid2)

{

	struct opa_mad_notice_attr data;
@@ -191,17 +191,13 @@ void hfi1_bad_pqkey(struct hfi1_ibport *ibp, __be16 trap_num, u32 key, u32 sl, 
	u32 _lid2 = lid2;



	memset(&data, 0, sizeof(data));



	if (trap_num == OPA_TRAP_BAD_P_KEY)

		ibp->rvp.pkey_violations++;

	else

		ibp->rvp.qkey_violations++;

	ibp->rvp.n_pkt_drops++;

	ibp->rvp.pkey_violations++;



	/* Send violation trap */

	data.generic_type = IB_NOTICE_TYPE_SECURITY;

	data.prod_type_lsb = IB_NOTICE_PROD_CA;

	data.trap_num = trap_num;

	data.trap_num = OPA_TRAP_BAD_P_KEY;

	data.issuer_lid = cpu_to_be32(lid);

	data.ntc_257_258.lid1 = cpu_to_be32(_lid1);

	data.ntc_257_258.lid2 = cpu_to_be32(_lid2);

drivers/infiniband/hw/hfi1/ruc.c

+4 −4
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int hfi1_ruc_check_hdr(struct hfi1_ibport *ibp, struct hfi1_packet *packet) 
		}

		if (unlikely(rcv_pkey_check(ppd_from_ibp(ibp), (u16)bth0,

					    sc5, slid))) {

			hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_P_KEY, (u16)bth0, sl,

			hfi1_bad_pkey(ibp, (u16)bth0, sl,

				      0, qp->ibqp.qp_num, slid, dlid);

			return 1;

		}
@@ -290,7 +290,7 @@ int hfi1_ruc_check_hdr(struct hfi1_ibport *ibp, struct hfi1_packet *packet) 
		}

		if (unlikely(rcv_pkey_check(ppd_from_ibp(ibp), (u16)bth0,

					    sc5, slid))) {

			hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_P_KEY, (u16)bth0, sl,

			hfi1_bad_pkey(ibp, (u16)bth0, sl,

				      0, qp->ibqp.qp_num, slid, dlid);

			return 1;

		}

drivers/infiniband/hw/hfi1/ud.c

+12 −25
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe) 
				   ((1 << ppd->lmc) - 1));

		if (unlikely(ingress_pkey_check(ppd, pkey, sc5,

						qp->s_pkey_index, slid))) {

			hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_P_KEY, pkey,

			hfi1_bad_pkey(ibp, pkey,

				      rdma_ah_get_sl(ah_attr),

				      sqp->ibqp.qp_num, qp->ibqp.qp_num,

				      slid, rdma_ah_get_dlid(ah_attr));
@@ -128,18 +128,8 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe) 


		qkey = (int)swqe->ud_wr.remote_qkey < 0 ?

			sqp->qkey : swqe->ud_wr.remote_qkey;

		if (unlikely(qkey != qp->qkey)) {

			u16 lid;



			lid = ppd->lid | (rdma_ah_get_path_bits(ah_attr) &

					  ((1 << ppd->lmc) - 1));

			hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_Q_KEY, qkey,

				       rdma_ah_get_sl(ah_attr),

				       sqp->ibqp.qp_num, qp->ibqp.qp_num,

				       lid,

				       rdma_ah_get_dlid(ah_attr));

			goto drop;

		}

		if (unlikely(qkey != qp->qkey))

			goto drop; /* silently drop per IBTA spec */

	}



	/*
@@ -722,7 +712,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet) 
				 * for invalid pkeys is optional according to

				 * IB spec (release 1.3, section 10.9.4)

				 */

				hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_P_KEY,

				hfi1_bad_pkey(ibp,

					      pkey, sl,

					      src_qp, qp->ibqp.qp_num,

					      slid, dlid);
@@ -734,12 +724,9 @@ void hfi1_ud_rcv(struct hfi1_packet *packet) 
			if (mgmt_pkey_idx < 0)

				goto drop;

		}

		if (unlikely(qkey != qp->qkey)) {

			hfi1_bad_pqkey(ibp, OPA_TRAP_BAD_Q_KEY, qkey, sl,

				       src_qp, qp->ibqp.qp_num,

				       slid, dlid);

		if (unlikely(qkey != qp->qkey)) /* Silent drop */

			return;

		}



		/* Drop invalid MAD packets (see 13.5.3.1). */

		if (unlikely(qp->ibqp.qp_num == 1 &&

			     (tlen > 2048 || (sc5 == 0xF))))

drivers/infiniband/hw/hfi1/verbs.h

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline int hfi1_send_ok(struct rvt_qp *qp) 
/*

 * This must be called with s_lock held.

 */

void hfi1_bad_pqkey(struct hfi1_ibport *ibp, __be16 trap_num, u32 key, u32 sl,

void hfi1_bad_pkey(struct hfi1_ibport *ibp, u32 key, u32 sl,

		   u32 qp1, u32 qp2, u16 lid1, u16 lid2);

void hfi1_cap_mask_chg(struct rvt_dev_info *rdi, u8 port_num);

void hfi1_sys_guid_chg(struct hfi1_ibport *ibp);

drivers/infiniband/hw/qib/qib_mad.c

+5 −8
Original line number Diff line number Diff line
@@ -134,24 +134,21 @@ static void qib_send_trap(struct qib_ibport *ibp, void *data, unsigned len) 
}



/*

 * Send a bad [PQ]_Key trap (ch. 14.3.8).

 * Send a bad P_Key trap (ch. 14.3.8).

 */

void qib_bad_pqkey(struct qib_ibport *ibp, __be16 trap_num, u32 key, u32 sl,

void qib_bad_pkey(struct qib_ibport *ibp, u32 key, u32 sl,

		  u32 qp1, u32 qp2, __be16 lid1, __be16 lid2)

{

	struct ib_mad_notice_attr data;



	if (trap_num == IB_NOTICE_TRAP_BAD_PKEY)

		ibp->rvp.pkey_violations++;

	else

		ibp->rvp.qkey_violations++;

	ibp->rvp.n_pkt_drops++;

	ibp->rvp.pkey_violations++;



	/* Send violation trap */

	data.generic_type = IB_NOTICE_TYPE_SECURITY;

	data.prod_type_msb = 0;

	data.prod_type_lsb = IB_NOTICE_PROD_CA;

	data.trap_num = trap_num;

	data.trap_num = IB_NOTICE_TRAP_BAD_PKEY;

	data.issuer_lid = cpu_to_be16(ppd_from_ibp(ibp)->lid);

	data.toggle_count = 0;

	memset(&data.details, 0, sizeof(data.details));

CRA Git | Maintained and supported by SUSTech CRA and CCSE