Skip to contentSkip to conversation

compress/isal: add appropriate flag on overflow

PATCH New Lee Daly 3 participants 3 messages Jan 24, 2019 – Mar 29, 2019 1 message not in the archive

lore
Share & tools
lore

Lee Daly

author
#0 lore raw

PATCH 1/1 compress/isal: add appropriate flag on overflow

This patch will change the operation status when ISA-L returns because of a recoverable out of space error, rather than a just generic fail.

---
 drivers/compress/isal/isal_compress_pmd.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/compress/isal/isal_compress_pmd.c +14 -6
index 4748238..19c4d70 100644
@@ -348,12 +348,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;
@@ -374,6 +368,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) {
Signature · 1 line
2.7.4

A message that is not in the archive (sent off-list or not yet received): 6976F642F4CB7B4C9D17DE41C99F326019177641@hasmsx107.ger.corp.intel.com

#2 lore raw

PATCH 1/1 compress/isal: add appropriate flag on overflow

Hi Lee,

Quoted 55 lines

This patch will change the operation status when ISA-L returns because of a recoverable out of space error, rather than a just generic fail.

---
 drivers/compress/isal/isal_compress_pmd.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/compress/isal/isal_compress_pmd.c +0 -6
index 4748238..19c4d70 100644
@@ -348,12 +348,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

*/

drivers/compress/isal/isal_compress_pmd.c +0 -0
 		if (remaining_data == op->src.length) {
 			consumed_data = src->data_len -

src_remaining_offset; @@ -374,6 +368,20 @@ chained_mbuf_decompression(struct rte_comp_op *op, struct isal_comp_qp *qp)

drivers/compress/isal/isal_compress_pmd.c +2 -0
 			}
 		}
 
+		if (ret == ISAL_OUT_OVERFLOW) {
+			ISAL_PMD_LOG(ERR, "Decompression operation ran

"

drivers/compress/isal/isal_compress_pmd.c +1 -0
+				"out of space, but can be recovered.\n%d

bytes "

drivers/compress/isal/isal_compress_pmd.c +4 -0
+				"consumed\t%d bytes produced\n",
+				consumed_data, qp->state->total_out);
+				op->status =
+
	RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE;
drivers/compress/isal/isal_compress_pmd.c +3 -0
+			return ret;
+		} else if (ret < 0) {
+			ISAL_PMD_LOG(ERR, "Decompression operation

failed\n");

drivers/compress/isal/isal_compress_pmd.c +4 -0
+			op->status = RTE_COMP_OP_STATUS_ERROR;
+			return ret;
+		}
+
 		if (qp->state->avail_out == 0 &&
 				qp->state->block_state !=
Quoted 3 lines

ISAL_BLOCK_FINISH) {
if (dst->next != NULL) {
--

Applied
#3 lore raw
Quoted 53 lines · TomaszX

Hi Lee,

Quoted 51 lines

This patch will change the operation status when ISA-L returns because of a recoverable out of space error, rather than a just generic fail.

---
  drivers/compress/isal/isal_compress_pmd.c | 20 ++++++++++++++------
  1 file changed, 14 insertions(+), 6 deletions(-)
drivers/compress/isal/isal_compress_pmd.c +0 -6
index 4748238..19c4d70 100644
@@ -348,12 +348,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; @@ -374,6 +368,20 @@ chained_mbuf_decompression(struct rte_comp_op *op, struct isal_comp_qp *qp)
}
}

drivers/compress/isal/isal_compress_pmd.c +2 -0
+		if (ret == ISAL_OUT_OVERFLOW) {
+			ISAL_PMD_LOG(ERR, "Decompression operation ran

"

drivers/compress/isal/isal_compress_pmd.c +1 -0
+				"out of space, but can be recovered.\n%d

bytes "

drivers/compress/isal/isal_compress_pmd.c +4 -0
+				"consumed\t%d bytes produced\n",
+				consumed_data, qp->state->total_out);
+				op->status =
+
	RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE;
drivers/compress/isal/isal_compress_pmd.c +3 -0
+			return ret;
+		} else if (ret < 0) {
+			ISAL_PMD_LOG(ERR, "Decompression operation

failed\n");

drivers/compress/isal/isal_compress_pmd.c +2 -0
+			op->status = RTE_COMP_OP_STATUS_ERROR;
+			return ret;
Quoted 10 lines
Quoted 7 lines
drivers/compress/isal/isal_compress_pmd.c +2 -0
+		}
+
  		if (qp->state->avail_out == 0 &&
  				qp->state->block_state !=

ISAL_BLOCK_FINISH) {
if (dst->next != NULL) {
--

Applied to dpdk-next-crypto
Thanks.