From ba83e5c0062936dab5c017da574036788c64fb6b Mon Sep 17 00:00:00 2001 From: Tomasz Jozwiak Date: Fri, 14 Dec 2018 13:11:47 +0100 Subject: [PATCH] compress/qat: fix dequeue error counter This patch increments error counter (stats.dequeue_err_count) in case of any error detection during qat_comp_process_response function. Fixes: 3cc14fc48e35 ("compress/qat: check that correct firmware is in use") Fixes: 32842f2a6d7d ("compress/qat: create FW request and process response") Cc: stable@dpdk.org Signed-off-by: Tomasz Jozwiak Acked-by: Fiona Trahe --- drivers/common/qat/qat_qp.c | 6 ++++-- drivers/common/qat/qat_qp.h | 3 ++- drivers/compress/qat/qat_comp.c | 4 +++- drivers/compress/qat/qat_comp.h | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c index ec7f2b3093..4e66c583bf 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -646,7 +646,8 @@ qat_dequeue_op_burst(void *qp, void **ops, uint16_t nb_ops) if (tmp_qp->service_type == QAT_SERVICE_SYMMETRIC) qat_sym_process_response(ops, resp_msg); else if (tmp_qp->service_type == QAT_SERVICE_COMPRESSION) - qat_comp_process_response(ops, resp_msg); + qat_comp_process_response(ops, resp_msg, + &tmp_qp->stats.dequeue_err_count); head = adf_modulo(head + rx_queue->msg_size, rx_queue->modulo_mask); @@ -674,7 +675,8 @@ 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) +qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused, + uint64_t *dequeue_err_count __rte_unused) { return 0; } diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h index 6f1525e1e3..9833bcbd80 100644 --- a/drivers/common/qat/qat_qp.h +++ b/drivers/common/qat/qat_qp.h @@ -107,6 +107,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); +qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused, + uint64_t *dequeue_err_count); #endif /* _QAT_QP_H_ */ diff --git a/drivers/compress/qat/qat_comp.c b/drivers/compress/qat/qat_comp.c index 8a6fad06a4..bb006104f2 100644 --- a/drivers/compress/qat/qat_comp.c +++ b/drivers/compress/qat/qat_comp.c @@ -109,7 +109,7 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg, } int -qat_comp_process_response(void **op, uint8_t *resp) +qat_comp_process_response(void **op, uint8_t *resp, uint64_t *dequeue_err_count) { struct icp_qat_fw_comp_resp *resp_msg = (struct icp_qat_fw_comp_resp *)resp; @@ -135,6 +135,7 @@ qat_comp_process_response(void **op, uint8_t *resp) rx_op->debug_status = ERR_CODE_QAT_COMP_WRONG_FW; *op = (void *)rx_op; QAT_DP_LOG(ERR, "QAT has wrong firmware"); + ++(*dequeue_err_count); return 0; } } @@ -152,6 +153,7 @@ qat_comp_process_response(void **op, uint8_t *resp) QAT_DP_LOG(ERR, "QAT intermediate buffer may be too " "small for output, try configuring a larger size"); + ++(*dequeue_err_count); rx_op->status = RTE_COMP_OP_STATUS_ERROR; rx_op->debug_status = *((uint16_t *)(&resp_msg->comn_resp.comn_error)); diff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h index 99a4462eb8..19f48df590 100644 --- a/drivers/compress/qat/qat_comp.h +++ b/drivers/compress/qat/qat_comp.h @@ -60,8 +60,8 @@ 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, + uint64_t *dequeue_err_count); int qat_comp_private_xform_create(struct rte_compressdev *dev, -- 2.20.1