Merge pull request #1638 from selvintxavier/flow_steering

bnxt_re/lib: Add Flow steering support

Author: rleon

providers/bnxt_re/main.c

@@ -121,6 +121,8 @@ static const struct verbs_context_ops bnxt_re_cntx_ops = {
 	.free_context  = bnxt_re_free_context,
 
 	.create_qp_ex  = bnxt_re_create_qp_ex,
+	.create_flow   = bnxt_re_create_flow,
+	.destroy_flow  = bnxt_re_destroy_flow,
 };
 
 static inline bool bnxt_re_is_chip_gen_p7(struct bnxt_re_chip_ctx *cctx)

providers/bnxt_re/verbs.c

@@ -719,6 +719,7 @@ static void bnxt_re_poll_success_rcqe(struct bnxt_re_qp *qp,
 {
 	uint8_t flags, is_imm, is_rdma;
 	struct bnxt_re_rc_cqe *rcqe;
+	uint8_t qp_type = qp->qptyp;
 	struct bnxt_re_wrid *swque;
 	struct bnxt_re_queue *rq;
 	uint32_t rcqe_len;
@@ -747,31 +748,34 @@ static void bnxt_re_poll_success_rcqe(struct bnxt_re_qp *qp,
 	ibvwc->status = IBV_WC_SUCCESS;
 	ibvwc->qp_num = qp->qpid;
 	rcqe_len = le32toh(rcqe->length);
-	ibvwc->byte_len = (qp->qptyp == IBV_QPT_UD) ?
-		rcqe_len & BNXT_RE_UD_CQE_LEN_MASK: rcqe_len ;
+	ibvwc->byte_len = (qp_type == IBV_QPT_UD ||
+			   qp_type == IBV_QPT_RAW_PACKET) ?
+			rcqe_len & BNXT_RE_UD_CQE_LEN_MASK : rcqe_len;
 	ibvwc->opcode = IBV_WC_RECV;
 
-	flags = (le32toh(hdr->flg_st_typ_ph) >> BNXT_RE_BCQE_FLAGS_SHIFT) &
-		 BNXT_RE_BCQE_FLAGS_MASK;
-	is_imm = (flags & BNXT_RE_RC_FLAGS_IMM_MASK) >>
-		     BNXT_RE_RC_FLAGS_IMM_SHIFT;
-	is_rdma = (flags & BNXT_RE_RC_FLAGS_RDMA_MASK) >>
-		   BNXT_RE_RC_FLAGS_RDMA_SHIFT;
-	ibvwc->wc_flags = 0;
-	if (is_imm) {
-		ibvwc->wc_flags |= IBV_WC_WITH_IMM;
-		/* Completion reports the raw-data in LE format, While
-		 * user expects it in BE format. Thus, swapping on outgoing
-		 * data is needed. On a BE platform le32toh will do the swap
-		 * while on LE platform htobe32 will do the job.
-		 */
-		ibvwc->imm_data = htobe32(le32toh(rcqe->imm_key));
-		if (is_rdma)
-			ibvwc->opcode = IBV_WC_RECV_RDMA_WITH_IMM;
-	}
+	if (qp_type == IBV_QPT_UD || qp_type == IBV_QPT_RC) {
+		flags = (le32toh(hdr->flg_st_typ_ph) >> BNXT_RE_BCQE_FLAGS_SHIFT) &
+			 BNXT_RE_BCQE_FLAGS_MASK;
+		is_imm = (flags & BNXT_RE_RC_FLAGS_IMM_MASK) >>
+			     BNXT_RE_RC_FLAGS_IMM_SHIFT;
+		is_rdma = (flags & BNXT_RE_RC_FLAGS_RDMA_MASK) >>
+			   BNXT_RE_RC_FLAGS_RDMA_SHIFT;
+		ibvwc->wc_flags = 0;
+		if (is_imm) {
+			ibvwc->wc_flags |= IBV_WC_WITH_IMM;
+			/* Completion reports the raw-data in LE format, While
+			 * user expects it in BE format. Thus, swapping on outgoing
+			 * data is needed. On a BE platform le32toh will do the swap
+			 * while on LE platform htobe32 will do the job.
+			 */
+			ibvwc->imm_data = htobe32(le32toh(rcqe->imm_key));
+			if (is_rdma)
+				ibvwc->opcode = IBV_WC_RECV_RDMA_WITH_IMM;
+		}
 
-	if (qp->qptyp == IBV_QPT_UD)
-		bnxt_re_fill_ud_cqe(ibvwc, hdr, cqe, flags);
+		if (qp_type == IBV_QPT_UD)
+			bnxt_re_fill_ud_cqe(ibvwc, hdr, cqe, flags);
+	}
 
 	if (!qp->srq)
 		bnxt_re_jqq_mod_last(qp->jrqq, head);
@@ -872,6 +876,7 @@ static int bnxt_re_poll_one(struct bnxt_re_cq *cq, int nwc, struct ibv_wc *wc,
 			break;
 		case BNXT_RE_WC_TYPE_RECV_RC:
 		case BNXT_RE_WC_TYPE_RECV_UD:
+		case BNXT_RE_WC_TYPE_RECV_RAW:
 			rcqe = cqe;
 			qp_handle = (uint64_t *)&rcqe->qp_handle;
 			qp = (struct bnxt_re_qp *)
@@ -880,8 +885,6 @@ static int bnxt_re_poll_one(struct bnxt_re_cq *cq, int nwc, struct ibv_wc *wc,
 				break; /*stale cqe. should be rung.*/
 			pcqe = bnxt_re_poll_rcqe(qp, wc, cqe, &cnt);
 			break;
-		case BNXT_RE_WC_TYPE_RECV_RAW:
-			break;
 		case BNXT_RE_WC_TYPE_TERM:
 			scqe = cqe;
 			qp_handle = (uint64_t *)&scqe->qp_handle;
@@ -1135,6 +1138,11 @@ static int bnxt_re_check_qp_limits(struct bnxt_re_context *cntx,
 	rdev = cntx->rdev;
 	devattr = &rdev->devattr;
 
+	if (attr->qp_type != IBV_QPT_RC &&
+	    attr->qp_type != IBV_QPT_UD &&
+	    attr->qp_type != IBV_QPT_RAW_PACKET)
+		return EINVAL;
+
 	if (attr->cap.max_send_sge > devattr->max_sge)
 		return EINVAL;
 	if (attr->cap.max_recv_sge > devattr->max_sge)
@@ -2956,3 +2964,32 @@ int bnxt_re_destroy_ah(struct ibv_ah *ibvah)
 
 	return 0;
 }
+
+struct ibv_flow *bnxt_re_create_flow(struct ibv_qp *qp,
+				     struct ibv_flow_attr *attr)
+{
+	struct ibv_flow *flow;
+	int ret;
+
+	flow = calloc(1, sizeof(*flow));
+	if (!flow)
+		return NULL;
+
+	ret = ibv_cmd_create_flow(qp, flow, attr, NULL, 0);
+	if (ret) {
+		free(flow);
+		flow = NULL;
+	}
+
+	return flow;
+}
+
+int bnxt_re_destroy_flow(struct ibv_flow *flow)
+{
+	int ret;
+
+	ret = ibv_cmd_destroy_flow(flow);
+
+	free(flow);
+	return ret;
+}

providers/bnxt_re/verbs.h

@@ -120,6 +120,9 @@ int bnxt_re_post_srq_recv(struct ibv_srq *ibvsrq, struct ibv_recv_wr *wr,
 struct ibv_ah *bnxt_re_create_ah(struct ibv_pd *ibvpd,
 				 struct ibv_ah_attr *attr);
 int bnxt_re_destroy_ah(struct ibv_ah *ibvah);
+struct ibv_flow *bnxt_re_create_flow(struct ibv_qp *qp,
+				     struct ibv_flow_attr *flow);
+int bnxt_re_destroy_flow(struct ibv_flow *flow);
 void bnxt_re_async_event(struct ibv_context *context,
 			 struct ibv_async_event *event);