From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0841B1B494 for ; Fri, 4 Jan 2019 14:26:57 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6544D86675; Fri, 4 Jan 2019 13:26:56 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E16C45C1A1; Fri, 4 Jan 2019 13:26:54 +0000 (UTC) From: Kevin Traynor To: Tomasz Jozwiak Cc: Fiona Trahe , dpdk stable Date: Fri, 4 Jan 2019 13:24:05 +0000 Message-Id: <20190104132455.15170-23-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Jan 2019 13:26:56 +0000 (UTC) Subject: [dpdk-stable] patch 'compress/qat: fix dequeue error counter' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:26:57 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From f03856b390dd9a46fb2ea89a48e39d9c00079a47 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 [ upstream commit ba83e5c0062936dab5c017da574036788c64fb6b ] 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") 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 ec7f2b309..4e66c583b 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -647,5 +647,6 @@ 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); + qat_comp_process_response(ops, resp_msg, + &tmp_qp->stats.dequeue_err_count); head = adf_modulo(head + rx_queue->msg_size, @@ -675,5 +676,6 @@ 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 6f1525e1e..9833bcbd8 100644 --- a/drivers/common/qat/qat_qp.h +++ b/drivers/common/qat/qat_qp.h @@ -108,5 +108,6 @@ 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 8a6fad06a..bb006104f 100644 --- a/drivers/compress/qat/qat_comp.c +++ b/drivers/compress/qat/qat_comp.c @@ -110,5 +110,5 @@ 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 = @@ -136,4 +136,5 @@ qat_comp_process_response(void **op, uint8_t *resp) *op = (void *)rx_op; QAT_DP_LOG(ERR, "QAT has wrong firmware"); + ++(*dequeue_err_count); return 0; } @@ -153,4 +154,5 @@ qat_comp_process_response(void **op, uint8_t *resp) "small for output, try configuring a larger size"); + ++(*dequeue_err_count); rx_op->status = RTE_COMP_OP_STATUS_ERROR; rx_op->debug_status = diff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h index 99a4462eb..19f48df59 100644 --- a/drivers/compress/qat/qat_comp.h +++ b/drivers/compress/qat/qat_comp.h @@ -61,6 +61,6 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg, void *op_cookie, 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 -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.003346376 +0000 +++ 0023-compress-qat-fix-dequeue-error-counter.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,15 +1,16 @@ -From ba83e5c0062936dab5c017da574036788c64fb6b Mon Sep 17 00:00:00 2001 +From f03856b390dd9a46fb2ea89a48e39d9c00079a47 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 +[ upstream commit ba83e5c0062936dab5c017da574036788c64fb6b ] + 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