From: Rupesh Chiluka <rchil...@marvell.com> Extend check for max supported gather entries in CNXK CPT PMD.
Signed-off-by: Rupesh Chiluka <rchil...@marvell.com> --- drivers/common/cnxk/roc_cpt_sg.h | 1 + drivers/crypto/cnxk/cn10k_ipsec_la_ops.h | 10 ++++++++++ drivers/crypto/cnxk/cn10k_tls_ops.h | 10 ++++++++++ drivers/crypto/cnxk/cn20k_ipsec_la_ops.h | 10 ++++++++++ drivers/crypto/cnxk/cn20k_tls_ops.h | 10 ++++++++++ drivers/crypto/cnxk/cn9k_ipsec_la_ops.h | 10 ++++++++++ 6 files changed, 51 insertions(+) diff --git a/drivers/common/cnxk/roc_cpt_sg.h b/drivers/common/cnxk/roc_cpt_sg.h index e7e01cd29a..7c3caf94d7 100644 --- a/drivers/common/cnxk/roc_cpt_sg.h +++ b/drivers/common/cnxk/roc_cpt_sg.h @@ -15,6 +15,7 @@ #define ROC_SG_MAX_COMP 25 #define ROC_SG_MAX_DLEN_SIZE (ROC_SG_LIST_HDR_SIZE + (ROC_SG_MAX_COMP * ROC_SG_ENTRY_SIZE)) #define ROC_SG2_MAX_PTRS 48 +#define ROC_SG1_MAX_PTRS 32 struct roc_sglist_comp { union { diff --git a/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h index 87442c2a1f..0cc6283c7e 100644 --- a/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h +++ b/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h @@ -105,6 +105,11 @@ process_outb_sa(struct roc_cpt_lf *lf, struct rte_crypto_op *cop, struct cn10k_s return -ENOMEM; } + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); @@ -224,6 +229,11 @@ process_inb_sa(struct rte_crypto_op *cop, struct cn10k_sec_session *sess, struct void *m_data; int i; + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); diff --git a/drivers/crypto/cnxk/cn10k_tls_ops.h b/drivers/crypto/cnxk/cn10k_tls_ops.h index 427c31425c..90600bd850 100644 --- a/drivers/crypto/cnxk/cn10k_tls_ops.h +++ b/drivers/crypto/cnxk/cn10k_tls_ops.h @@ -117,6 +117,11 @@ process_tls_write(struct roc_cpt_lf *lf, struct rte_crypto_op *cop, struct cn10k return -ENOMEM; } + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); @@ -255,6 +260,11 @@ process_tls_read(struct rte_crypto_op *cop, struct cn10k_sec_session *sess, uint32_t dlen; int i; + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); diff --git a/drivers/crypto/cnxk/cn20k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn20k_ipsec_la_ops.h index eff51bd794..505fddb517 100644 --- a/drivers/crypto/cnxk/cn20k_ipsec_la_ops.h +++ b/drivers/crypto/cnxk/cn20k_ipsec_la_ops.h @@ -104,6 +104,11 @@ process_outb_sa(struct roc_cpt_lf *lf, struct rte_crypto_op *cop, struct cn20k_s return -ENOMEM; } + if (unlikely(m_src->nb_segs > ROC_SG2_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); @@ -163,6 +168,11 @@ process_inb_sa(struct rte_crypto_op *cop, struct cn20k_sec_session *sess, struct void *m_data; int i; + if (unlikely(m_src->nb_segs > ROC_SG2_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); diff --git a/drivers/crypto/cnxk/cn20k_tls_ops.h b/drivers/crypto/cnxk/cn20k_tls_ops.h index 14f879f2a9..9f70a1d42d 100644 --- a/drivers/crypto/cnxk/cn20k_tls_ops.h +++ b/drivers/crypto/cnxk/cn20k_tls_ops.h @@ -118,6 +118,11 @@ process_tls_write(struct roc_cpt_lf *lf, struct rte_crypto_op *cop, struct cn20k return -ENOMEM; } + if (unlikely(m_src->nb_segs > ROC_SG2_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); @@ -194,6 +199,11 @@ process_tls_read(struct rte_crypto_op *cop, struct cn20k_sec_session *sess, uint32_t g_size_bytes; int i; + if (unlikely(m_src->nb_segs > ROC_SG2_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); diff --git a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h index befd5b0c05..79e00e3c57 100644 --- a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h +++ b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h @@ -111,6 +111,11 @@ process_outb_sa(struct cpt_qp_meta_info *m_info, struct rte_crypto_op *cop, return -ENOMEM; } + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); @@ -206,6 +211,11 @@ process_inb_sa(struct cpt_qp_meta_info *m_info, struct rte_crypto_op *cop, void *m_data; int i; + if (unlikely(m_src->nb_segs > ROC_SG1_MAX_PTRS)) { + plt_dp_err("Exceeds max supported components. Reduce segments"); + return -1; + } + m_data = alloc_op_meta(NULL, m_info->mlen, m_info->pool, infl_req); if (unlikely(m_data == NULL)) { plt_dp_err("Error allocating meta buffer for request"); -- 2.25.1