common/cpt: fix encryption offset

[dpdk.git] / drivers / compress / isal / isal_compress_pmd.c

diff --git a/drivers/compress/isal/isal_compress_pmd.c b/drivers/compress/isal/isal_compress_pmd.c
index ca1d703..0ecca12 100644 (file)
--- a/drivers/compress/isal/isal_compress_pmd.c
+++ b/drivers/compress/isal/isal_compress_pmd.c
@@ -25,8 +25,6 @@
 #define ISAL_VERSION_STRING \
        ISAL_TOSTRING(ISAL_MAJOR_VERSION, ISAL_MINOR_VERSION, ISAL_PATCH_VERSION)
 
-int isal_logtype_driver;
-
 /* Verify and set private xform parameters */
 int
 isal_comp_set_priv_xform_parameters(struct isal_priv_xform *priv_xform,
@@ -354,12 +352,6 @@ chained_mbuf_decompression(struct rte_comp_op *op, struct isal_comp_qp *qp)
 
                ret = isal_inflate(qp->state);
 
-               if (ret != ISAL_DECOMP_OK) {
-                       ISAL_PMD_LOG(ERR, "Decompression operation failed\n");
-                       op->status = RTE_COMP_OP_STATUS_ERROR;
-                       return ret;
-               }
-
                /* Check for first segment, offset needs to be accounted for */
                if (remaining_data == op->src.length) {
                        consumed_data = src->data_len - src_remaining_offset;
@@ -380,6 +372,20 @@ chained_mbuf_decompression(struct rte_comp_op *op, struct isal_comp_qp *qp)
                        }
                }
 
+               if (ret == ISAL_OUT_OVERFLOW) {
+                       ISAL_PMD_LOG(ERR, "Decompression operation ran "
+                               "out of space, but can be recovered.\n%d bytes "
+                               "consumed\t%d bytes produced\n",
+                               consumed_data, qp->state->total_out);
+                               op->status =
+                               RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE;
+                       return ret;
+               } else if (ret < 0) {
+                       ISAL_PMD_LOG(ERR, "Decompression operation failed\n");
+                       op->status = RTE_COMP_OP_STATUS_ERROR;
+                       return ret;
+               }
+
                if (qp->state->avail_out == 0 &&
                                qp->state->block_state != ISAL_BLOCK_FINISH) {
                        if (dst->next != NULL) {
@@ -744,10 +750,4 @@ static struct rte_vdev_driver compdev_isal_pmd_drv = {
 RTE_PMD_REGISTER_VDEV(COMPDEV_NAME_ISAL_PMD, compdev_isal_pmd_drv);
 RTE_PMD_REGISTER_PARAM_STRING(COMPDEV_NAME_ISAL_PMD,
        "socket_id=<int>");
-
-RTE_INIT(isal_init_log)
-{
-       isal_logtype_driver = rte_log_register("pmd.compress.isal");
-       if (isal_logtype_driver >= 0)
-               rte_log_set_level(isal_logtype_driver, RTE_LOG_INFO);
-}
+RTE_LOG_REGISTER(isal_logtype_driver, pmd.compress.isal, INFO);