Skip to contentSkip to conversation

compress/qat: fixed overflow status return from qat pmd

PATCH NAK Adam Dybkowski 3 participants 5 messages May 21, 2019 – Jul 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compress/qat: fixed overflow status return from qat pmd

This patch fixes fail status returned from compression PMD in case destination buffer size in not enough to store all data.

Fixes 3dc9ef2d23fe ("compress/qat: fix returned status on overflow")
---
 drivers/compress/qat/qat_comp.c | 21 +++++++++++++++++++++
 drivers/compress/qat/qat_comp.h |  2 ++
 2 files changed, 23 insertions(+)
drivers/compress/qat/qat_comp.c +21 -0
index dd0fe1b..ef6cda5 100644
@@ -170,6 +170,19 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
 		    rte_pktmbuf_mtophys_offset(op->m_dst, op->dst.offset);
 	}
 
+	if (unlikely(rte_pktmbuf_pkt_len(op->m_dst) < QAT_MIN_OUT_BUF_SIZE)) {
+		/* QAT doesn't support dest. buffer lower
+		 * than QAT_MIN_OUT_BUF_SIZE. Propagate error mark
+		 * by converting this request to the null one
+		 * and check the status in the response.
+		 */
+		QAT_DP_LOG(ERR, "QAT dest. buffer overflow");
+		comp_req->comn_hdr.service_type = ICP_QAT_FW_COMN_REQ_NULL;
+		comp_req->comn_hdr.service_cmd_id = ICP_QAT_FW_NULL_REQ_SERV_ID;
+		op->status = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
+	} else
+		op->status = RTE_COMP_OP_STATUS_SUCCESS;
+
 #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
 	QAT_DP_LOG(DEBUG, "Direction: %s",
 	    qat_xform->qat_comp_request_type == QAT_COMP_REQUEST_DECOMPRESS ?
@@ -201,6 +214,14 @@ qat_comp_process_response(void **op, uint8_t *resp, uint64_t *dequeue_err_count)
 			sizeof(struct icp_qat_fw_comp_resp));
 #endif
 
+	if (unlikely(rx_op->status != RTE_COMP_OP_STATUS_SUCCESS)) {
+		++(*dequeue_err_count);
+		rx_op->debug_status =
+			*((uint16_t *)(&resp_msg->comn_resp.comn_error));
+		*op = (void *)rx_op;
+		return 0;
+	}
+
 	if (likely(qat_xform->qat_comp_request_type
 			!= QAT_COMP_REQUEST_DECOMPRESS)) {
 		if (unlikely(ICP_QAT_FW_COMN_HDR_CNV_FLAG_GET(
drivers/compress/qat/qat_comp.h +2 -0
index 1312ee9..aadf01e 100644
@@ -24,6 +24,8 @@
 /* fallback to fixed compression threshold */
 #define QAT_FALLBACK_THLD ((uint32_t)(RTE_PMD_QAT_COMP_IM_BUFFER_SIZE / 1.1))
 
+#define QAT_MIN_OUT_BUF_SIZE 47
+
 enum qat_comp_request_type {
 	QAT_COMP_REQUEST_FIXED_COMP_STATELESS,
 	QAT_COMP_REQUEST_DYNAMIC_COMP_STATELESS,
Signature · 1 line
2.7.5
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Dybkowski, AdamX
Sent: Tuesday, May 21, 2019 4:10 PM
To: [email protected]; Trahe, Fiona <[email protected]>; Jozwiak, TomaszX <[email protected]>; [email protected]
Subject: [PATCH] compress/qat: fixed overflow status return from qat pmd

Quoted 7 lines

This patch fixes fail status returned from compression PMD in case destination buffer size in not enough to store all data.

Fixes 3dc9ef2d23fe ("compress/qat: fix returned status on overflow")

---

Nack - we'll send a v2

#2 lore raw

PATCH v2 1/1 compress/qat: fixed overflow status return from qat pmd

In reply to Adam Dybkowski

From: Tomasz Jozwiak <[email protected]>

This patch fixes fail status returned from compression PMD in case destination buffer size is not enough to store all data.

Fixes 3dc9ef2d23fe ("compress/qat: fix returned status on overflow")
---
 drivers/common/qat/qat_qp.c         |  4 +++-
 drivers/common/qat/qat_qp.h         |  3 ++-
 drivers/compress/qat/qat_comp.c     | 28 +++++++++++++++++++++++++++-
 drivers/compress/qat/qat_comp.h     |  5 ++++-
 drivers/compress/qat/qat_comp_pmd.c |  2 ++
 5 files changed, 38 insertions(+), 4 deletions(-)
drivers/common/qat/qat_qp.c +3 -1
index 131215296..03f11f869 100644
@@ -651,7 +651,8 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops)
 			qat_sym_process_response(ops, resp_msg);
 		else if (tmp_qp->service_type == QAT_SERVICE_COMPRESSION)
 			qat_comp_process_response(ops, resp_msg,
-					&tmp_qp->stats.dequeue_err_count);
+				tmp_qp->op_cookies[head / rx_queue->msg_size],
+				&tmp_qp->stats.dequeue_err_count);
 		else if (tmp_qp->service_type == QAT_SERVICE_ASYMMETRIC) {
 #ifdef BUILD_QAT_ASYM
 			qat_asym_process_response(ops, resp_msg,
@@ -686,6 +687,7 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops)
 
 __rte_weak int
 qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused,
+			  void *op_cookie __rte_unused,
 			  uint64_t *dequeue_err_count __rte_unused)
 {
 	return  0;
drivers/common/qat/qat_qp.h +2 -1
index 9833bcbd8..980c2ba32 100644
@@ -108,6 +108,7 @@ qat_qps_per_service(const struct qat_qp_hw_data *qp_hw_data,
 /* Needed for weak function*/
 int
 qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused,
-			  uint64_t *dequeue_err_count);
+			  void *op_cookie __rte_unused,
+			  uint64_t *dequeue_err_count __rte_unused);
 
 #endif /* _QAT_QP_H_ */
drivers/compress/qat/qat_comp.c +27 -1
index dd0fe1b34..835aaa838 100644
@@ -170,6 +170,18 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
 		    rte_pktmbuf_mtophys_offset(op->m_dst, op->dst.offset);
 	}
 
+	if (unlikely(rte_pktmbuf_pkt_len(op->m_dst) < QAT_MIN_OUT_BUF_SIZE)) {
+		/* QAT doesn't support dest. buffer lower
+		 * than QAT_MIN_OUT_BUF_SIZE. Propagate error mark
+		 * by converting this request to the null one
+		 * and check the status in the response.
+		 */
+		QAT_DP_LOG(WARNING, "QAT destination buffer too small - resend with larger buffer");
+		comp_req->comn_hdr.service_type = ICP_QAT_FW_COMN_REQ_NULL;
+		comp_req->comn_hdr.service_cmd_id = ICP_QAT_FW_NULL_REQ_SERV_ID;
+		cookie->error = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
+	}
+
 #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
 	QAT_DP_LOG(DEBUG, "Direction: %s",
 	    qat_xform->qat_comp_request_type == QAT_COMP_REQUEST_DECOMPRESS ?
@@ -181,10 +193,13 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
 }
 
 int
-qat_comp_process_response(void **op, uint8_t *resp, uint64_t *dequeue_err_count)
+qat_comp_process_response(void **op, uint8_t *resp, void *op_cookie,
+			  uint64_t *dequeue_err_count)
 {
 	struct icp_qat_fw_comp_resp *resp_msg =
 			(struct icp_qat_fw_comp_resp *)resp;
+	struct qat_comp_op_cookie *cookie =
+			(struct qat_comp_op_cookie *)op_cookie;
 	struct rte_comp_op *rx_op = (struct rte_comp_op *)(uintptr_t)
 			(resp_msg->opaque_data);
 	struct qat_comp_xform *qat_xform = (struct qat_comp_xform *)
@@ -201,6 +216,17 @@ qat_comp_process_response(void **op, uint8_t *resp, uint64_t *dequeue_err_count)
 			sizeof(struct icp_qat_fw_comp_resp));
 #endif
 
+	if (unlikely(cookie->error)) {
+		rx_op->status = cookie->error;
+		cookie->error = 0;
+		++(*dequeue_err_count);
+		rx_op->debug_status = 0;
+		rx_op->consumed = 0;
+		rx_op->produced = 0;
+		*op = (void *)rx_op;
+		return 0;
+	}
+
 	if (likely(qat_xform->qat_comp_request_type
 			!= QAT_COMP_REQUEST_DECOMPRESS)) {
 		if (unlikely(ICP_QAT_FW_COMN_HDR_CNV_FLAG_GET(
drivers/compress/qat/qat_comp.h +4 -1
index 1312ee93b..61d12ecf4 100644
@@ -24,6 +24,8 @@
 /* fallback to fixed compression threshold */
 #define QAT_FALLBACK_THLD ((uint32_t)(RTE_PMD_QAT_COMP_IM_BUFFER_SIZE / 1.1))
 
+#define QAT_MIN_OUT_BUF_SIZE 46
+
 enum qat_comp_request_type {
 	QAT_COMP_REQUEST_FIXED_COMP_STATELESS,
 	QAT_COMP_REQUEST_DYNAMIC_COMP_STATELESS,
@@ -45,6 +47,7 @@ struct qat_comp_op_cookie {
 	phys_addr_t qat_sgl_src_phys_addr;
 	phys_addr_t qat_sgl_dst_phys_addr;
 	/* dynamically created SGLs */
+	uint8_t error;
 	uint8_t socket_id;
 	uint16_t src_nb_elems;
 	uint16_t dst_nb_elems;
@@ -63,7 +66,7 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg, void *op_cookie,
 		       enum qat_device_gen qat_dev_gen __rte_unused);
 
 int
-qat_comp_process_response(void **op, uint8_t *resp,
+qat_comp_process_response(void **op, uint8_t *resp, void *op_cookie,
 			  uint64_t *dequeue_err_count);
 
 int
drivers/compress/qat/qat_comp_pmd.c +2 -0
index 1d9d72e8f..072647217 100644
@@ -168,6 +168,8 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 				QAT_PMD_COMP_SGL_DEF_SEGMENTS;
 
 		cookie->socket_id = dev->data->socket_id;
+
+		cookie->error = 0;
 	}
 
 	return ret;
Signature · 1 line
2.13.6
author Acked-by on v2 1/1
#3 lore raw
Quoted 14 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Fiona Trahe
Sent: Friday, 5 July, 2019 19:16
To: [email protected]
Cc: [email protected]; Trybula, ArturX <[email protected]>; [email protected]; Trahe, Fiona <[email protected]>
Subject: [dpdk-dev] [PATCH v2] compress/qat: fixed overflow status return from qat pmd

From: Tomasz Jozwiak <[email protected]>

This patch fixes fail status returned from compression PMD in case destination buffer size is not enough to store all data.

Quoted 6 lines
Fixes 3dc9ef2d23fe ("compress/qat: fix returned status on overflow")

---

Applied
#4 lore raw
Quoted 8 lines
Quoted 8 lines

From: Tomasz Jozwiak <[email protected]>

This patch fixes fail status returned from compression PMD in case destination buffer size is not enough to store all data.

Quoted 8 lines
Quoted 6 lines
Fixes 3dc9ef2d23fe ("compress/qat: fix returned status on overflow")

---

Applied to dpdk-next-crypto

Thanks.