Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114749/?format=api
{ "id": 114749, "url": "http://patches.dpdk.org/api/patches/114749/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220809105356.561-6-anoobj@marvell.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220809105356.561-6-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220809105356.561-6-anoobj@marvell.com", "date": "2022-08-09T10:53:43", "name": "[v2,05/18] crypto/cnxk: add separate path for pdcp chain opcode", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dfb72ec2a06ed729980820d6e90ff9c0f7f79b5a", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220809105356.561-6-anoobj@marvell.com/mbox/", "series": [ { "id": 24235, "url": "http://patches.dpdk.org/api/series/24235/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24235", "date": "2022-08-09T10:53:38", "name": "Fixes and improvements in cnxk crypto PMDs", "version": 2, "mbox": "http://patches.dpdk.org/series/24235/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/114749/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/114749/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 39A4AA00C2;\n\tTue, 9 Aug 2022 12:54:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CFC6942BD0;\n\tTue, 9 Aug 2022 12:54:16 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 1502B42BBD\n for <dev@dpdk.org>; Tue, 9 Aug 2022 12:54:14 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id\n 2791Fxll015643\n for <dev@dpdk.org>; Tue, 9 Aug 2022 03:54:14 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3huds2sq76-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Tue, 09 Aug 2022 03:54:14 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Tue, 9 Aug 2022 03:54:12 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Tue, 9 Aug 2022 03:54:12 -0700", "from BG-LT92004.corp.innovium.com (unknown [10.193.69.70])\n by maili.marvell.com (Postfix) with ESMTP id A3F823F7048;\n Tue, 9 Aug 2022 03:54:10 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=YWHJB1ZVudPgdZvVpaCO2oOiaSLMLL+wXZHU7dKoG/Q=;\n b=Tdc8+qoj7+pm6cUrfHON7SGE5dSIJ+r1V6k6ulglDEE9GsVhBNURQNRHBU+tuh8Sf8Iq\n f6u8d0NfmxE9ld67ciFhJZzON8/RZEb4wnEYTGStZMra02TGcIKWeXX9T6dNjNfZ94+U\n rkQHDPmv3VozEGxp6RgiYMMKqfB/X3ekY4+tgxHvU3Gf7UskSTPCu77bOKhyoyCoRzLE\n hwLynh47zRLlJGPPPFYUbsE7En2XWI1LvevhJIV7Fo9F9Rrsv1tJEXOGyKA+Km1p594x\n LajxJG//YC7R1uEfPydIRj7LWo0JTPceTTjJc3K+jKaHtif/PBndyzw70AnuQtCqKzTM mA==", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>, Jerin Jacob <jerinj@marvell.com>", "CC": "Archana Muniganti <marchana@marvell.com>, Tejasree Kondoj\n <ktejasree@marvell.com>, <dev@dpdk.org>", "Subject": "[PATCH v2 05/18] crypto/cnxk: add separate path for pdcp chain opcode", "Date": "Tue, 9 Aug 2022 16:23:43 +0530", "Message-ID": "<20220809105356.561-6-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220809105356.561-1-anoobj@marvell.com>", "References": "<20220808080606.220-1-anoobj@marvell.com>\n <20220809105356.561-1-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "F8KEnIXTBQSRzINI3cBzLdFFIYEumKst", "X-Proofpoint-GUID": "F8KEnIXTBQSRzINI3cBzLdFFIYEumKst", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1\n definitions=2022-08-09_03,2022-08-09_02,2022-06-22_01", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add separate datapath for PDCP chain opcode.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\n---\n drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 7 +-\n drivers/crypto/cnxk/cnxk_se.h | 229 +++++++++++++++++++----\n drivers/crypto/cnxk/meson.build | 4 +-\n 3 files changed, 196 insertions(+), 44 deletions(-)", "diff": "diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c\nindex 3c4cc41bdb..2182c1bd2f 100644\n--- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c\n+++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c\n@@ -28,11 +28,12 @@ cn9k_cpt_sym_inst_fill(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op,\n \n \tcpt_op = sess->cpt_op;\n \n-\tif (cpt_op & ROC_SE_OP_CIPHER_MASK)\n+\tif (sess->roc_se_ctx.fc_type == ROC_SE_PDCP_CHAIN)\n+\t\tret = fill_pdcp_chain_params(op, sess, &qp->meta_info, infl_req, inst);\n+\telse if (cpt_op & ROC_SE_OP_CIPHER_MASK)\n \t\tret = fill_fc_params(op, sess, &qp->meta_info, infl_req, inst);\n \telse\n-\t\tret = fill_digest_params(op, sess, &qp->meta_info, infl_req,\n-\t\t\t\t\t inst);\n+\t\tret = fill_digest_params(op, sess, &qp->meta_info, infl_req, inst);\n \n \treturn ret;\n }\ndiff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h\nindex 5574dbfa04..2b477284c0 100644\n--- a/drivers/crypto/cnxk/cnxk_se.h\n+++ b/drivers/crypto/cnxk/cnxk_se.h\n@@ -94,6 +94,47 @@ pdcp_iv_copy(uint8_t *iv_d, uint8_t *iv_s, const uint8_t pdcp_alg_type,\n \t}\n }\n \n+/*\n+ * Digest immediately at the end of the data is the best case. Switch to SG if\n+ * that cannot be ensured.\n+ */\n+static inline void\n+cpt_digest_buf_lb_check(const struct cnxk_se_sess *sess, struct rte_mbuf *m,\n+\t\t\tstruct roc_se_fc_params *fc_params, uint32_t *flags,\n+\t\t\tstruct rte_crypto_sym_op *sym_op, bool *inplace, uint32_t a_data_off,\n+\t\t\tuint32_t a_data_len, uint32_t c_data_off, uint32_t c_data_len,\n+\t\t\tconst bool is_pdcp_chain)\n+{\n+\tconst uint32_t auth_end = a_data_off + a_data_len;\n+\tuint32_t mc_hash_off;\n+\n+\t/* PDCP_CHAIN only supports auth_first */\n+\n+\tif (is_pdcp_chain || sess->auth_first)\n+\t\tmc_hash_off = auth_end;\n+\telse\n+\t\tmc_hash_off = RTE_MAX(c_data_off + c_data_len, auth_end);\n+\n+\t/* Digest immediately following data is best case */\n+\n+\tif (unlikely(rte_pktmbuf_mtod_offset(m, uint8_t *, mc_hash_off) !=\n+\t\t sym_op->auth.digest.data)) {\n+\t\t*flags |= ROC_SE_VALID_MAC_BUF;\n+\t\tfc_params->mac_buf.size = sess->mac_len;\n+\t\tfc_params->mac_buf.vaddr = sym_op->auth.digest.data;\n+\t\t*inplace = false;\n+\t}\n+}\n+\n+static inline struct rte_mbuf *\n+cpt_m_dst_get(uint8_t cpt_op, struct rte_mbuf *m_src, struct rte_mbuf *m_dst)\n+{\n+\tif (m_dst != NULL && (cpt_op & ROC_SE_OP_ENCODE))\n+\t\treturn m_dst;\n+\telse\n+\t\treturn m_src;\n+}\n+\n static __rte_always_inline int\n cpt_mac_len_verify(struct rte_crypto_auth_xform *auth)\n {\n@@ -1828,9 +1869,6 @@ cpt_fc_dec_hmac_prep(uint32_t flags, uint64_t d_offs, uint64_t d_lens,\n \t\tret = cpt_pdcp_alg_prep(flags, d_offs, d_lens, fc_params, inst);\n \t} else if (fc_type == ROC_SE_KASUMI) {\n \t\tret = cpt_kasumi_dec_prep(d_offs, d_lens, fc_params, inst);\n-\t} else if (fc_type == ROC_SE_PDCP_CHAIN) {\n-\t\tret = cpt_pdcp_chain_alg_prep(flags, d_offs, d_lens, fc_params,\n-\t\t\t\t\t inst);\n \t}\n \n \t/*\n@@ -1858,13 +1896,9 @@ cpt_fc_enc_hmac_prep(uint32_t flags, uint64_t d_offs, uint64_t d_lens,\n \t} else if (fc_type == ROC_SE_PDCP) {\n \t\tret = cpt_pdcp_alg_prep(flags, d_offs, d_lens, fc_params, inst);\n \t} else if (fc_type == ROC_SE_KASUMI) {\n-\t\tret = cpt_kasumi_enc_prep(flags, d_offs, d_lens, fc_params,\n-\t\t\t\t\t inst);\n+\t\tret = cpt_kasumi_enc_prep(flags, d_offs, d_lens, fc_params, inst);\n \t} else if (fc_type == ROC_SE_HASH_HMAC) {\n \t\tret = cpt_digest_gen_prep(flags, d_lens, fc_params, inst);\n-\t} else if (fc_type == ROC_SE_PDCP_CHAIN) {\n-\t\tret = cpt_pdcp_chain_alg_prep(flags, d_offs, d_lens, fc_params,\n-\t\t\t\t\t inst);\n \t}\n \n \treturn ret;\n@@ -2384,15 +2418,11 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \tuint8_t inplace = 1;\n #endif\n \tstruct roc_se_fc_params fc_params;\n-\tbool chain = sess->chained_op;\n \tchar src[SRC_IOV_SIZE];\n \tchar dst[SRC_IOV_SIZE];\n \tuint32_t iv_buf[4];\n-\tbool pdcp_chain;\n \tint ret;\n \n-\tpdcp_chain = chain && (sess->zs_auth || sess->zs_cipher);\n-\n \tfc_params.cipher_iv_len = sess->iv_length;\n \tfc_params.auth_iv_len = sess->auth_iv_length;\n \n@@ -2410,11 +2440,11 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t\t}\n \t}\n \n-\tif (sess->zsk_flag || sess->zs_auth) {\n+\tif (sess->zsk_flag) {\n \t\tif (sess->auth_iv_length)\n-\t\t\tfc_params.auth_iv_buf = rte_crypto_op_ctod_offset(\n-\t\t\t\tcop, uint8_t *, sess->auth_iv_offset);\n-\t\tif ((!chain) && (sess->zsk_flag != ROC_SE_ZS_EA))\n+\t\t\tfc_params.auth_iv_buf =\n+\t\t\t\trte_crypto_op_ctod_offset(cop, uint8_t *, sess->auth_iv_offset);\n+\t\tif (sess->zsk_flag != ROC_SE_ZS_EA)\n \t\t\tinplace = 0;\n \t}\n \tm_src = sym_op->m_src;\n@@ -2453,11 +2483,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t\t}\n \t\tfc_params.iv_buf = salt + 4;\n \t\tif (likely(sess->mac_len)) {\n-\t\t\tstruct rte_mbuf *m =\n-\t\t\t\t(cpt_op & ROC_SE_OP_ENCODE) ? m_dst : m_src;\n-\n-\t\t\tif (!m)\n-\t\t\t\tm = m_src;\n+\t\t\tstruct rte_mbuf *m = cpt_m_dst_get(cpt_op, m_src, m_dst);\n \n \t\t\t/* hmac immediately following data is best case */\n \t\t\tif (unlikely(rte_pktmbuf_mtod(m, uint8_t *) +\n@@ -2476,17 +2502,6 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t\tuint32_t a_data_length = sym_op->auth.data.length;\n \t\tuint32_t a_data_offset = sym_op->auth.data.offset;\n \n-\t\tif (pdcp_chain) {\n-\t\t\tif (sess->zs_cipher) {\n-\t\t\t\tci_data_length /= 8;\n-\t\t\t\tci_data_offset /= 8;\n-\t\t\t}\n-\t\t\tif (sess->zs_auth) {\n-\t\t\t\ta_data_length /= 8;\n-\t\t\t\ta_data_offset /= 8;\n-\t\t\t}\n-\t\t}\n-\n \t\td_offs = ci_data_offset;\n \t\td_offs = (d_offs << 16) | a_data_offset;\n \n@@ -2512,11 +2527,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t\t\tfc_params.iv_buf = salt + 4;\n \t\t}\n \t\tif (likely(sess->mac_len)) {\n-\t\t\tstruct rte_mbuf *m;\n-\n-\t\t\tm = (cpt_op & ROC_SE_OP_ENCODE) ? m_dst : m_src;\n-\t\t\tif (!m)\n-\t\t\t\tm = m_src;\n+\t\t\tstruct rte_mbuf *m = cpt_m_dst_get(cpt_op, m_src, m_dst);\n \n \t\t\t/* hmac immediately following data is best case */\n \t\t\tif (!(op_minor & ROC_SE_FC_MINOR_OP_HMAC_FIRST) &&\n@@ -2533,8 +2544,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t}\n \tfc_params.ctx_buf.vaddr = &sess->roc_se_ctx;\n \n-\tif (!(sess->auth_first) && (!pdcp_chain) &&\n-\t unlikely(sess->is_null || sess->cpt_op == ROC_SE_OP_DECODE))\n+\tif (!(sess->auth_first) && unlikely(sess->is_null || sess->cpt_op == ROC_SE_OP_DECODE))\n \t\tinplace = 0;\n \n \tif (likely(!m_dst && inplace)) {\n@@ -2622,6 +2632,147 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \treturn ret;\n }\n \n+static __rte_always_inline int\n+fill_pdcp_chain_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n+\t\t struct cpt_qp_meta_info *m_info, struct cpt_inflight_req *infl_req,\n+\t\t struct cpt_inst_s *inst)\n+{\n+\tuint32_t ci_data_length, ci_data_offset, a_data_length, a_data_offset;\n+\tstruct rte_crypto_sym_op *sym_op = cop->sym;\n+\tstruct roc_se_fc_params fc_params;\n+\tstruct rte_mbuf *m_src, *m_dst;\n+\tuint8_t cpt_op = sess->cpt_op;\n+\tuint64_t d_offs, d_lens;\n+\tchar src[SRC_IOV_SIZE];\n+\tchar dst[SRC_IOV_SIZE];\n+\tbool inplace = true;\n+\tuint32_t flags = 0;\n+\tvoid *mdata;\n+\tint ret;\n+\n+\tfc_params.cipher_iv_len = sess->iv_length;\n+\tfc_params.auth_iv_len = sess->auth_iv_length;\n+\tfc_params.iv_buf = NULL;\n+\tfc_params.auth_iv_buf = NULL;\n+\n+\tm_src = sym_op->m_src;\n+\tm_dst = sym_op->m_dst;\n+\n+\tif (likely(sess->iv_length))\n+\t\tfc_params.iv_buf = rte_crypto_op_ctod_offset(cop, uint8_t *, sess->iv_offset);\n+\n+\tci_data_length = sym_op->cipher.data.length;\n+\tci_data_offset = sym_op->cipher.data.offset;\n+\ta_data_length = sym_op->auth.data.length;\n+\ta_data_offset = sym_op->auth.data.offset;\n+\n+\t/*\n+\t * For ZUC & SNOW, length & offset is provided in bits. Convert to\n+\t * bytes.\n+\t */\n+\n+\tif (sess->zs_cipher) {\n+\t\tci_data_length /= 8;\n+\t\tci_data_offset /= 8;\n+\t}\n+\n+\tif (sess->zs_auth) {\n+\t\ta_data_length /= 8;\n+\t\ta_data_offset /= 8;\n+\t\t/*\n+\t\t * ZUC & SNOW would have valid iv_buf. AES-CMAC doesn't require\n+\t\t * IV from application.\n+\t\t */\n+\t\tfc_params.auth_iv_buf =\n+\t\t\trte_crypto_op_ctod_offset(cop, uint8_t *, sess->auth_iv_offset);\n+#ifdef CNXK_CRYPTODEV_DEBUG\n+\t\tif (sess->auth_iv_length == 0)\n+\t\t\tplt_err(\"Invalid auth IV length\");\n+#endif\n+\t}\n+\n+\td_offs = ci_data_offset;\n+\td_offs = (d_offs << 16) | a_data_offset;\n+\td_lens = ci_data_length;\n+\td_lens = (d_lens << 32) | a_data_length;\n+\n+\tif (likely(sess->mac_len)) {\n+\t\tstruct rte_mbuf *m = cpt_m_dst_get(cpt_op, m_src, m_dst);\n+\n+\t\tcpt_digest_buf_lb_check(sess, m, &fc_params, &flags, sym_op, &inplace,\n+\t\t\t\t\ta_data_offset, a_data_length, ci_data_offset,\n+\t\t\t\t\tci_data_length, true);\n+\t}\n+\n+\tfc_params.ctx_buf.vaddr = &sess->roc_se_ctx;\n+\n+\tif (likely((m_dst == NULL || m_dst == m_src)) && inplace) {\n+\t\tfc_params.dst_iov = fc_params.src_iov = (void *)src;\n+\t\tprepare_iov_from_pkt_inplace(m_src, &fc_params, &flags);\n+\t} else {\n+\t\t/* Out of place processing */\n+\t\tfc_params.src_iov = (void *)src;\n+\t\tfc_params.dst_iov = (void *)dst;\n+\n+\t\t/* Store SG I/O in the api for reuse */\n+\t\tif (unlikely(prepare_iov_from_pkt(m_src, fc_params.src_iov, 0))) {\n+\t\t\tplt_dp_err(\"Could not prepare src iov\");\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto err_exit;\n+\t\t}\n+\n+\t\tif (unlikely(m_dst != NULL)) {\n+\t\t\tuint32_t pkt_len;\n+\n+\t\t\t/* Try to make room as much as src has */\n+\t\t\tpkt_len = rte_pktmbuf_pkt_len(m_dst);\n+\n+\t\t\tif (unlikely(pkt_len < rte_pktmbuf_pkt_len(m_src))) {\n+\t\t\t\tpkt_len = rte_pktmbuf_pkt_len(m_src) - pkt_len;\n+\t\t\t\tif (!rte_pktmbuf_append(m_dst, pkt_len)) {\n+\t\t\t\t\tplt_dp_err(\"Not enough space in m_dst \"\n+\t\t\t\t\t\t \"%p, need %u more\",\n+\t\t\t\t\t\t m_dst, pkt_len);\n+\t\t\t\t\tret = -EINVAL;\n+\t\t\t\t\tgoto err_exit;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tif (unlikely(prepare_iov_from_pkt(m_dst, fc_params.dst_iov, 0))) {\n+\t\t\t\tplt_dp_err(\"Could not prepare m_dst iov %p\", m_dst);\n+\t\t\t\tret = -EINVAL;\n+\t\t\t\tgoto err_exit;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tfc_params.dst_iov = (void *)src;\n+\t\t}\n+\t}\n+\n+\tif (unlikely(!((flags & ROC_SE_SINGLE_BUF_INPLACE) &&\n+\t\t (flags & ROC_SE_SINGLE_BUF_HEADROOM)))) {\n+\t\tmdata = alloc_op_meta(&fc_params.meta_buf, m_info->mlen, m_info->pool, infl_req);\n+\t\tif (unlikely(mdata == NULL)) {\n+\t\t\tplt_dp_err(\"Could not allocate meta buffer for request\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n+\n+\t/* Finally prepare the instruction */\n+\tret = cpt_pdcp_chain_alg_prep(flags, d_offs, d_lens, &fc_params, inst);\n+\tif (unlikely(ret)) {\n+\t\tplt_dp_err(\"Could not prepare instruction\");\n+\t\tgoto free_mdata_and_exit;\n+\t}\n+\n+\treturn 0;\n+\n+free_mdata_and_exit:\n+\tif (infl_req->op_flags & CPT_OP_FLAGS_METABUF)\n+\t\trte_mempool_put(m_info->pool, infl_req->mdata);\n+err_exit:\n+\treturn ret;\n+}\n+\n static __rte_always_inline void\n compl_auth_verify(struct rte_crypto_op *op, uint8_t *gen_mac, uint64_t mac_len)\n {\ndiff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build\nindex 952554ac12..8db861f908 100644\n--- a/drivers/crypto/cnxk/meson.build\n+++ b/drivers/crypto/cnxk/meson.build\n@@ -27,7 +27,7 @@ deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev']\n includes += include_directories('../../../lib/net', '../../event/cnxk')\n \n if get_option('buildtype').contains('debug')\n- cflags += [ '-DLA_IPSEC_DEBUG' ]\n+ cflags += [ '-DLA_IPSEC_DEBUG','-DCNXK_CRYPTODEV_DEBUG' ]\n else\n- cflags += [ '-ULA_IPSEC_DEBUG' ]\n+ cflags += [ '-ULA_IPSEC_DEBUG','-UCNXK_CRYPTODEV_DEBUG' ]\n endif\n", "prefixes": [ "v2", "05/18" ] }