[1/2] app/eventdev: add null checks for cop allocations

Message ID 20220617100217.3356870-2-vfialko@marvell.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers
Series app/eventdev: fix issues with cop alloc and qp size |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Volodymyr Fialko June 17, 2022, 10:02 a.m. UTC
  Crypto operation allocation may fail in case when total size of queue
pairs is bigger then pool size.

Signed-off-by: Volodymyr Fialko <vfialko@marvell.com>
---
 app/test-eventdev/test_perf_common.c | 40 ++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)
  

Comments

Jerin Jacob June 17, 2022, 12:06 p.m. UTC | #1
On Fri, Jun 17, 2022 at 3:32 PM Volodymyr Fialko <vfialko@marvell.com> wrote:
>
> Crypto operation allocation may fail in case when total size of queue
> pairs is bigger then pool size.
          ^^^           ^^^^^^^
pairs are bigger than the pool size.

Acked-by: Jerin Jacob <jerinj@marvell.com>

Please send v2 with other changes in 1/2

>
> Signed-off-by: Volodymyr Fialko <vfialko@marvell.com>
> ---
>  app/test-eventdev/test_perf_common.c | 40 ++++++++++++++++++++++++++--
>  1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
> index b41785492e..a5e031873d 100644
> --- a/app/test-eventdev/test_perf_common.c
> +++ b/app/test-eventdev/test_perf_common.c
> @@ -367,6 +367,7 @@ crypto_adapter_enq_op_new(struct prod_data *p)
>         struct evt_options *opt = t->opt;
>         uint16_t qp_id = p->ca.cdev_qp_id;
>         uint8_t cdev_id = p->ca.cdev_id;
> +       uint64_t alloc_failures = 0;
>         uint32_t flow_counter = 0;
>         struct rte_crypto_op *op;
>         struct rte_mbuf *m;
> @@ -386,9 +387,17 @@ crypto_adapter_enq_op_new(struct prod_data *p)
>
>                         op = rte_crypto_op_alloc(t->ca_op_pool,
>                                          RTE_CRYPTO_OP_TYPE_SYMMETRIC);
> +                       if (unlikely(op == NULL)) {
> +                               alloc_failures++;
> +                               continue;
> +                       }
> +
>                         m = rte_pktmbuf_alloc(pool);
> -                       if (m == NULL)
> +                       if (unlikely(m == NULL)) {
> +                               alloc_failures++;
> +                               rte_crypto_op_free(op);
>                                 continue;
> +                       }
>
>                         rte_pktmbuf_append(m, len);
>                         sym_op = op->sym;
> @@ -404,6 +413,11 @@ crypto_adapter_enq_op_new(struct prod_data *p)
>
>                         op = rte_crypto_op_alloc(t->ca_op_pool,
>                                          RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
> +                       if (unlikely(op == NULL)) {
> +                               alloc_failures++;
> +                               continue;
> +                       }
> +
>                         asym_op = op->asym;
>                         asym_op->modex.base.data = modex_test_case.base.data;
>                         asym_op->modex.base.length = modex_test_case.base.len;
> @@ -418,6 +432,10 @@ crypto_adapter_enq_op_new(struct prod_data *p)
>
>                 count++;
>         }
> +
> +       if (opt->verbose_level > 1 && alloc_failures)
> +               printf("%s(): lcore %d allocation failures: %"PRIu64"\n",
> +                      __func__, rte_lcore_id(), alloc_failures);
>  }
>
>  static inline void
> @@ -430,6 +448,7 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)
>         const uint64_t nb_pkts = t->nb_pkts;
>         struct rte_mempool *pool = t->pool;
>         struct evt_options *opt = t->opt;
> +       uint64_t alloc_failures = 0;
>         uint32_t flow_counter = 0;
>         struct rte_crypto_op *op;
>         struct rte_event ev;
> @@ -455,9 +474,17 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)
>
>                         op = rte_crypto_op_alloc(t->ca_op_pool,
>                                          RTE_CRYPTO_OP_TYPE_SYMMETRIC);
> +                       if (unlikely(op == NULL)) {
> +                               alloc_failures++;
> +                               continue;
> +                       }
> +
>                         m = rte_pktmbuf_alloc(pool);
> -                       if (m == NULL)
> +                       if (unlikely(m == NULL)) {
> +                               alloc_failures++;
> +                               rte_crypto_op_free(op);
>                                 continue;
> +                       }
>
>                         rte_pktmbuf_append(m, len);
>                         sym_op = op->sym;
> @@ -473,6 +500,11 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)
>
>                         op = rte_crypto_op_alloc(t->ca_op_pool,
>                                          RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
> +                       if (unlikely(op == NULL)) {
> +                               alloc_failures++;
> +                               continue;
> +                       }
> +
>                         asym_op = op->asym;
>                         asym_op->modex.base.data = modex_test_case.base.data;
>                         asym_op->modex.base.length = modex_test_case.base.len;
> @@ -489,6 +521,10 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)
>
>                 count++;
>         }
> +
> +       if (opt->verbose_level > 1 && alloc_failures)
> +               printf("%s(): lcore %d allocation failures: %"PRIu64"\n",
> +                      __func__, rte_lcore_id(), alloc_failures);
>  }
>
>  static inline int
> --
> 2.25.1
>
  

Patch

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index b41785492e..a5e031873d 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -367,6 +367,7 @@  crypto_adapter_enq_op_new(struct prod_data *p)
 	struct evt_options *opt = t->opt;
 	uint16_t qp_id = p->ca.cdev_qp_id;
 	uint8_t cdev_id = p->ca.cdev_id;
+	uint64_t alloc_failures = 0;
 	uint32_t flow_counter = 0;
 	struct rte_crypto_op *op;
 	struct rte_mbuf *m;
@@ -386,9 +387,17 @@  crypto_adapter_enq_op_new(struct prod_data *p)
 
 			op = rte_crypto_op_alloc(t->ca_op_pool,
 					 RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+			if (unlikely(op == NULL)) {
+				alloc_failures++;
+				continue;
+			}
+
 			m = rte_pktmbuf_alloc(pool);
-			if (m == NULL)
+			if (unlikely(m == NULL)) {
+				alloc_failures++;
+				rte_crypto_op_free(op);
 				continue;
+			}
 
 			rte_pktmbuf_append(m, len);
 			sym_op = op->sym;
@@ -404,6 +413,11 @@  crypto_adapter_enq_op_new(struct prod_data *p)
 
 			op = rte_crypto_op_alloc(t->ca_op_pool,
 					 RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
+			if (unlikely(op == NULL)) {
+				alloc_failures++;
+				continue;
+			}
+
 			asym_op = op->asym;
 			asym_op->modex.base.data = modex_test_case.base.data;
 			asym_op->modex.base.length = modex_test_case.base.len;
@@ -418,6 +432,10 @@  crypto_adapter_enq_op_new(struct prod_data *p)
 
 		count++;
 	}
+
+	if (opt->verbose_level > 1 && alloc_failures)
+		printf("%s(): lcore %d allocation failures: %"PRIu64"\n",
+		       __func__, rte_lcore_id(), alloc_failures);
 }
 
 static inline void
@@ -430,6 +448,7 @@  crypto_adapter_enq_op_fwd(struct prod_data *p)
 	const uint64_t nb_pkts = t->nb_pkts;
 	struct rte_mempool *pool = t->pool;
 	struct evt_options *opt = t->opt;
+	uint64_t alloc_failures = 0;
 	uint32_t flow_counter = 0;
 	struct rte_crypto_op *op;
 	struct rte_event ev;
@@ -455,9 +474,17 @@  crypto_adapter_enq_op_fwd(struct prod_data *p)
 
 			op = rte_crypto_op_alloc(t->ca_op_pool,
 					 RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+			if (unlikely(op == NULL)) {
+				alloc_failures++;
+				continue;
+			}
+
 			m = rte_pktmbuf_alloc(pool);
-			if (m == NULL)
+			if (unlikely(m == NULL)) {
+				alloc_failures++;
+				rte_crypto_op_free(op);
 				continue;
+			}
 
 			rte_pktmbuf_append(m, len);
 			sym_op = op->sym;
@@ -473,6 +500,11 @@  crypto_adapter_enq_op_fwd(struct prod_data *p)
 
 			op = rte_crypto_op_alloc(t->ca_op_pool,
 					 RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
+			if (unlikely(op == NULL)) {
+				alloc_failures++;
+				continue;
+			}
+
 			asym_op = op->asym;
 			asym_op->modex.base.data = modex_test_case.base.data;
 			asym_op->modex.base.length = modex_test_case.base.len;
@@ -489,6 +521,10 @@  crypto_adapter_enq_op_fwd(struct prod_data *p)
 
 		count++;
 	}
+
+	if (opt->verbose_level > 1 && alloc_failures)
+		printf("%s(): lcore %d allocation failures: %"PRIu64"\n",
+		       __func__, rte_lcore_id(), alloc_failures);
 }
 
 static inline int