crypto/ipsec_mb: fix ZUC operation overwrite

ZUC PMD batches crypto operations depending on their type
(encryption + tag generation, tag verification + decryption, etc),
to allow parallelization.
The array used to store the pointers to these operations was
always the same array provided by dequeue_burst() function,
and it was looping around the same positions (from 0 to ZUC_MAX_BURST - 1).

A new internal array is used to avoid overwriting the pointers
of the array provided by dequeue_burst() function.

Fixes: cf7685d68f00 ("crypto/zuc: add driver for ZUC library")
Cc: stable@dpdk.org
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c
index 07cf1462d2d4e823c5dcc3b49e130788e8c320b5..e36c7092d6da614582da50f52719bec36bff7171 100644 (file)
--- a/drivers/crypto/ipsec_mb/pmd_zuc.c
+++ b/drivers/crypto/ipsec_mb/pmd_zuc.c
@@ -259,6 +259,7 @@ zuc_pmd_dequeue_burst(void *queue_pair,
 
        struct zuc_session *curr_sess;
        struct zuc_session *sessions[ZUC_MAX_BURST];
+       struct rte_crypto_op *int_c_ops[ZUC_MAX_BURST];
        enum ipsec_mb_operation prev_zuc_op = IPSEC_MB_OP_NOT_SUPPORTED;
        enum ipsec_mb_operation curr_zuc_op;
        struct ipsec_mb_qp *qp = queue_pair;
@@ -290,11 +291,11 @@ zuc_pmd_dequeue_burst(void *queue_pair,
                 */
                if (burst_size == 0) {
                        prev_zuc_op = curr_zuc_op;
-                       c_ops[0] = curr_c_op;
+                       int_c_ops[0] = curr_c_op;
                        sessions[0] = curr_sess;
                        burst_size++;
                } else if (curr_zuc_op == prev_zuc_op) {
-                       c_ops[burst_size] = curr_c_op;
+                       int_c_ops[burst_size] = curr_c_op;
                        sessions[burst_size] = curr_sess;
                        burst_size++;
                        /*
@@ -302,7 +303,7 @@ zuc_pmd_dequeue_burst(void *queue_pair,
                         * process them, and start a new batch.
                         */
                        if (burst_size == ZUC_MAX_BURST) {
-                               processed_ops = process_ops(c_ops, curr_zuc_op,
+                               processed_ops = process_ops(int_c_ops, curr_zuc_op,
                                                sessions, qp, burst_size);
                                if (processed_ops < burst_size) {
                                        burst_size = 0;
@@ -316,7 +317,7 @@ zuc_pmd_dequeue_burst(void *queue_pair,
                         * Different operation type, process the ops
                         * of the previous type.
                         */
-                       processed_ops = process_ops(c_ops, prev_zuc_op,
+                       processed_ops = process_ops(int_c_ops, prev_zuc_op,
                                        sessions, qp, burst_size);
                        if (processed_ops < burst_size) {
                                burst_size = 0;
@@ -326,7 +327,7 @@ zuc_pmd_dequeue_burst(void *queue_pair,
                        burst_size = 0;
                        prev_zuc_op = curr_zuc_op;
 
-                       c_ops[0] = curr_c_op;
+                       int_c_ops[0] = curr_c_op;
                        sessions[0] = curr_sess;
                        burst_size++;
                }
@@ -334,7 +335,7 @@ zuc_pmd_dequeue_burst(void *queue_pair,
 
        if (burst_size != 0) {
                /* Process the crypto ops of the last operation type. */
-               processed_ops = process_ops(c_ops, prev_zuc_op,
+               processed_ops = process_ops(int_c_ops, prev_zuc_op,
                                sessions, qp, burst_size);
        }