Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137094/?format=api
{ "id": 137094, "url": "http://patchwork.dpdk.org/api/patches/137094/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240223122115.3589097-1-venkatx.sivaramakrishnan@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20240223122115.3589097-1-venkatx.sivaramakrishnan@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240223122115.3589097-1-venkatx.sivaramakrishnan@intel.com", "date": "2024-02-23T12:21:14", "name": "[v4,1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer version", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7c723acbe7331d52c7fb83598a29c2465a191aad", "submitter": { "id": 3155, "url": "http://patchwork.dpdk.org/api/people/3155/?format=api", "name": "Sivaramakrishnan Venkat", "email": "venkatx.sivaramakrishnan@intel.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240223122115.3589097-1-venkatx.sivaramakrishnan@intel.com/mbox/", "series": [ { "id": 31199, "url": "http://patchwork.dpdk.org/api/series/31199/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31199", "date": "2024-02-23T12:21:14", "name": "[v4,1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer version", "version": 4, "mbox": "http://patchwork.dpdk.org/series/31199/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/137094/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/137094/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 4AC7B43BA4;\n\tFri, 23 Feb 2024 13:21:27 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E776F402E3;\n\tFri, 23 Feb 2024 13:21:26 +0100 (CET)", "from mgamail.intel.com (mgamail.intel.com [198.175.65.15])\n by mails.dpdk.org (Postfix) with ESMTP id 8C0284021E\n for <dev@dpdk.org>; Fri, 23 Feb 2024 13:21:24 +0100 (CET)", "from fmviesa008.fm.intel.com ([10.60.135.148])\n by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 23 Feb 2024 04:21:24 -0800", "from silpixa00400902.ir.intel.com ([10.243.23.146])\n by fmviesa008.fm.intel.com with ESMTP; 23 Feb 2024 04:21:21 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1708690885; x=1740226885;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=hLcB92MDYazNrUNHKjSLw4bYsqIdDSCPvcROTeQT1F4=;\n b=fnwwPm2sKBf1QxxyQ60BCnwEquuShSOAEOR8TZ/rRnENMMUTuj+JADu+\n TFRI5no+nsKa/wca7QqoWfJH2WTG77P4A5cdcKV6BwQo+5y2rWH/h4Kuk\n eW/h+qImypHNv0o5I9OXCJeHafllVWEh/H8q0scccNqkWjORaDF7FhSLc\n 1rz9DMli1DnlAa5IFJKNYg+DkGHgcozpBaomXPpvnI8ImkEzBhxCXc6QV\n 8FDguC0lLI6YNgQ2fgxCXdBXlH67x92lc7vW1HD1PvFCaNzDY1L2+To8Q\n lGH9RKOWKtqd61geh5lI3FjSTMEn2jddj1hbiZ6jp8OmBQVK7dllOS6xL g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10992\"; a=\"6817101\"", "E=Sophos;i=\"6.06,180,1705392000\";\n d=\"scan'208\";a=\"6817101\"", "E=Sophos;i=\"6.06,180,1705392000\";\n d=\"scan'208\";a=\"6035591\"" ], "X-ExtLoop1": "1", "From": "Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>", "To": "Kai Ji <kai.ji@intel.com>, Pablo de Lara <pablo.de.lara.guarch@intel.com>", "Cc": "dev@dpdk.org, gakhil@marvell.com, ciara.power@intel.com,\n wathsala.vithanage@arm.com, Honnappa.Nagarahalli@arm.com,\n Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>", "Subject": "[PATCH v4 1/2] crypto/ipsec_mb: bump minimum IPsec Multi-buffer\n version", "Date": "Fri, 23 Feb 2024 12:21:14 +0000", "Message-Id": "<20240223122115.3589097-1-venkatx.sivaramakrishnan@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "SW PMDs increment IPsec Multi-buffer version to 1.4.\nA minimum IPsec Multi-buffer version of 1.4 or greater is now required.\n\nSigned-off-by: Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>\nAcked-by: Ciara Power <ciara.power@intel.com>\nAcked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n---\n v4:\n - 24.03 release notes updated to bump minimum IPSec Multi-buffer\n version to 1.4 for SW PMDs.\n v2:\n - Removed unused macro in ipsec_mb_ops.c\n - set_gcm_job() modified correctly to keep multi_sgl_job line\n - Updated SW PMDs documentation for minimum IPSec Multi-buffer version\n - Updated commit message, and patch title.\n---\n doc/guides/cryptodevs/aesni_gcm.rst | 3 +-\n doc/guides/cryptodevs/aesni_mb.rst | 3 +-\n doc/guides/cryptodevs/chacha20_poly1305.rst | 3 +-\n doc/guides/cryptodevs/kasumi.rst | 3 +-\n doc/guides/cryptodevs/snow3g.rst | 3 +-\n doc/guides/cryptodevs/zuc.rst | 3 +-\n doc/guides/rel_notes/release_24_03.rst | 4 +\n drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 23 ---\n drivers/crypto/ipsec_mb/meson.build | 2 +-\n drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 165 --------------------\n drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 9 --\n 11 files changed, 17 insertions(+), 204 deletions(-)", "diff": "diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst\nindex f5773426ee..dc665e536c 100644\n--- a/doc/guides/cryptodevs/aesni_gcm.rst\n+++ b/doc/guides/cryptodevs/aesni_gcm.rst\n@@ -85,7 +85,8 @@ and the external crypto libraries supported by them:\n 18.05 - 19.02 Multi-buffer library 0.49 - 0.52\n 19.05 - 20.08 Multi-buffer library 0.52 - 0.55\n 20.11 - 21.08 Multi-buffer library 0.53 - 1.3*\n- 21.11+ Multi-buffer library 1.0 - 1.5*\n+ 21.11 - 23.11 Multi-buffer library 1.0 - 1.5*\n+ 24.03+ Multi-buffer library 1.4 - 1.5*\n ============= ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst\nindex b2e74ba417..5d670ee237 100644\n--- a/doc/guides/cryptodevs/aesni_mb.rst\n+++ b/doc/guides/cryptodevs/aesni_mb.rst\n@@ -146,7 +146,8 @@ and the Multi-Buffer library version supported by them:\n 19.05 - 19.08 0.52\n 19.11 - 20.08 0.52 - 0.55\n 20.11 - 21.08 0.53 - 1.3*\n- 21.11+ 1.0 - 1.5*\n+ 21.11 - 23.11 1.0 - 1.5*\n+ 24.03+ 1.4 - 1.5*\n ============== ============================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/cryptodevs/chacha20_poly1305.rst b/doc/guides/cryptodevs/chacha20_poly1305.rst\nindex 9d4bf86cf1..c32866b301 100644\n--- a/doc/guides/cryptodevs/chacha20_poly1305.rst\n+++ b/doc/guides/cryptodevs/chacha20_poly1305.rst\n@@ -72,7 +72,8 @@ and the external crypto libraries supported by them:\n ============= ================================\n DPDK version Crypto library version\n ============= ================================\n- 21.11+ Multi-buffer library 1.0-1.5*\n+ 21.11 - 23.11 Multi-buffer library 1.0-1.5*\n+ 24.03+ Multi-buffer library 1.4-1.5*\n ============= ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst\nindex 0989054875..a8f4e6b204 100644\n--- a/doc/guides/cryptodevs/kasumi.rst\n+++ b/doc/guides/cryptodevs/kasumi.rst\n@@ -87,7 +87,8 @@ and the external crypto libraries supported by them:\n ============= ================================\n 16.11 - 19.11 LibSSO KASUMI\n 20.02 - 21.08 Multi-buffer library 0.53 - 1.3*\n- 21.11+ Multi-buffer library 1.0 - 1.5*\n+ 21.11 - 23.11 Multi-buffer library 1.0 - 1.5*\n+ 24.03+ Multi-buffer library 1.4 - 1.5*\n ============= ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst\nindex 3392932653..46863462e5 100644\n--- a/doc/guides/cryptodevs/snow3g.rst\n+++ b/doc/guides/cryptodevs/snow3g.rst\n@@ -96,7 +96,8 @@ and the external crypto libraries supported by them:\n ============= ================================\n 16.04 - 19.11 LibSSO SNOW3G\n 20.02 - 21.08 Multi-buffer library 0.53 - 1.3*\n- 21.11+ Multi-buffer library 1.0 - 1.5*\n+ 21.11 - 23.11 Multi-buffer library 1.0 - 1.5*\n+ 24.03+ Multi-buffer library 1.4 - 1.5*\n ============= ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst\nindex a414b5ad2c..51867e1a16 100644\n--- a/doc/guides/cryptodevs/zuc.rst\n+++ b/doc/guides/cryptodevs/zuc.rst\n@@ -95,7 +95,8 @@ and the external crypto libraries supported by them:\n ============= ================================\n 16.11 - 19.11 LibSSO ZUC\n 20.02 - 21.08 Multi-buffer library 0.53 - 1.3*\n- 21.11+ Multi-buffer library 1.0 - 1.5*\n+ 21.11 - 23.11 Multi-buffer library 1.0 - 1.5*\n+ 24.03+ Multi-buffer library 1.4 - 1.5*\n ============= ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst\nindex 879bb4944c..9f4affb706 100644\n--- a/doc/guides/rel_notes/release_24_03.rst\n+++ b/doc/guides/rel_notes/release_24_03.rst\n@@ -138,6 +138,10 @@ New Features\n to support TLS v1.2, TLS v1.3 and DTLS v1.2.\n * Added PMD API to allow raw submission of instructions to CPT.\n \n+* **Updated ipsec_mb crypto driver.**\n+\n+ * Bump minimum IPSec Multi-buffer version to 1.4 for SW PMDs.\n+\n \n Removed Items\n -------------\ndiff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c\nindex f21f9cc5a0..d25c671d7d 100644\n--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c\n+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c\n@@ -11,7 +11,6 @@\n \n #include \"ipsec_mb_private.h\"\n \n-#define IMB_MP_REQ_VER_STR \"1.1.0\"\n \n /** Configure device */\n int\n@@ -147,15 +146,10 @@ ipsec_mb_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\trte_ring_free(rte_ring_lookup(qp->name));\n \n-#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM\n-\t\tif (qp->mb_mgr)\n-\t\t\tfree_mb_mgr(qp->mb_mgr);\n-#else\n \t\tif (qp->mb_mgr_mz) {\n \t\t\trte_memzone_free(qp->mb_mgr_mz);\n \t\t\tqp->mb_mgr = NULL;\n \t\t}\n-#endif\n \t\trte_free(qp);\n \t\tdev->data->queue_pairs[qp_id] = NULL;\n \t} else { /* secondary process */\n@@ -211,7 +205,6 @@ static struct rte_ring\n \t\t\t RING_F_SP_ENQ | RING_F_SC_DEQ);\n }\n \n-#if IMB_VERSION(1, 1, 0) <= IMB_VERSION_NUM\n static IMB_MGR *\n ipsec_mb_alloc_mgr_from_memzone(const struct rte_memzone **mb_mgr_mz,\n \t\tconst char *mb_mgr_mz_name)\n@@ -244,7 +237,6 @@ ipsec_mb_alloc_mgr_from_memzone(const struct rte_memzone **mb_mgr_mz,\n \t}\n \treturn mb_mgr;\n }\n-#endif\n \n /** Setup a queue pair */\n int\n@@ -260,12 +252,6 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,\n \tint ret;\n \n \tif (rte_eal_process_type() == RTE_PROC_SECONDARY) {\n-#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM\n-\t\tIPSEC_MB_LOG(ERR, \"The intel-ipsec-mb version (%s) does not support multiprocess,\"\n-\t\t\t\t\"the minimum version required for this feature is %s.\",\n-\t\t\t\tIMB_VERSION_STR, IMB_MP_REQ_VER_STR);\n-\t\treturn -EINVAL;\n-#endif\n \t\tqp = dev->data->queue_pairs[qp_id];\n \t\tif (qp == NULL) {\n \t\t\tIPSEC_MB_LOG(DEBUG, \"Secondary process setting up device qp.\");\n@@ -285,15 +271,11 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,\n \t\t\treturn -ENOMEM;\n \t}\n \n-#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM\n-\tqp->mb_mgr = alloc_init_mb_mgr();\n-#else\n \tchar mz_name[IPSEC_MB_MAX_MZ_NAME];\n \tsnprintf(mz_name, sizeof(mz_name), \"IMB_MGR_DEV_%d_QP_%d\",\n \t\t\tdev->data->dev_id, qp_id);\n \tqp->mb_mgr = ipsec_mb_alloc_mgr_from_memzone(&(qp->mb_mgr_mz),\n \t\t\tmz_name);\n-#endif\n \tif (qp->mb_mgr == NULL) {\n \t\tret = -ENOMEM;\n \t\tgoto qp_setup_cleanup;\n@@ -330,15 +312,10 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,\n \treturn 0;\n \n qp_setup_cleanup:\n-#if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM\n-\tif (qp->mb_mgr)\n-\t\tfree_mb_mgr(qp->mb_mgr);\n-#else\n \tif (rte_eal_process_type() == RTE_PROC_SECONDARY)\n \t\treturn ret;\n \tif (qp->mb_mgr_mz)\n \t\trte_memzone_free(qp->mb_mgr_mz);\n-#endif\n \trte_free(qp);\n \treturn ret;\n }\ndiff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build\nindex 87bf965554..0c988d7411 100644\n--- a/drivers/crypto/ipsec_mb/meson.build\n+++ b/drivers/crypto/ipsec_mb/meson.build\n@@ -7,7 +7,7 @@ if is_windows\n subdir_done()\n endif\n \n-IMB_required_ver = '1.0.0'\n+IMB_required_ver = '1.4.0'\n IMB_header = '#include<intel-ipsec-mb.h>'\n if arch_subdir == 'arm'\n IMB_header = '#include<ipsec-mb.h>'\ndiff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\nindex 4de4866cf3..b93267f1c3 100644\n--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\n+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\n@@ -210,13 +210,9 @@ aesni_mb_set_session_auth_parameters(const IMB_MGR *mb_mgr,\n \t\t\t}\n \t\t} else if (xform->auth.key.length == 32) {\n \t\t\tsess->template_job.hash_alg = IMB_AUTH_ZUC256_EIA3_BITLEN;\n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n \t\t\tif (sess->auth.req_digest_len != 4 &&\n \t\t\t\t\tsess->auth.req_digest_len != 8 &&\n \t\t\t\t\tsess->auth.req_digest_len != 16) {\n-#else\n-\t\t\tif (sess->auth.req_digest_len != 4) {\n-#endif\n \t\t\t\tIPSEC_MB_LOG(ERR, \"Invalid digest size\\n\");\n \t\t\t\treturn -EINVAL;\n \t\t\t}\n@@ -845,11 +841,9 @@ aesni_mb_session_configure(IMB_MGR *mb_mgr,\n \t\t}\n \t}\n \n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \tsess->session_id = imb_set_session(mb_mgr, &sess->template_job);\n \tsess->pid = getpid();\n \tRTE_PER_LCORE(pid) = sess->pid;\n-#endif\n \n \treturn 0;\n }\n@@ -982,9 +976,7 @@ aesni_mb_set_docsis_sec_session_parameters(\n \t\tgoto error_exit;\n \t}\n \n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \tipsec_sess->session_id = imb_set_session(mb_mgr, &ipsec_sess->template_job);\n-#endif\n \n error_exit:\n \tfree_mb_mgr(mb_mgr);\n@@ -1239,7 +1231,6 @@ imb_lib_support_sgl_algo(IMB_CIPHER_MODE alg)\n \treturn 0;\n }\n \n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n static inline int\n single_sgl_job(IMB_JOB *job, struct rte_crypto_op *op,\n \t\tint oop, uint32_t offset, struct rte_mbuf *m_src,\n@@ -1324,7 +1315,6 @@ single_sgl_job(IMB_JOB *job, struct rte_crypto_op *op,\n \tjob->sgl_io_segs = sgl_segs;\n \treturn 0;\n }\n-#endif\n \n static inline int\n multi_sgl_job(IMB_JOB *job, struct rte_crypto_op *op,\n@@ -1394,9 +1384,7 @@ set_gcm_job(IMB_MGR *mb_mgr, IMB_JOB *job, const uint8_t sgl,\n \t\tjob->msg_len_to_hash_in_bytes = 0;\n \t\tjob->msg_len_to_cipher_in_bytes = 0;\n \t\tjob->cipher_start_src_offset_in_bytes = 0;\n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \t\timb_set_session(mb_mgr, job);\n-#endif\n \t} else {\n \t\tjob->hash_start_src_offset_in_bytes =\n \t\t\t\top->sym->aead.data.offset;\n@@ -1424,13 +1412,11 @@ set_gcm_job(IMB_MGR *mb_mgr, IMB_JOB *job, const uint8_t sgl,\n \t\tjob->src = NULL;\n \t\tjob->dst = NULL;\n \n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n \t\tif (m_src->nb_segs <= MAX_NUM_SEGS)\n \t\t\treturn single_sgl_job(job, op, oop,\n \t\t\t\t\tm_offset, m_src, m_dst,\n \t\t\t\t\tqp_data->sgl_segs);\n \t\telse\n-#endif\n \t\t\treturn multi_sgl_job(job, op, oop,\n \t\t\t\t\tm_offset, m_src, m_dst, mb_mgr);\n \t} else {\n@@ -1520,10 +1506,6 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,\n \tuint8_t sgl = 0;\n \tuint8_t lb_sgl = 0;\n \n-#if IMB_VERSION(1, 3, 0) >= IMB_VERSION_NUM\n-\t(void) pid;\n-#endif\n-\n \tsession = ipsec_mb_get_session_private(qp, op);\n \tif (session == NULL) {\n \t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;\n@@ -1533,12 +1515,10 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,\n \tconst IMB_CIPHER_MODE cipher_mode =\n \t\t\tsession->template_job.cipher_mode;\n \n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \tif (session->pid != pid) {\n \t\tmemcpy(job, &session->template_job, sizeof(IMB_JOB));\n \t\timb_set_session(mb_mgr, job);\n \t} else if (job->session_id != session->session_id)\n-#endif\n \t\tmemcpy(job, &session->template_job, sizeof(IMB_JOB));\n \n \tif (!op->sym->m_dst) {\n@@ -1579,9 +1559,7 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,\n \t\t\tjob->u.GCM.ctx = &qp_data->gcm_sgl_ctx;\n \t\t\tjob->cipher_mode = IMB_CIPHER_GCM_SGL;\n \t\t\tjob->hash_alg = IMB_AUTH_GCM_SGL;\n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \t\t\timb_set_session(mb_mgr, job);\n-#endif\n \t\t}\n \t\tbreak;\n \tcase IMB_AUTH_AES_GMAC_128:\n@@ -1606,9 +1584,7 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,\n \t\t\tjob->u.CHACHA20_POLY1305.ctx = &qp_data->chacha_sgl_ctx;\n \t\t\tjob->cipher_mode = IMB_CIPHER_CHACHA20_POLY1305_SGL;\n \t\t\tjob->hash_alg = IMB_AUTH_CHACHA20_POLY1305_SGL;\n-#if IMB_VERSION(1, 3, 0) < IMB_VERSION_NUM\n \t\t\timb_set_session(mb_mgr, job);\n-#endif\n \t\t}\n \t\tbreak;\n \tdefault:\n@@ -1804,13 +1780,11 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,\n \t\tif (lb_sgl)\n \t\t\treturn handle_sgl_linear(job, op, m_offset, session);\n \n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n \t\tif (m_src->nb_segs <= MAX_NUM_SEGS)\n \t\t\treturn single_sgl_job(job, op, oop,\n \t\t\t\t\tm_offset, m_src, m_dst,\n \t\t\t\t\tqp_data->sgl_segs);\n \t\telse\n-#endif\n \t\t\treturn multi_sgl_job(job, op, oop,\n \t\t\t\t\tm_offset, m_src, m_dst, mb_mgr);\n \t}\n@@ -2130,7 +2104,6 @@ set_job_null_op(IMB_JOB *job, struct rte_crypto_op *op)\n \treturn job;\n }\n \n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n static uint16_t\n aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n \t\tuint16_t nb_ops)\n@@ -2263,144 +2236,6 @@ aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n \n \treturn processed_jobs;\n }\n-#else\n-\n-/**\n- * Process a completed IMB_JOB job and keep processing jobs until\n- * get_completed_job return NULL\n- *\n- * @param qp\t\tQueue Pair to process\n- * @param mb_mgr\tIMB_MGR to use\n- * @param job\t\tIMB_JOB job\n- * @param ops\t\tcrypto ops to fill\n- * @param nb_ops\tnumber of crypto ops\n- *\n- * @return\n- * - Number of processed jobs\n- */\n-static unsigned\n-handle_completed_jobs(struct ipsec_mb_qp *qp, IMB_MGR *mb_mgr,\n-\t\tIMB_JOB *job, struct rte_crypto_op **ops,\n-\t\tuint16_t nb_ops)\n-{\n-\tstruct rte_crypto_op *op = NULL;\n-\tuint16_t processed_jobs = 0;\n-\n-\twhile (job != NULL) {\n-\t\top = post_process_mb_job(qp, job);\n-\n-\t\tif (op) {\n-\t\t\tops[processed_jobs++] = op;\n-\t\t\tqp->stats.dequeued_count++;\n-\t\t} else {\n-\t\t\tqp->stats.dequeue_err_count++;\n-\t\t\tbreak;\n-\t\t}\n-\t\tif (processed_jobs == nb_ops)\n-\t\t\tbreak;\n-\n-\t\tjob = IMB_GET_COMPLETED_JOB(mb_mgr);\n-\t}\n-\n-\treturn processed_jobs;\n-}\n-\n-static inline uint16_t\n-flush_mb_mgr(struct ipsec_mb_qp *qp, IMB_MGR *mb_mgr,\n-\t\tstruct rte_crypto_op **ops, uint16_t nb_ops)\n-{\n-\tint processed_ops = 0;\n-\n-\t/* Flush the remaining jobs */\n-\tIMB_JOB *job = IMB_FLUSH_JOB(mb_mgr);\n-\n-\tif (job)\n-\t\tprocessed_ops += handle_completed_jobs(qp, mb_mgr, job,\n-\t\t\t\t&ops[processed_ops], nb_ops - processed_ops);\n-\n-\treturn processed_ops;\n-}\n-\n-static uint16_t\n-aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n-\t\tuint16_t nb_ops)\n-{\n-\tstruct ipsec_mb_qp *qp = queue_pair;\n-\tIMB_MGR *mb_mgr = qp->mb_mgr;\n-\tstruct rte_crypto_op *op;\n-\tIMB_JOB *job;\n-\tint retval, processed_jobs = 0;\n-\tpid_t pid = 0;\n-\n-\tif (unlikely(nb_ops == 0 || mb_mgr == NULL))\n-\t\treturn 0;\n-\n-\tuint8_t digest_idx = qp->digest_idx;\n-\n-\tdo {\n-\t\t/* Get next free mb job struct from mb manager */\n-\t\tjob = IMB_GET_NEXT_JOB(mb_mgr);\n-\t\tif (unlikely(job == NULL)) {\n-\t\t\t/* if no free mb job structs we need to flush mb_mgr */\n-\t\t\tprocessed_jobs += flush_mb_mgr(qp, mb_mgr,\n-\t\t\t\t\t&ops[processed_jobs],\n-\t\t\t\t\tnb_ops - processed_jobs);\n-\n-\t\t\tif (nb_ops == processed_jobs)\n-\t\t\t\tbreak;\n-\n-\t\t\tjob = IMB_GET_NEXT_JOB(mb_mgr);\n-\t\t}\n-\n-\t\t/*\n-\t\t * Get next operation to process from ingress queue.\n-\t\t * There is no need to return the job to the IMB_MGR\n-\t\t * if there are no more operations to process, since the IMB_MGR\n-\t\t * can use that pointer again in next get_next calls.\n-\t\t */\n-\t\tretval = rte_ring_dequeue(qp->ingress_queue, (void **)&op);\n-\t\tif (retval < 0)\n-\t\t\tbreak;\n-\n-\t\tif (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION)\n-\t\t\tretval = set_sec_mb_job_params(job, qp, op,\n-\t\t\t\t\t\t&digest_idx);\n-\t\telse\n-\t\t\tretval = set_mb_job_params(job, qp, op,\n-\t\t\t\t&digest_idx, mb_mgr, pid);\n-\n-\t\tif (unlikely(retval != 0)) {\n-\t\t\tqp->stats.dequeue_err_count++;\n-\t\t\tset_job_null_op(job, op);\n-\t\t}\n-\n-\t\t/* Submit job to multi-buffer for processing */\n-#ifdef RTE_LIBRTE_PMD_AESNI_MB_DEBUG\n-\t\tjob = IMB_SUBMIT_JOB(mb_mgr);\n-#else\n-\t\tjob = IMB_SUBMIT_JOB_NOCHECK(mb_mgr);\n-#endif\n-\t\t/*\n-\t\t * If submit returns a processed job then handle it,\n-\t\t * before submitting subsequent jobs\n-\t\t */\n-\t\tif (job)\n-\t\t\tprocessed_jobs += handle_completed_jobs(qp, mb_mgr,\n-\t\t\t\t\tjob, &ops[processed_jobs],\n-\t\t\t\t\tnb_ops - processed_jobs);\n-\n-\t} while (processed_jobs < nb_ops);\n-\n-\tqp->digest_idx = digest_idx;\n-\n-\tif (processed_jobs < 1)\n-\t\tprocessed_jobs += flush_mb_mgr(qp, mb_mgr,\n-\t\t\t\t&ops[processed_jobs],\n-\t\t\t\tnb_ops - processed_jobs);\n-\n-\treturn processed_jobs;\n-}\n-#endif\n static inline int\n check_crypto_sgl(union rte_crypto_sym_ofs so, const struct rte_crypto_sgl *sgl)\n {\ndiff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\nindex 85994fe5a1..51cfd7e2aa 100644\n--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\n+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\n@@ -17,9 +17,7 @@\n #define HMAC_IPAD_VALUE\t\t\t(0x36)\n #define HMAC_OPAD_VALUE\t\t\t(0x5C)\n \n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n #define MAX_NUM_SEGS 16\n-#endif\n \n static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {\n \t{\t/* MD5 HMAC */\n@@ -567,13 +565,8 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {\n \t\t\t\t},\n \t\t\t\t.digest_size = {\n \t\t\t\t\t.min = 4,\n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n \t\t\t\t\t.max = 16,\n \t\t\t\t\t.increment = 4\n-#else\n-\t\t\t\t\t.max = 4,\n-\t\t\t\t\t.increment = 0\n-#endif\n \t\t\t\t},\n \t\t\t\t.iv_size = {\n \t\t\t\t\t.min = 16,\n@@ -730,9 +723,7 @@ struct aesni_mb_qp_data {\n \t * by the driver when verifying a digest provided\n \t * by the user (using authentication verify operation)\n \t */\n-#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM\n \tstruct IMB_SGL_IOV sgl_segs[MAX_NUM_SEGS];\n-#endif\n \tunion {\n \t\tstruct gcm_context_data gcm_sgl_ctx;\n \t\tstruct chacha20_poly1305_context_data chacha_sgl_ctx;\n", "prefixes": [ "v4", "1/2" ] }