Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 138216,
    "url": "https://patches.dpdk.org/api/patches/138216/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20240312135020.2969533-5-brian.dooley@intel.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<20240312135020.2969533-5-brian.dooley@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20240312135020.2969533-5-brian.dooley@intel.com",
    "date": "2024-03-12T13:50:19",
    "name": "[v6,5/5] crypto/ipsec_mb: unify some IPsec MB PMDs",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "9466786e48e79629139660d978d5c0206bfd5480",
    "submitter": {
        "id": 2520,
        "url": "https://patches.dpdk.org/api/people/2520/?format=api",
        "name": "Dooley, Brian",
        "email": "brian.dooley@intel.com"
    },
    "delegate": {
        "id": 6690,
        "url": "https://patches.dpdk.org/api/users/6690/?format=api",
        "username": "akhil",
        "first_name": "akhil",
        "last_name": "goyal",
        "email": "gakhil@marvell.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20240312135020.2969533-5-brian.dooley@intel.com/mbox/",
    "series": [
        {
            "id": 31477,
            "url": "https://patches.dpdk.org/api/series/31477/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31477",
            "date": "2024-03-12T13:50:15",
            "name": "[v6,1/5] ci: replace IPsec-mb package install",
            "version": 6,
            "mbox": "https://patches.dpdk.org/series/31477/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/138216/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/138216/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 A236643C92;\n\tTue, 12 Mar 2024 14:51:00 +0100 (CET)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6C2F34113C;\n\tTue, 12 Mar 2024 14:50:39 +0100 (CET)",
            "from mgamail.intel.com (mgamail.intel.com [198.175.65.16])\n by mails.dpdk.org (Postfix) with ESMTP id AD85B41156\n for <dev@dpdk.org>; Tue, 12 Mar 2024 14:50:36 +0100 (CET)",
            "from fmviesa009.fm.intel.com ([10.60.135.149])\n by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 12 Mar 2024 06:50:36 -0700",
            "from unknown (HELO silpixa00400886.ir.intel.com) ([10.243.23.150])\n by fmviesa009.fm.intel.com with ESMTP; 12 Mar 2024 06:50:33 -0700"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1710251438; x=1741787438;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=hd8ER6SRSa3iTQkvw465eSdIIdfqs5c/dOuhz/KQ4VA=;\n b=e79nd5o3+u5HSPF8XL+PfVbMm8+jJrSZEihOvsKNsfYu9p6z9QecMGX9\n rcYeRkOHxLa2JUZuRvmuOMM2kzPhX3sohKJeTvveHJBdZSE6kFal/2H4z\n tul+nPsPr0OXJ0pXh+oche8JNxzzGi2HsZeI5xRz8zkJlX3EpE9mhH1XD\n svz7KRGP5zYnLb/51e3N2qUNPDz0biwTjcp7Pd2fQL5ws2sDwAlA3+4En\n DowgDnZzghoxKOGIlU2gWk69NQs5fArJtUQdj0dhXfhWxEDzZXtQozFfe\n XC/p3taGHnBetEsqA39LObh09U5qH0v1WUeWjNY3gcWbgZIxPRtmKSCNG Q==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6600,9927,11010\"; a=\"5081171\"",
            "E=Sophos;i=\"6.07,119,1708416000\";\n   d=\"scan'208\";a=\"5081171\"",
            "E=Sophos;i=\"6.07,119,1708416000\"; d=\"scan'208\";a=\"11466567\""
        ],
        "X-ExtLoop1": "1",
        "From": "Brian Dooley <brian.dooley@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, aconole@redhat.com, probb@iol.unh.edu,\n wathsala.vithanage@arm.com, Brian Dooley <brian.dooley@intel.com>,\n Ciara Power <ciara.power@intel.com>",
        "Subject": "[PATCH v6 5/5] crypto/ipsec_mb: unify some IPsec MB PMDs",
        "Date": "Tue, 12 Mar 2024 13:50:19 +0000",
        "Message-Id": "<20240312135020.2969533-5-brian.dooley@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20240312135020.2969533-1-brian.dooley@intel.com>",
        "References": "<20231212153640.1561504-1-brian.dooley@intel.com>\n <20240312135020.2969533-1-brian.dooley@intel.com>",
        "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": "Currently IPsec MB provides both the JOB API and direct API.\nAESNI_MB PMD is using the JOB API codepath while KASUMI and\nCHACHA20_POLY1305 are using the direct API.\nInstead of using the direct API for these PMDs, they should now make\nuse of the JOB API codepath. This would remove all use of the IPsec MB\ndirect API for these PMDs.\n\nSigned-off-by: Brian Dooley <brian.dooley@intel.com>\nAcked-by: Ciara Power <ciara.power@intel.com>\nAcked-by: Wathsala Vithanage <wathsala.vithanage@arm.com>\n---\nv6:\n- Reintroduce SNOW3G and ZUC PMDs\nv5:\n- Rebased and added patchset\nv4:\n- Keep AES GCM PMD and fix extern issue\nv3:\n- Remove session configure pointer for each PMD\nv2:\n- Fix compilation failure\n---\n doc/guides/rel_notes/release_24_03.rst        |   2 +\n drivers/crypto/ipsec_mb/pmd_aesni_mb.c        |   9 +-\n drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h   |  15 +-\n drivers/crypto/ipsec_mb/pmd_chacha_poly.c     | 338 +--------------\n .../crypto/ipsec_mb/pmd_chacha_poly_priv.h    |  28 --\n drivers/crypto/ipsec_mb/pmd_kasumi.c          | 410 +-----------------\n drivers/crypto/ipsec_mb/pmd_kasumi_priv.h     |  20 -\n 7 files changed, 32 insertions(+), 790 deletions(-)",
    "diff": "diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst\nindex 8fa8cf1dd6..c9ddd120de 100644\n--- a/doc/guides/rel_notes/release_24_03.rst\n+++ b/doc/guides/rel_notes/release_24_03.rst\n@@ -147,6 +147,8 @@ New Features\n * **Updated ipsec_mb crypto driver.**\n \n   * Bump minimum IPSec Multi-buffer version to 1.4 for SW PMDs.\n+  * Kasumi and ChaChaPoly PMDs now share the job API codepath\n+    with AESNI_MB PMD.\n \n * **Updated Marvell cnxk crypto driver.**\n \ndiff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\nindex 80ced1e4fe..35bd7eaa51 100644\n--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\n+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c\n@@ -8,6 +8,8 @@\n \n RTE_DEFINE_PER_LCORE(pid_t, pid);\n \n+uint8_t pmd_driver_id_aesni_mb;\n+\n struct aesni_mb_op_buf_data {\n \tstruct rte_mbuf *m;\n \tuint32_t offset;\n@@ -692,7 +694,7 @@ aesni_mb_set_session_aead_parameters(const IMB_MGR *mb_mgr,\n }\n \n /** Configure a aesni multi-buffer session from a crypto xform chain */\n-static int\n+int\n aesni_mb_session_configure(IMB_MGR *mb_mgr,\n \t\tvoid *priv_sess,\n \t\tconst struct rte_crypto_sym_xform *xform)\n@@ -2039,7 +2041,7 @@ set_job_null_op(IMB_JOB *job, struct rte_crypto_op *op)\n \treturn job;\n }\n \n-static uint16_t\n+uint16_t\n aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n \t\tuint16_t nb_ops)\n {\n@@ -2171,6 +2173,7 @@ aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n \n \treturn processed_jobs;\n }\n+\n static inline int\n check_crypto_sgl(union rte_crypto_sym_ofs so, const struct rte_crypto_sgl *sgl)\n {\n@@ -2226,7 +2229,7 @@ verify_sync_dgst(struct rte_crypto_sym_vec *vec,\n \treturn k;\n }\n \n-static uint32_t\n+uint32_t\n aesni_mb_process_bulk(struct rte_cryptodev *dev __rte_unused,\n \tstruct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs sofs,\n \tstruct rte_crypto_sym_vec *vec)\ndiff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\nindex 51cfd7e2aa..4805627679 100644\n--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\n+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h\n@@ -19,6 +19,19 @@\n \n #define MAX_NUM_SEGS 16\n \n+int\n+aesni_mb_session_configure(IMB_MGR * m __rte_unused, void *priv_sess,\n+\t\tconst struct rte_crypto_sym_xform *xform);\n+\n+uint16_t\n+aesni_mb_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n+\t\tuint16_t nb_ops);\n+\n+uint32_t\n+aesni_mb_process_bulk(struct rte_cryptodev *dev __rte_unused,\n+\tstruct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs sofs,\n+\tstruct rte_crypto_sym_vec *vec);\n+\n static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {\n \t{\t/* MD5 HMAC */\n \t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n@@ -715,8 +728,6 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-uint8_t pmd_driver_id_aesni_mb;\n-\n struct aesni_mb_qp_data {\n \tuint8_t temp_digests[IMB_MAX_JOBS][DIGEST_LENGTH_MAX];\n \t/* *< Buffers used to store the digest generated\ndiff --git a/drivers/crypto/ipsec_mb/pmd_chacha_poly.c b/drivers/crypto/ipsec_mb/pmd_chacha_poly.c\nindex 97e7cef233..7436353fc2 100644\n--- a/drivers/crypto/ipsec_mb/pmd_chacha_poly.c\n+++ b/drivers/crypto/ipsec_mb/pmd_chacha_poly.c\n@@ -3,334 +3,7 @@\n  */\n \n #include \"pmd_chacha_poly_priv.h\"\n-\n-/** Parse crypto xform chain and set private session parameters. */\n-static int\n-chacha20_poly1305_session_configure(IMB_MGR * mb_mgr __rte_unused,\n-\t\tvoid *priv_sess, const struct rte_crypto_sym_xform *xform)\n-{\n-\tstruct chacha20_poly1305_session *sess = priv_sess;\n-\tconst struct rte_crypto_sym_xform *auth_xform;\n-\tconst struct rte_crypto_sym_xform *cipher_xform;\n-\tconst struct rte_crypto_sym_xform *aead_xform;\n-\n-\tuint8_t key_length;\n-\tconst uint8_t *key;\n-\tenum ipsec_mb_operation mode;\n-\tint ret = 0;\n-\n-\tret = ipsec_mb_parse_xform(xform, &mode, &auth_xform,\n-\t\t\t\t&cipher_xform, &aead_xform);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\tsess->op = mode;\n-\n-\tswitch (sess->op) {\n-\tcase IPSEC_MB_OP_AEAD_AUTHENTICATED_ENCRYPT:\n-\tcase IPSEC_MB_OP_AEAD_AUTHENTICATED_DECRYPT:\n-\t\tif (aead_xform->aead.algo !=\n-\t\t\t\tRTE_CRYPTO_AEAD_CHACHA20_POLY1305) {\n-\t\t\tIPSEC_MB_LOG(ERR,\n-\t\t\t\"The only combined operation supported is CHACHA20 POLY1305\");\n-\t\t\tret = -ENOTSUP;\n-\t\t\tgoto error_exit;\n-\t\t}\n-\t\t/* Set IV parameters */\n-\t\tsess->iv.offset = aead_xform->aead.iv.offset;\n-\t\tsess->iv.length = aead_xform->aead.iv.length;\n-\t\tkey_length = aead_xform->aead.key.length;\n-\t\tkey = aead_xform->aead.key.data;\n-\t\tsess->aad_length = aead_xform->aead.aad_length;\n-\t\tsess->req_digest_length = aead_xform->aead.digest_length;\n-\t\tbreak;\n-\tdefault:\n-\t\tIPSEC_MB_LOG(\n-\t\t    ERR, \"Wrong xform type, has to be AEAD or authentication\");\n-\t\tret = -ENOTSUP;\n-\t\tgoto error_exit;\n-\t}\n-\n-\t/* IV check */\n-\tif (sess->iv.length != CHACHA20_POLY1305_IV_LENGTH &&\n-\t\tsess->iv.length != 0) {\n-\t\tIPSEC_MB_LOG(ERR, \"Wrong IV length\");\n-\t\tret = -EINVAL;\n-\t\tgoto error_exit;\n-\t}\n-\n-\t/* Check key length */\n-\tif (key_length != CHACHA20_POLY1305_KEY_SIZE) {\n-\t\tIPSEC_MB_LOG(ERR, \"Invalid key length\");\n-\t\tret = -EINVAL;\n-\t\tgoto error_exit;\n-\t} else {\n-\t\tmemcpy(sess->key, key, CHACHA20_POLY1305_KEY_SIZE);\n-\t}\n-\n-\t/* Digest check */\n-\tif (sess->req_digest_length !=  CHACHA20_POLY1305_DIGEST_LENGTH) {\n-\t\tIPSEC_MB_LOG(ERR, \"Invalid digest length\");\n-\t\tret = -EINVAL;\n-\t\tgoto error_exit;\n-\t} else {\n-\t\tsess->gen_digest_length = CHACHA20_POLY1305_DIGEST_LENGTH;\n-\t}\n-\n-error_exit:\n-\treturn ret;\n-}\n-\n-/**\n- * Process a crypto operation, calling\n- * the direct chacha poly API from the multi buffer library.\n- *\n- * @param\tqp\t\tqueue pair\n- * @param\top\t\tsymmetric crypto operation\n- * @param\tsession\t\tchacha poly session\n- *\n- * @return\n- * - Return 0 if success\n- */\n-static int\n-chacha20_poly1305_crypto_op(struct ipsec_mb_qp *qp, struct rte_crypto_op *op,\n-\t\tstruct chacha20_poly1305_session *session)\n-{\n-\tstruct chacha20_poly1305_qp_data *qp_data =\n-\t\t\t\t\tipsec_mb_get_qp_private_data(qp);\n-\tuint8_t *src, *dst;\n-\tuint8_t *iv_ptr;\n-\tstruct rte_crypto_sym_op *sym_op = op->sym;\n-\tstruct rte_mbuf *m_src = sym_op->m_src;\n-\tuint32_t offset, data_offset, data_length;\n-\tuint32_t part_len, data_len;\n-\tint total_len;\n-\tuint8_t *tag;\n-\tunsigned int oop = 0;\n-\n-\toffset = sym_op->aead.data.offset;\n-\tdata_offset = offset;\n-\tdata_length = sym_op->aead.data.length;\n-\tRTE_ASSERT(m_src != NULL);\n-\n-\twhile (offset >= m_src->data_len && data_length != 0) {\n-\t\toffset -= m_src->data_len;\n-\t\tm_src = m_src->next;\n-\n-\t\tRTE_ASSERT(m_src != NULL);\n-\t}\n-\n-\tsrc = rte_pktmbuf_mtod_offset(m_src, uint8_t *, offset);\n-\n-\tdata_len = m_src->data_len - offset;\n-\tpart_len = (data_len < data_length) ? data_len :\n-\t\t\tdata_length;\n-\n-\t/* In-place */\n-\tif (sym_op->m_dst == NULL || (sym_op->m_dst == sym_op->m_src))\n-\t\tdst = src;\n-\t/* Out-of-place */\n-\telse {\n-\t\toop = 1;\n-\t\t/* Segmented destination buffer is not supported\n-\t\t * if operation is Out-of-place\n-\t\t */\n-\t\tRTE_ASSERT(rte_pktmbuf_is_contiguous(sym_op->m_dst));\n-\t\tdst = rte_pktmbuf_mtod_offset(sym_op->m_dst, uint8_t *,\n-\t\t\t\t\tdata_offset);\n-\t}\n-\n-\tiv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n-\t\t\t\tsession->iv.offset);\n-\n-\tIMB_CHACHA20_POLY1305_INIT(qp->mb_mgr, session->key,\n-\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\tiv_ptr,\tsym_op->aead.aad.data,\n-\t\t\t\t(uint64_t)session->aad_length);\n-\n-\tif (session->op == IPSEC_MB_OP_AEAD_AUTHENTICATED_ENCRYPT) {\n-\t\tIMB_CHACHA20_POLY1305_ENC_UPDATE(qp->mb_mgr,\n-\t\t\t\tsession->key,\n-\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\tdst, src, (uint64_t)part_len);\n-\t\ttotal_len = data_length - part_len;\n-\n-\t\twhile (total_len) {\n-\t\t\tm_src = m_src->next;\n-\t\t\tRTE_ASSERT(m_src != NULL);\n-\n-\t\t\tsrc = rte_pktmbuf_mtod(m_src, uint8_t *);\n-\t\t\tif (oop)\n-\t\t\t\tdst += part_len;\n-\t\t\telse\n-\t\t\t\tdst = src;\n-\t\t\tpart_len = (m_src->data_len < total_len) ?\n-\t\t\t\t\tm_src->data_len : total_len;\n-\n-\t\t\tif (dst == NULL || src == NULL) {\n-\t\t\t\tIPSEC_MB_LOG(ERR, \"Invalid src or dst input\");\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\t\t\tIMB_CHACHA20_POLY1305_ENC_UPDATE(qp->mb_mgr,\n-\t\t\t\t\tsession->key,\n-\t\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\t\tdst, src, (uint64_t)part_len);\n-\t\t\ttotal_len -= part_len;\n-\t\t\tif (total_len < 0) {\n-\t\t\t\tIPSEC_MB_LOG(ERR, \"Invalid part len\");\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\t\t}\n-\n-\t\ttag = sym_op->aead.digest.data;\n-\t\tIMB_CHACHA20_POLY1305_ENC_FINALIZE(qp->mb_mgr,\n-\t\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\t\ttag, session->gen_digest_length);\n-\n-\t} else {\n-\t\tIMB_CHACHA20_POLY1305_DEC_UPDATE(qp->mb_mgr,\n-\t\t\t\t\tsession->key,\n-\t\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\t\tdst, src, (uint64_t)part_len);\n-\n-\t\ttotal_len = data_length - part_len;\n-\n-\t\twhile (total_len) {\n-\t\t\tm_src = m_src->next;\n-\n-\t\t\tRTE_ASSERT(m_src != NULL);\n-\n-\t\t\tsrc = rte_pktmbuf_mtod(m_src, uint8_t *);\n-\t\t\tif (oop)\n-\t\t\t\tdst += part_len;\n-\t\t\telse\n-\t\t\t\tdst = src;\n-\t\t\tpart_len = (m_src->data_len < total_len) ?\n-\t\t\t\t\tm_src->data_len : total_len;\n-\n-\t\t\tif (dst == NULL || src == NULL) {\n-\t\t\t\tIPSEC_MB_LOG(ERR, \"Invalid src or dst input\");\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\t\t\tIMB_CHACHA20_POLY1305_DEC_UPDATE(qp->mb_mgr,\n-\t\t\t\t\tsession->key,\n-\t\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\t\tdst, src, (uint64_t)part_len);\n-\t\t\ttotal_len -= part_len;\n-\t\t\tif (total_len < 0) {\n-\t\t\t\tIPSEC_MB_LOG(ERR, \"Invalid part len\");\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\t\t}\n-\n-\t\ttag = qp_data->temp_digest;\n-\t\tIMB_CHACHA20_POLY1305_DEC_FINALIZE(qp->mb_mgr,\n-\t\t\t\t\t&qp_data->chacha20_poly1305_ctx_data,\n-\t\t\t\t\ttag, session->gen_digest_length);\n-\t}\n-\n-\treturn 0;\n-}\n-\n-/**\n- * Process a completed chacha poly op\n- *\n- * @param qp\t\tQueue Pair to process\n- * @param op\t\tCrypto operation\n- * @param sess\t\tCrypto session\n- *\n- * @return\n- * - void\n- */\n-static void\n-post_process_chacha20_poly1305_crypto_op(struct ipsec_mb_qp *qp,\n-\t\tstruct rte_crypto_op *op,\n-\t\tstruct chacha20_poly1305_session *session)\n-{\n-\tstruct chacha20_poly1305_qp_data *qp_data =\n-\t\t\t\t\tipsec_mb_get_qp_private_data(qp);\n-\n-\top->status = RTE_CRYPTO_OP_STATUS_SUCCESS;\n-\t/* Verify digest if required */\n-\tif (session->op == IPSEC_MB_OP_AEAD_AUTHENTICATED_DECRYPT ||\n-\t\t\tsession->op == IPSEC_MB_OP_HASH_VERIFY_ONLY) {\n-\t\tuint8_t *digest = op->sym->aead.digest.data;\n-\t\tuint8_t *tag = qp_data->temp_digest;\n-\n-#ifdef RTE_LIBRTE_PMD_CHACHA20_POLY1305_DEBUG\n-\t\trte_hexdump(stdout, \"auth tag (orig):\",\n-\t\t\t\tdigest, session->req_digest_length);\n-\t\trte_hexdump(stdout, \"auth tag (calc):\",\n-\t\t\t\ttag, session->req_digest_length);\n-#endif\n-\t\tif (memcmp(tag, digest,\tsession->req_digest_length) != 0)\n-\t\t\top->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;\n-\n-\t}\n-\n-}\n-\n-/**\n- * Process a completed Chacha20_poly1305 request\n- *\n- * @param qp\t\tQueue Pair to process\n- * @param op\t\tCrypto operation\n- * @param sess\t\tCrypto session\n- *\n- * @return\n- * - void\n- */\n-static void\n-handle_completed_chacha20_poly1305_crypto_op(struct ipsec_mb_qp *qp,\n-\t\tstruct rte_crypto_op *op,\n-\t\tstruct chacha20_poly1305_session *sess)\n-{\n-\tpost_process_chacha20_poly1305_crypto_op(qp, op, sess);\n-\n-\t/* Free session if a session-less crypto op */\n-\tif (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {\n-\t\tmemset(sess, 0, sizeof(struct chacha20_poly1305_session));\n-\t\trte_mempool_put(qp->sess_mp, op->sym->session);\n-\t\top->sym->session = NULL;\n-\t}\n-}\n-\n-static uint16_t\n-chacha20_poly1305_pmd_dequeue_burst(void *queue_pair,\n-\t\tstruct rte_crypto_op **ops, uint16_t nb_ops)\n-{\n-\tstruct chacha20_poly1305_session *sess;\n-\tstruct ipsec_mb_qp *qp = queue_pair;\n-\n-\tint retval = 0;\n-\tunsigned int i = 0, nb_dequeued;\n-\n-\tnb_dequeued = rte_ring_dequeue_burst(qp->ingress_queue,\n-\t\t\t(void **)ops, nb_ops, NULL);\n-\n-\tfor (i = 0; i < nb_dequeued; i++) {\n-\n-\t\tsess = ipsec_mb_get_session_private(qp, ops[i]);\n-\t\tif (unlikely(sess == NULL)) {\n-\t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\t\tqp->stats.dequeue_err_count++;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\tretval = chacha20_poly1305_crypto_op(qp, ops[i], sess);\n-\t\tif (retval < 0) {\n-\t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\t\tqp->stats.dequeue_err_count++;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\thandle_completed_chacha20_poly1305_crypto_op(qp, ops[i], sess);\n-\t}\n-\n-\tqp->stats.dequeued_count += i;\n-\n-\treturn i;\n-}\n+#include \"pmd_aesni_mb_priv.h\"\n \n struct rte_cryptodev_ops chacha20_poly1305_pmd_ops = {\n \t.dev_configure = ipsec_mb_config,\n@@ -384,7 +57,7 @@ RTE_INIT(ipsec_mb_register_chacha20_poly1305)\n \t\t= &ipsec_mb_pmds[IPSEC_MB_PMD_TYPE_CHACHA20_POLY1305];\n \n \tchacha_poly_data->caps = chacha20_poly1305_capabilities;\n-\tchacha_poly_data->dequeue_burst = chacha20_poly1305_pmd_dequeue_burst;\n+\tchacha_poly_data->dequeue_burst = aesni_mb_dequeue_burst;\n \tchacha_poly_data->feature_flags =\n \t\tRTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n \t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n@@ -395,10 +68,9 @@ RTE_INIT(ipsec_mb_register_chacha20_poly1305)\n \t\tRTE_CRYPTODEV_FF_SYM_SESSIONLESS;\n \tchacha_poly_data->internals_priv_size = 0;\n \tchacha_poly_data->ops = &chacha20_poly1305_pmd_ops;\n-\tchacha_poly_data->qp_priv_size =\n-\t\t\tsizeof(struct chacha20_poly1305_qp_data);\n+\tchacha_poly_data->qp_priv_size = sizeof(struct aesni_mb_qp_data);\n \tchacha_poly_data->session_configure =\n-\t\t\tchacha20_poly1305_session_configure;\n+\t\t\taesni_mb_session_configure;\n \tchacha_poly_data->session_priv_size =\n-\t\t\tsizeof(struct chacha20_poly1305_session);\n+\t\t\tsizeof(struct aesni_mb_session);\n }\ndiff --git a/drivers/crypto/ipsec_mb/pmd_chacha_poly_priv.h b/drivers/crypto/ipsec_mb/pmd_chacha_poly_priv.h\nindex 842f62f5d1..e668bfe07f 100644\n--- a/drivers/crypto/ipsec_mb/pmd_chacha_poly_priv.h\n+++ b/drivers/crypto/ipsec_mb/pmd_chacha_poly_priv.h\n@@ -7,9 +7,7 @@\n \n #include \"ipsec_mb_private.h\"\n \n-#define CHACHA20_POLY1305_IV_LENGTH 12\n #define CHACHA20_POLY1305_DIGEST_LENGTH 16\n-#define CHACHA20_POLY1305_KEY_SIZE  32\n \n static const\n struct rte_cryptodev_capabilities chacha20_poly1305_capabilities[] = {\n@@ -45,30 +43,4 @@ struct rte_cryptodev_capabilities chacha20_poly1305_capabilities[] = {\n \n uint8_t pmd_driver_id_chacha20_poly1305;\n \n-/** CHACHA20 POLY1305 private session structure */\n-struct chacha20_poly1305_session {\n-\tstruct {\n-\t\tuint16_t length;\n-\t\tuint16_t offset;\n-\t} iv;\n-\t/**< IV parameters */\n-\tuint16_t aad_length;\n-\t/**< AAD length */\n-\tuint16_t req_digest_length;\n-\t/**< Requested digest length */\n-\tuint16_t gen_digest_length;\n-\t/**< Generated digest length */\n-\tuint8_t key[CHACHA20_POLY1305_KEY_SIZE];\n-\tenum ipsec_mb_operation op;\n-} __rte_cache_aligned;\n-\n-struct chacha20_poly1305_qp_data {\n-\tstruct chacha20_poly1305_context_data chacha20_poly1305_ctx_data;\n-\tuint8_t temp_digest[CHACHA20_POLY1305_DIGEST_LENGTH];\n-\t/**< Buffer used to store the digest generated\n-\t * by the driver when verifying a digest provided\n-\t * by the user (using authentication verify operation)\n-\t */\n-};\n-\n #endif /* _PMD_CHACHA_POLY_PRIV_H_ */\ndiff --git a/drivers/crypto/ipsec_mb/pmd_kasumi.c b/drivers/crypto/ipsec_mb/pmd_kasumi.c\nindex 70536ec3dc..c3571ec81b 100644\n--- a/drivers/crypto/ipsec_mb/pmd_kasumi.c\n+++ b/drivers/crypto/ipsec_mb/pmd_kasumi.c\n@@ -10,406 +10,7 @@\n #include <rte_malloc.h>\n \n #include \"pmd_kasumi_priv.h\"\n-\n-/** Parse crypto xform chain and set private session parameters. */\n-static int\n-kasumi_session_configure(IMB_MGR *mgr, void *priv_sess,\n-\t\t\t  const struct rte_crypto_sym_xform *xform)\n-{\n-\tconst struct rte_crypto_sym_xform *auth_xform = NULL;\n-\tconst struct rte_crypto_sym_xform *cipher_xform = NULL;\n-\tenum ipsec_mb_operation mode;\n-\tstruct kasumi_session *sess = (struct kasumi_session *)priv_sess;\n-\t/* Select Crypto operation - hash then cipher / cipher then hash */\n-\tint ret = ipsec_mb_parse_xform(xform, &mode, &auth_xform,\n-\t\t\t\t&cipher_xform, NULL);\n-\n-\tif (ret)\n-\t\treturn ret;\n-\n-\tif (cipher_xform) {\n-\t\t/* Only KASUMI F8 supported */\n-\t\tif (cipher_xform->cipher.algo != RTE_CRYPTO_CIPHER_KASUMI_F8) {\n-\t\t\tIPSEC_MB_LOG(ERR, \"Unsupported cipher algorithm \");\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n-\t\tsess->cipher_iv_offset = cipher_xform->cipher.iv.offset;\n-\t\tif (cipher_xform->cipher.iv.length != KASUMI_IV_LENGTH) {\n-\t\t\tIPSEC_MB_LOG(ERR, \"Wrong IV length\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\t/* Initialize key */\n-\t\tIMB_KASUMI_INIT_F8_KEY_SCHED(mgr,\n-\t\t\t\t\t      cipher_xform->cipher.key.data,\n-\t\t\t\t\t      &sess->pKeySched_cipher);\n-\t}\n-\n-\tif (auth_xform) {\n-\t\t/* Only KASUMI F9 supported */\n-\t\tif (auth_xform->auth.algo != RTE_CRYPTO_AUTH_KASUMI_F9) {\n-\t\t\tIPSEC_MB_LOG(ERR, \"Unsupported authentication\");\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n-\t\tif (auth_xform->auth.digest_length != KASUMI_DIGEST_LENGTH) {\n-\t\t\tIPSEC_MB_LOG(ERR, \"Wrong digest length\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tsess->auth_op = auth_xform->auth.op;\n-\n-\t\t/* Initialize key */\n-\t\tIMB_KASUMI_INIT_F9_KEY_SCHED(mgr, auth_xform->auth.key.data,\n-\t\t\t\t\t      &sess->pKeySched_hash);\n-\t}\n-\n-\tsess->op = mode;\n-\treturn ret;\n-}\n-\n-/** Encrypt/decrypt mbufs with same cipher key. */\n-static uint8_t\n-process_kasumi_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops,\n-\t\t\t  struct kasumi_session *session, uint8_t num_ops)\n-{\n-\tunsigned int i;\n-\tuint8_t processed_ops = 0;\n-\tconst void *src[num_ops];\n-\tvoid *dst[num_ops];\n-\tuint8_t *iv_ptr;\n-\tuint64_t iv[num_ops];\n-\tuint32_t num_bytes[num_ops];\n-\n-\tfor (i = 0; i < num_ops; i++) {\n-\t\tsrc[i] = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src,\n-\t\t\t\t\t\t uint8_t *,\n-\t\t\t\t\t\t (ops[i]->sym->cipher.data.offset >> 3));\n-\t\tdst[i] = ops[i]->sym->m_dst\n-\t\t\t     ? rte_pktmbuf_mtod_offset(ops[i]->sym->m_dst,\n-\t\t\t\t\t\t       uint8_t *,\n-\t\t\t\t\t\t       (ops[i]->sym->cipher.data.offset >> 3))\n-\t\t\t     : rte_pktmbuf_mtod_offset(ops[i]->sym->m_src,\n-\t\t\t\t\t\t       uint8_t *,\n-\t\t\t\t\t\t       (ops[i]->sym->cipher.data.offset >> 3));\n-\t\tiv_ptr = rte_crypto_op_ctod_offset(ops[i], uint8_t *,\n-\t\t\t\t\t\t    session->cipher_iv_offset);\n-\t\tiv[i] = *((uint64_t *)(iv_ptr));\n-\t\tnum_bytes[i] = ops[i]->sym->cipher.data.length >> 3;\n-\n-\t\tprocessed_ops++;\n-\t}\n-\n-\tif (processed_ops != 0)\n-\t\tIMB_KASUMI_F8_N_BUFFER(qp->mb_mgr, &session->pKeySched_cipher,\n-\t\t\t\t\tiv, src, dst, num_bytes,\n-\t\t\t\t\tprocessed_ops);\n-\n-\treturn processed_ops;\n-}\n-\n-/** Encrypt/decrypt mbuf (bit level function). */\n-static uint8_t\n-process_kasumi_cipher_op_bit(struct ipsec_mb_qp *qp, struct rte_crypto_op *op,\n-\t\t\t      struct kasumi_session *session)\n-{\n-\tuint8_t *src, *dst;\n-\tuint8_t *iv_ptr;\n-\tuint64_t iv;\n-\tuint32_t length_in_bits, offset_in_bits;\n-\n-\toffset_in_bits = op->sym->cipher.data.offset;\n-\tsrc = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);\n-\tif (op->sym->m_dst == NULL)\n-\t\tdst = src;\n-\telse\n-\t\tdst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);\n-\tiv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n-\t\t\t\t\t    session->cipher_iv_offset);\n-\tiv = *((uint64_t *)(iv_ptr));\n-\tlength_in_bits = op->sym->cipher.data.length;\n-\n-\tIMB_KASUMI_F8_1_BUFFER_BIT(qp->mb_mgr, &session->pKeySched_cipher, iv,\n-\t\t\t\t    src, dst, length_in_bits, offset_in_bits);\n-\n-\treturn 1;\n-}\n-\n-/** Generate/verify hash from mbufs with same hash key. */\n-static int\n-process_kasumi_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops,\n-\t\t\tstruct kasumi_session *session, uint8_t num_ops)\n-{\n-\tunsigned int i;\n-\tuint8_t processed_ops = 0;\n-\tuint8_t *src, *dst;\n-\tuint32_t length_in_bits;\n-\tuint32_t num_bytes;\n-\tstruct kasumi_qp_data *qp_data = ipsec_mb_get_qp_private_data(qp);\n-\n-\tfor (i = 0; i < num_ops; i++) {\n-\t\t/* Data must be byte aligned */\n-\t\tif ((ops[i]->sym->auth.data.offset % BYTE_LEN) != 0) {\n-\t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\t\tIPSEC_MB_LOG(ERR, \"Invalid Offset\");\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\tlength_in_bits = ops[i]->sym->auth.data.length;\n-\n-\t\tsrc = rte_pktmbuf_mtod_offset(ops[i]->sym->m_src, uint8_t *,\n-\t\t\t\t\t      (ops[i]->sym->auth.data.offset >> 3));\n-\t\t/* Direction from next bit after end of message */\n-\t\tnum_bytes = length_in_bits >> 3;\n-\n-\t\tif (session->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) {\n-\t\t\tdst = qp_data->temp_digest;\n-\t\t\tIMB_KASUMI_F9_1_BUFFER(qp->mb_mgr,\n-\t\t\t\t\t\t&session->pKeySched_hash, src,\n-\t\t\t\t\t\tnum_bytes, dst);\n-\n-\t\t\t/* Verify digest. */\n-\t\t\tif (memcmp(dst, ops[i]->sym->auth.digest.data,\n-\t\t\t\t    KASUMI_DIGEST_LENGTH)\n-\t\t\t    != 0)\n-\t\t\t\tops[i]->status\n-\t\t\t\t    = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;\n-\t\t} else {\n-\t\t\tdst = ops[i]->sym->auth.digest.data;\n-\n-\t\t\tIMB_KASUMI_F9_1_BUFFER(qp->mb_mgr,\n-\t\t\t\t\t\t&session->pKeySched_hash, src,\n-\t\t\t\t\t\tnum_bytes, dst);\n-\t\t}\n-\t\tprocessed_ops++;\n-\t}\n-\n-\treturn processed_ops;\n-}\n-\n-/** Process a batch of crypto ops which shares the same session. */\n-static int\n-process_ops(struct rte_crypto_op **ops, struct kasumi_session *session,\n-\t\tstruct ipsec_mb_qp *qp, uint8_t num_ops)\n-{\n-\tunsigned int i;\n-\tunsigned int processed_ops;\n-\n-\tswitch (session->op) {\n-\tcase IPSEC_MB_OP_ENCRYPT_ONLY:\n-\tcase IPSEC_MB_OP_DECRYPT_ONLY:\n-\t\tprocessed_ops\n-\t\t    = process_kasumi_cipher_op(qp, ops, session, num_ops);\n-\t\tbreak;\n-\tcase IPSEC_MB_OP_HASH_GEN_ONLY:\n-\tcase IPSEC_MB_OP_HASH_VERIFY_ONLY:\n-\t\tprocessed_ops\n-\t\t    = process_kasumi_hash_op(qp, ops, session, num_ops);\n-\t\tbreak;\n-\tcase IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN:\n-\tcase IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY:\n-\t\tprocessed_ops\n-\t\t    = process_kasumi_cipher_op(qp, ops, session, num_ops);\n-\t\tprocess_kasumi_hash_op(qp, ops, session, processed_ops);\n-\t\tbreak;\n-\tcase IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT:\n-\tcase IPSEC_MB_OP_HASH_GEN_THEN_ENCRYPT:\n-\t\tprocessed_ops\n-\t\t    = process_kasumi_hash_op(qp, ops, session, num_ops);\n-\t\tprocess_kasumi_cipher_op(qp, ops, session, processed_ops);\n-\t\tbreak;\n-\tdefault:\n-\t\t/* Operation not supported. */\n-\t\tprocessed_ops = 0;\n-\t}\n-\n-\tfor (i = 0; i < num_ops; i++) {\n-\t\t/*\n-\t\t * If there was no error/authentication failure,\n-\t\t * change status to successful.\n-\t\t */\n-\t\tif (ops[i]->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)\n-\t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;\n-\t\t/* Free session if a session-less crypto op. */\n-\t\tif (ops[i]->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {\n-\t\t\tmemset(session, 0, sizeof(struct kasumi_session));\n-\t\t\trte_mempool_put(qp->sess_mp, ops[i]->sym->session);\n-\t\t\tops[i]->sym->session = NULL;\n-\t\t}\n-\t}\n-\treturn processed_ops;\n-}\n-\n-/** Process a crypto op with length/offset in bits. */\n-static int\n-process_op_bit(struct rte_crypto_op *op, struct kasumi_session *session,\n-\t\tstruct ipsec_mb_qp *qp)\n-{\n-\tunsigned int processed_op;\n-\n-\tswitch (session->op) {\n-\t\t/* case KASUMI_OP_ONLY_CIPHER: */\n-\tcase IPSEC_MB_OP_ENCRYPT_ONLY:\n-\tcase IPSEC_MB_OP_DECRYPT_ONLY:\n-\t\tprocessed_op = process_kasumi_cipher_op_bit(qp, op, session);\n-\t\tbreak;\n-\t/* case KASUMI_OP_ONLY_AUTH: */\n-\tcase IPSEC_MB_OP_HASH_GEN_ONLY:\n-\tcase IPSEC_MB_OP_HASH_VERIFY_ONLY:\n-\t\tprocessed_op = process_kasumi_hash_op(qp, &op, session, 1);\n-\t\tbreak;\n-\t/* case KASUMI_OP_CIPHER_AUTH: */\n-\tcase IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN:\n-\t\tprocessed_op = process_kasumi_cipher_op_bit(qp, op, session);\n-\t\tif (processed_op == 1)\n-\t\t\tprocess_kasumi_hash_op(qp, &op, session, 1);\n-\t\tbreak;\n-\t/* case KASUMI_OP_AUTH_CIPHER: */\n-\tcase IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT:\n-\t\tprocessed_op = process_kasumi_hash_op(qp, &op, session, 1);\n-\t\tif (processed_op == 1)\n-\t\t\tprocess_kasumi_cipher_op_bit(qp, op, session);\n-\t\tbreak;\n-\tdefault:\n-\t\t/* Operation not supported. */\n-\t\tprocessed_op = 0;\n-\t}\n-\n-\t/*\n-\t * If there was no error/authentication failure,\n-\t * change status to successful.\n-\t */\n-\tif (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)\n-\t\top->status = RTE_CRYPTO_OP_STATUS_SUCCESS;\n-\n-\t/* Free session if a session-less crypto op. */\n-\tif (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS) {\n-\t\tmemset(CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session), 0,\n-\t\t\tsizeof(struct kasumi_session));\n-\t\trte_mempool_put(qp->sess_mp, (void *)op->sym->session);\n-\t\top->sym->session = NULL;\n-\t}\n-\treturn processed_op;\n-}\n-\n-static uint16_t\n-kasumi_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,\n-\t\t\t  uint16_t nb_ops)\n-{\n-\tstruct rte_crypto_op *c_ops[nb_ops];\n-\tstruct rte_crypto_op *curr_c_op = NULL;\n-\n-\tstruct kasumi_session *prev_sess = NULL, *curr_sess = NULL;\n-\tstruct ipsec_mb_qp *qp = queue_pair;\n-\tunsigned int i;\n-\tuint8_t burst_size = 0;\n-\tuint8_t processed_ops;\n-\tunsigned int nb_dequeued;\n-\n-\tnb_dequeued = rte_ring_dequeue_burst(qp->ingress_queue,\n-\t\t\t\t\t      (void **)ops, nb_ops, NULL);\n-\tfor (i = 0; i < nb_dequeued; i++) {\n-\t\tcurr_c_op = ops[i];\n-\n-#ifdef RTE_LIBRTE_PMD_KASUMI_DEBUG\n-\t\tif (!rte_pktmbuf_is_contiguous(curr_c_op->sym->m_src)\n-\t\t    || (curr_c_op->sym->m_dst != NULL\n-\t\t\t&& !rte_pktmbuf_is_contiguous(\n-\t\t\t    curr_c_op->sym->m_dst))) {\n-\t\t\tIPSEC_MB_LOG(ERR,\n-\t\t\t\t      \"PMD supports only contiguous mbufs, op (%p) provides noncontiguous mbuf as source/destination buffer.\",\n-\t\t\t\t      curr_c_op);\n-\t\t\tcurr_c_op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\t\tbreak;\n-\t\t}\n-#endif\n-\n-\t\t/* Set status as enqueued (not processed yet) by default. */\n-\t\tcurr_c_op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;\n-\n-\t\tcurr_sess = (struct kasumi_session *)\n-\t\t\tipsec_mb_get_session_private(qp, curr_c_op);\n-\t\tif (unlikely(curr_sess == NULL\n-\t\t\t      || curr_sess->op == IPSEC_MB_OP_NOT_SUPPORTED)) {\n-\t\t\tcurr_c_op->status\n-\t\t\t    = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\t/* If length/offset is at bit-level, process this buffer alone.\n-\t\t */\n-\t\tif (((curr_c_op->sym->cipher.data.length % BYTE_LEN) != 0)\n-\t\t    || ((ops[i]->sym->cipher.data.offset % BYTE_LEN) != 0)) {\n-\t\t\t/* Process the ops of the previous session. */\n-\t\t\tif (prev_sess != NULL) {\n-\t\t\t\tprocessed_ops = process_ops(c_ops, prev_sess,\n-\t\t\t\t\t\tqp, burst_size);\n-\t\t\t\tif (processed_ops < burst_size) {\n-\t\t\t\t\tburst_size = 0;\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n-\n-\t\t\t\tburst_size = 0;\n-\t\t\t\tprev_sess = NULL;\n-\t\t\t}\n-\n-\t\t\tprocessed_ops = process_op_bit(curr_c_op,\n-\t\t\t\t\tcurr_sess, qp);\n-\t\t\tif (processed_ops != 1)\n-\t\t\t\tbreak;\n-\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\t/* Batch ops that share the same session. */\n-\t\tif (prev_sess == NULL) {\n-\t\t\tprev_sess = curr_sess;\n-\t\t\tc_ops[burst_size++] = curr_c_op;\n-\t\t} else if (curr_sess == prev_sess) {\n-\t\t\tc_ops[burst_size++] = curr_c_op;\n-\t\t\t/*\n-\t\t\t * When there are enough ops to process in a batch,\n-\t\t\t * process them, and start a new batch.\n-\t\t\t */\n-\t\t\tif (burst_size == KASUMI_MAX_BURST) {\n-\t\t\t\tprocessed_ops = process_ops(c_ops, prev_sess,\n-\t\t\t\t\t\tqp, burst_size);\n-\t\t\t\tif (processed_ops < burst_size) {\n-\t\t\t\t\tburst_size = 0;\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n-\n-\t\t\t\tburst_size = 0;\n-\t\t\t\tprev_sess = NULL;\n-\t\t\t}\n-\t\t} else {\n-\t\t\t/*\n-\t\t\t * Different session, process the ops\n-\t\t\t * of the previous session.\n-\t\t\t */\n-\t\t\tprocessed_ops = process_ops(c_ops, prev_sess, qp,\n-\t\t\t\t\tburst_size);\n-\t\t\tif (processed_ops < burst_size) {\n-\t\t\t\tburst_size = 0;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\n-\t\t\tburst_size = 0;\n-\t\t\tprev_sess = curr_sess;\n-\n-\t\t\tc_ops[burst_size++] = curr_c_op;\n-\t\t}\n-\t}\n-\n-\tif (burst_size != 0) {\n-\t\t/* Process the crypto ops of the last session. */\n-\t\tprocessed_ops = process_ops(c_ops, prev_sess, qp, burst_size);\n-\t}\n-\n-\tqp->stats.dequeued_count += i;\n-\treturn i;\n-}\n+#include \"pmd_aesni_mb_priv.h\"\n \n struct rte_cryptodev_ops kasumi_pmd_ops = {\n \t.dev_configure = ipsec_mb_config,\n@@ -460,7 +61,7 @@ RTE_INIT(ipsec_mb_register_kasumi)\n \t    = &ipsec_mb_pmds[IPSEC_MB_PMD_TYPE_KASUMI];\n \n \tkasumi_data->caps = kasumi_capabilities;\n-\tkasumi_data->dequeue_burst = kasumi_pmd_dequeue_burst;\n+\tkasumi_data->dequeue_burst = aesni_mb_dequeue_burst;\n \tkasumi_data->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO\n \t\t\t\t| RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING\n \t\t\t\t| RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA\n@@ -469,7 +70,8 @@ RTE_INIT(ipsec_mb_register_kasumi)\n \t\t\t\t| RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \tkasumi_data->internals_priv_size = 0;\n \tkasumi_data->ops = &kasumi_pmd_ops;\n-\tkasumi_data->qp_priv_size = sizeof(struct kasumi_qp_data);\n-\tkasumi_data->session_configure = kasumi_session_configure;\n-\tkasumi_data->session_priv_size = sizeof(struct kasumi_session);\n+\tkasumi_data->qp_priv_size = sizeof(struct aesni_mb_qp_data);\n+\tkasumi_data->session_configure = aesni_mb_session_configure;\n+\tkasumi_data->session_priv_size =\n+\t\t\tsizeof(struct aesni_mb_session);\n }\ndiff --git a/drivers/crypto/ipsec_mb/pmd_kasumi_priv.h b/drivers/crypto/ipsec_mb/pmd_kasumi_priv.h\nindex 8db1d1cc5b..3223cf1a14 100644\n--- a/drivers/crypto/ipsec_mb/pmd_kasumi_priv.h\n+++ b/drivers/crypto/ipsec_mb/pmd_kasumi_priv.h\n@@ -9,8 +9,6 @@\n \n #define KASUMI_KEY_LENGTH 16\n #define KASUMI_IV_LENGTH 8\n-#define KASUMI_MAX_BURST 4\n-#define BYTE_LEN 8\n #define KASUMI_DIGEST_LENGTH 4\n \n uint8_t pmd_driver_id_kasumi;\n@@ -60,22 +58,4 @@ static const struct rte_cryptodev_capabilities kasumi_capabilities[] = {\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n-/** KASUMI private session structure */\n-struct kasumi_session {\n-\t/* Keys have to be 16-byte aligned */\n-\tkasumi_key_sched_t pKeySched_cipher;\n-\tkasumi_key_sched_t pKeySched_hash;\n-\tenum ipsec_mb_operation op;\n-\tenum rte_crypto_auth_operation auth_op;\n-\tuint16_t cipher_iv_offset;\n-} __rte_cache_aligned;\n-\n-struct kasumi_qp_data {\n-\tuint8_t temp_digest[KASUMI_DIGEST_LENGTH];\n-\t/* *< Buffers used to store the digest generated\n-\t * by the driver when verifying a digest provided\n-\t * by the user (using authentication verify operation)\n-\t */\n-};\n-\n #endif /* _PMD_KASUMI_PRIV_H_ */\n",
    "prefixes": [
        "v6",
        "5/5"
    ]
}