Patch Detail

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

{
    "id": 100013,
    "url": "http://patches.dpdk.org/api/patches/100013/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210929163035.608387-7-ciara.power@intel.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": "<20210929163035.608387-7-ciara.power@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210929163035.608387-7-ciara.power@intel.com",
    "date": "2021-09-29T16:30:31",
    "name": "[v3,06/10] drivers/crypto: move snow3g PMD to IPsec-mb framework",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "daed908fd04327710f147203d695bf7fd9bf7a6c",
    "submitter": {
        "id": 978,
        "url": "http://patches.dpdk.org/api/people/978/?format=api",
        "name": "Ciara Power",
        "email": "ciara.power@intel.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/20210929163035.608387-7-ciara.power@intel.com/mbox/",
    "series": [
        {
            "id": 19269,
            "url": "http://patches.dpdk.org/api/series/19269/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19269",
            "date": "2021-09-29T16:30:25",
            "name": "drivers/crypto: introduce ipsec_mb framework",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/19269/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/100013/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/100013/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 8F9DCA0547;\n\tWed, 29 Sep 2021 18:31:36 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EDE9A41137;\n\tWed, 29 Sep 2021 18:30:58 +0200 (CEST)",
            "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n by mails.dpdk.org (Postfix) with ESMTP id F3DCA4113F\n for <dev@dpdk.org>; Wed, 29 Sep 2021 18:30:55 +0200 (CEST)",
            "from orsmga002.jf.intel.com ([10.7.209.21])\n by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Sep 2021 09:30:55 -0700",
            "from silpixa00400355.ir.intel.com (HELO\n silpixa00400355.ger.corp.intel.com) ([10.237.222.87])\n by orsmga002.jf.intel.com with ESMTP; 29 Sep 2021 09:30:52 -0700"
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6200,9189,10122\"; a=\"285997997\"",
            "E=Sophos;i=\"5.85,332,1624345200\"; d=\"scan'208\";a=\"285997997\"",
            "E=Sophos;i=\"5.85,332,1624345200\"; d=\"scan'208\";a=\"457092792\""
        ],
        "X-ExtLoop1": "1",
        "From": "Ciara Power <ciara.power@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "roy.fan.zhang@intel.com, piotrx.bronowski@intel.com, gakhil@marvell.com,\n\t=?utf-8?q?Ciara=C2=A0Power?= <ciara.power@intel.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Pablo de Lara <pablo.de.lara.guarch@intel.com>, Ray Kinsella <mdr@ashroe.eu>",
        "Date": "Wed, 29 Sep 2021 16:30:31 +0000",
        "Message-Id": "<20210929163035.608387-7-ciara.power@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20210929163035.608387-1-ciara.power@intel.com>",
        "References": "<20210727083832.291687-1-roy.fan.zhang@intel.com>\n <20210929163035.608387-1-ciara.power@intel.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v3 06/10] drivers/crypto: move snow3g PMD to\n IPsec-mb framework",
        "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",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Piotr Bronowski <piotrx.bronowski@intel.com>\n\nThis patch removes the crypto/snow3g folder and gathers all snow3g PMD\nimplementation specific details into a single file,\npmd_snow3g.c in the crypto/ipsec_mb folder.\n\nSigned-off-by: Piotr Bronowski <piotrx.bronowski@intel.com>\nSigned-off-by: Ciara Power <ciara.power@intel.com>\n\n---\nv3: Removed extra empty lines.\nv2: Updated maintainers file.\n---\n MAINTAINERS                                   |   8 +-\n doc/guides/cryptodevs/snow3g.rst              |   3 +-\n drivers/crypto/ipsec_mb/meson.build           |   3 +-\n .../pmd_snow3g.c}                             | 457 ++++++++----------\n .../ipsec_mb/rte_ipsec_mb_pmd_private.h       |   7 +\n drivers/crypto/meson.build                    |   1 -\n drivers/crypto/snow3g/meson.build             |  24 -\n drivers/crypto/snow3g/rte_snow3g_pmd_ops.c    | 323 -------------\n drivers/crypto/snow3g/snow3g_pmd_private.h    |  84 ----\n drivers/crypto/snow3g/version.map             |   3 -\n 10 files changed, 205 insertions(+), 708 deletions(-)\n rename drivers/crypto/{snow3g/rte_snow3g_pmd.c => ipsec_mb/pmd_snow3g.c} (57%)\n delete mode 100644 drivers/crypto/snow3g/meson.build\n delete mode 100644 drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\n delete mode 100644 drivers/crypto/snow3g/snow3g_pmd_private.h\n delete mode 100644 drivers/crypto/snow3g/version.map",
    "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 794bad11c2..28855222d6 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -1058,9 +1058,11 @@ F: drivers/crypto/ipsec_mb/\n F: doc/guides/cryptodevs/aesni_gcm.rst\n F: doc/guides/cryptodevs/aesni_mb.rst\n F: doc/guides/cryptodevs/kasumi.rst\n+F: doc/guides/cryptodevs/snow3g.rst\n F: doc/guides/cryptodevs/features/aesni_gcm.ini\n F: doc/guides/cryptodevs/features/aesni_mb.ini\n F: doc/guides/cryptodevs/features/kasumi.ini\n+F: doc/guides/cryptodevs/features/snow3g.ini\n \n Marvell cnxk crypto\n M: Ankur Dwivedi <adwivedi@marvell.com>\n@@ -1131,12 +1133,6 @@ F: drivers/crypto/openssl/\n F: doc/guides/cryptodevs/openssl.rst\n F: doc/guides/cryptodevs/features/openssl.ini\n \n-SNOW 3G\n-M: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n-F: drivers/crypto/snow3g/\n-F: doc/guides/cryptodevs/snow3g.rst\n-F: doc/guides/cryptodevs/features/snow3g.ini\n-\n Virtio\n M: Jay Zhou <jianjay.zhou@huawei.com>\n F: drivers/crypto/virtio/\ndiff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst\nindex 0258b71bb4..4ba71d66ce 100644\n--- a/doc/guides/cryptodevs/snow3g.rst\n+++ b/doc/guides/cryptodevs/snow3g.rst\n@@ -77,7 +77,8 @@ and the external crypto libraries supported by them:\n    DPDK version   Crypto library version\n    =============  ================================\n    16.04 - 19.11  LibSSO SNOW3G\n-   20.02+         Multi-buffer library 0.53 - 1.0*\n+   20.02 - 21.08  Multi-buffer library 0.53 - 1.0*\n+   21.11+         Multi-buffer library 1.0*\n    =============  ================================\n \n \\* Multi-buffer library 1.0 or newer only works for Meson but not Make build system.\ndiff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build\nindex b0e2c6a0b7..e9d74eaad4 100644\n--- a/drivers/crypto/ipsec_mb/meson.build\n+++ b/drivers/crypto/ipsec_mb/meson.build\n@@ -25,6 +25,7 @@ sources = files('rte_ipsec_mb_pmd.c',\n \t\t'rte_ipsec_mb_pmd_ops.c',\n \t\t'pmd_aesni_mb.c',\n \t\t'pmd_aesni_gcm.c',\n-\t\t'pmd_kasumi.c'\n+\t\t'pmd_kasumi.c',\n+\t\t'pmd_snow3g.c'\n \t\t)\n deps += ['bus_vdev', 'net', 'security']\ndiff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c\nsimilarity index 57%\nrename from drivers/crypto/snow3g/rte_snow3g_pmd.c\nrename to drivers/crypto/ipsec_mb/pmd_snow3g.c\nindex 8284ac0b66..cc1ad3fb24 100644\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c\n+++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c\n@@ -1,87 +1,108 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2016-2018 Intel Corporation\n+ * Copyright(c) 2015-2021 Intel Corporation\n  */\n \n-#include <rte_common.h>\n-#include <rte_hexdump.h>\n-#include <rte_cryptodev.h>\n-#include <cryptodev_pmd.h>\n-#include <rte_bus_vdev.h>\n-#include <rte_malloc.h>\n-#include <rte_cpuflags.h>\n+#include <intel-ipsec-mb.h>\n \n-#include \"snow3g_pmd_private.h\"\n+#if defined(RTE_LIB_SECURITY)\n+#define AESNI_MB_DOCSIS_SEC_ENABLED 1\n+#include <rte_security.h>\n+#include <rte_security_driver.h>\n+#include <rte_ether.h>\n+#endif\n+\n+#include \"rte_ipsec_mb_pmd_private.h\"\n \n #define SNOW3G_IV_LENGTH 16\n #define SNOW3G_MAX_BURST 8\n #define BYTE_LEN 8\n+#define SNOW3G_DIGEST_LENGTH 4\n+#define SNOW3G_MAX_KEY_SIZE  128\n+\n+uint8_t pmd_driver_id_snow3g;\n+\n+static const struct rte_cryptodev_capabilities snow3g_capabilities[] = {\n+\t{\t/* SNOW 3G (UIA2) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\n+\t\t\t{.auth = {\n+\t\t\t\t.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.digest_size = {\n+\t\t\t\t\t.min = SNOW3G_DIGEST_LENGTH,\n+\t\t\t\t\t.max = SNOW3G_DIGEST_LENGTH,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = SNOW3G_IV_LENGTH,\n+\t\t\t\t\t.max = SNOW3G_IV_LENGTH,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n+\t{\t/* SNOW 3G (UEA2) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,\n+\t\t\t{.cipher = {\n+\t\t\t\t.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = SNOW3G_IV_LENGTH,\n+\t\t\t\t\t.max = SNOW3G_IV_LENGTH,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n+\tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n+};\n \n-static uint8_t cryptodev_driver_id;\n-\n-/** Get xform chain order. */\n-static enum snow3g_operation\n-snow3g_get_mode(const struct rte_crypto_sym_xform *xform)\n-{\n-\tif (xform == NULL)\n-\t\treturn SNOW3G_OP_NOT_SUPPORTED;\n-\n-\tif (xform->next)\n-\t\tif (xform->next->next != NULL)\n-\t\t\treturn SNOW3G_OP_NOT_SUPPORTED;\n-\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n-\t\tif (xform->next == NULL)\n-\t\t\treturn SNOW3G_OP_ONLY_AUTH;\n-\t\telse if (xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER)\n-\t\t\treturn SNOW3G_OP_AUTH_CIPHER;\n-\t\telse\n-\t\t\treturn SNOW3G_OP_NOT_SUPPORTED;\n-\t}\n-\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {\n-\t\tif (xform->next == NULL)\n-\t\t\treturn SNOW3G_OP_ONLY_CIPHER;\n-\t\telse if (xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)\n-\t\t\treturn SNOW3G_OP_CIPHER_AUTH;\n-\t\telse\n-\t\t\treturn SNOW3G_OP_NOT_SUPPORTED;\n-\t}\n-\n-\treturn SNOW3G_OP_NOT_SUPPORTED;\n-}\n-\n+/** SNOW 3G private session structure */\n+struct snow3g_session {\n+\tenum ipsec_mb_operation op;\n+\tenum rte_crypto_auth_operation auth_op;\n+\tsnow3g_key_schedule_t pKeySched_cipher;\n+\tsnow3g_key_schedule_t pKeySched_hash;\n+\tuint16_t cipher_iv_offset;\n+\tuint16_t auth_iv_offset;\n+} __rte_cache_aligned;\n+\n+struct snow3g_qp_data {\n+\tuint8_t temp_digest[SNOW3G_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 /** Parse crypto xform chain and set private session parameters. */\n-int\n-snow3g_set_session_parameters(MB_MGR *mgr, struct snow3g_session *sess,\n+static int\n+snow3g_session_configure(IMB_MGR *mgr, void *priv_sess,\n \t\tconst struct rte_crypto_sym_xform *xform)\n {\n+\tstruct snow3g_session *sess = (struct snow3g_session *)priv_sess;\n \tconst struct rte_crypto_sym_xform *auth_xform = NULL;\n \tconst struct rte_crypto_sym_xform *cipher_xform = NULL;\n-\tenum snow3g_operation mode;\n+\tenum ipsec_mb_operation mode;\n \n \t/* Select Crypto operation - hash then cipher / cipher then hash */\n-\tmode = snow3g_get_mode(xform);\n-\n-\tswitch (mode) {\n-\tcase SNOW3G_OP_CIPHER_AUTH:\n-\t\tauth_xform = xform->next;\n-\n-\t\t/* Fall-through */\n-\tcase SNOW3G_OP_ONLY_CIPHER:\n-\t\tcipher_xform = xform;\n-\t\tbreak;\n-\tcase SNOW3G_OP_AUTH_CIPHER:\n-\t\tcipher_xform = xform->next;\n-\t\t/* Fall-through */\n-\tcase SNOW3G_OP_ONLY_AUTH:\n-\t\tauth_xform = xform;\n-\t\tbreak;\n-\tcase SNOW3G_OP_NOT_SUPPORTED:\n-\tdefault:\n-\t\tSNOW3G_LOG(ERR, \"Unsupported operation chain order parameter\");\n-\t\treturn -ENOTSUP;\n-\t}\n+\tint ret = ipsec_mb_parse_xform(xform, &mode, &auth_xform,\n+\t\t\t\t&cipher_xform, NULL);\n+\tif (ret)\n+\t\treturn ret;\n \n \tif (cipher_xform) {\n \t\t/* Only SNOW 3G UEA2 supported */\n@@ -89,11 +110,11 @@ snow3g_set_session_parameters(MB_MGR *mgr, struct snow3g_session *sess,\n \t\t\treturn -ENOTSUP;\n \n \t\tif (cipher_xform->cipher.iv.length != SNOW3G_IV_LENGTH) {\n-\t\t\tSNOW3G_LOG(ERR, \"Wrong IV length\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Wrong IV length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tif (cipher_xform->cipher.key.length > SNOW3G_MAX_KEY_SIZE) {\n-\t\t\tSNOW3G_LOG(ERR, \"Not enough memory to store the key\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Not enough memory to store the key\");\n \t\t\treturn -ENOMEM;\n \t\t}\n \n@@ -110,18 +131,18 @@ snow3g_set_session_parameters(MB_MGR *mgr, struct snow3g_session *sess,\n \t\t\treturn -ENOTSUP;\n \n \t\tif (auth_xform->auth.digest_length != SNOW3G_DIGEST_LENGTH) {\n-\t\t\tSNOW3G_LOG(ERR, \"Wrong digest length\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Wrong digest length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tif (auth_xform->auth.key.length > SNOW3G_MAX_KEY_SIZE) {\n-\t\t\tSNOW3G_LOG(ERR, \"Not enough memory to store the key\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Not enough memory to store the key\");\n \t\t\treturn -ENOMEM;\n \t\t}\n \n \t\tsess->auth_op = auth_xform->auth.op;\n \n \t\tif (auth_xform->auth.iv.length != SNOW3G_IV_LENGTH) {\n-\t\t\tSNOW3G_LOG(ERR, \"Wrong IV length\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Wrong IV length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tsess->auth_iv_offset = auth_xform->auth.iv.offset;\n@@ -136,56 +157,13 @@ snow3g_set_session_parameters(MB_MGR *mgr, struct snow3g_session *sess,\n \treturn 0;\n }\n \n-/** Get SNOW 3G session. */\n-static struct snow3g_session *\n-snow3g_get_session(struct snow3g_qp *qp, struct rte_crypto_op *op)\n-{\n-\tstruct snow3g_session *sess = NULL;\n-\n-\tif (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {\n-\t\tif (likely(op->sym->session != NULL))\n-\t\t\tsess = (struct snow3g_session *)\n-\t\t\t\t\tget_sym_session_private_data(\n-\t\t\t\t\top->sym->session,\n-\t\t\t\t\tcryptodev_driver_id);\n-\t} else {\n-\t\tvoid *_sess = NULL;\n-\t\tvoid *_sess_private_data = NULL;\n-\n-\t\tif (rte_mempool_get(qp->sess_mp, (void **)&_sess))\n-\t\t\treturn NULL;\n-\n-\t\tif (rte_mempool_get(qp->sess_mp_priv,\n-\t\t\t\t(void **)&_sess_private_data))\n-\t\t\treturn NULL;\n-\n-\t\tsess = (struct snow3g_session *)_sess_private_data;\n-\n-\t\tif (unlikely(snow3g_set_session_parameters(qp->mgr, sess,\n-\t\t\t\top->sym->xform) != 0)) {\n-\t\t\trte_mempool_put(qp->sess_mp, _sess);\n-\t\t\trte_mempool_put(qp->sess_mp_priv, _sess_private_data);\n-\t\t\tsess = NULL;\n-\t\t}\n-\t\top->sym->session = (struct rte_cryptodev_sym_session *)_sess;\n-\t\tset_sym_session_private_data(op->sym->session,\n-\t\t\t\tcryptodev_driver_id, _sess_private_data);\n-\t}\n-\n-\tif (unlikely(sess == NULL))\n-\t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;\n-\n-\n-\treturn sess;\n-}\n-\n /** Encrypt/decrypt mbufs with same cipher key. */\n static uint8_t\n-process_snow3g_cipher_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n+process_snow3g_cipher_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops,\n \t\tstruct snow3g_session *session,\n \t\tuint8_t num_ops)\n {\n-\tunsigned i;\n+\tuint32_t i;\n \tuint8_t processed_ops = 0;\n \tconst void *src[SNOW3G_MAX_BURST];\n \tvoid *dst[SNOW3G_MAX_BURST];\n@@ -207,7 +185,7 @@ process_snow3g_cipher_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n \t\tprocessed_ops++;\n \t}\n \n-\tIMB_SNOW3G_F8_N_BUFFER(qp->mgr, &session->pKeySched_cipher, iv,\n+\tIMB_SNOW3G_F8_N_BUFFER(qp->mb_mgr, &session->pKeySched_cipher, iv,\n \t\t\tsrc, dst, num_bytes, processed_ops);\n \n \treturn processed_ops;\n@@ -215,7 +193,7 @@ process_snow3g_cipher_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n \n /** Encrypt/decrypt mbuf (bit level function). */\n static uint8_t\n-process_snow3g_cipher_op_bit(struct snow3g_qp *qp,\n+process_snow3g_cipher_op_bit(struct ipsec_mb_qp *qp,\n \t\tstruct rte_crypto_op *op,\n \t\tstruct snow3g_session *session)\n {\n@@ -227,7 +205,7 @@ process_snow3g_cipher_op_bit(struct snow3g_qp *qp,\n \tsrc = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);\n \tif (op->sym->m_dst == NULL) {\n \t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\tSNOW3G_LOG(ERR, \"bit-level in-place not supported\\n\");\n+\t\tIPSEC_MB_LOG(ERR, \"bit-level in-place not supported\\n\");\n \t\treturn 0;\n \t}\n \tdst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);\n@@ -235,7 +213,7 @@ process_snow3g_cipher_op_bit(struct snow3g_qp *qp,\n \t\t\t\tsession->cipher_iv_offset);\n \tlength_in_bits = op->sym->cipher.data.length;\n \n-\tIMB_SNOW3G_F8_1_BUFFER_BIT(qp->mgr, &session->pKeySched_cipher, iv,\n+\tIMB_SNOW3G_F8_1_BUFFER_BIT(qp->mb_mgr, &session->pKeySched_cipher, iv,\n \t\t\tsrc, dst, length_in_bits, offset_in_bits);\n \n \treturn 1;\n@@ -243,21 +221,22 @@ process_snow3g_cipher_op_bit(struct snow3g_qp *qp,\n \n /** Generate/verify hash from mbufs with same hash key. */\n static int\n-process_snow3g_hash_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n+process_snow3g_hash_op(struct ipsec_mb_qp *qp, struct rte_crypto_op **ops,\n \t\tstruct snow3g_session *session,\n \t\tuint8_t num_ops)\n {\n-\tunsigned i;\n+\tuint32_t i;\n \tuint8_t processed_ops = 0;\n \tuint8_t *src, *dst;\n \tuint32_t length_in_bits;\n \tuint8_t *iv;\n+\tstruct snow3g_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\tSNOW3G_LOG(ERR, \"Offset\");\n+\t\t\tIPSEC_MB_LOG(ERR, \"Offset\");\n \t\t\tbreak;\n \t\t}\n \n@@ -269,19 +248,20 @@ process_snow3g_hash_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n \t\t\t\tsession->auth_iv_offset);\n \n \t\tif (session->auth_op == RTE_CRYPTO_AUTH_OP_VERIFY) {\n-\t\t\tdst = qp->temp_digest;\n+\t\t\tdst = qp_data->temp_digest;\n \n-\t\t\tIMB_SNOW3G_F9_1_BUFFER(qp->mgr,\n+\t\t\tIMB_SNOW3G_F9_1_BUFFER(qp->mb_mgr,\n \t\t\t\t\t&session->pKeySched_hash,\n \t\t\t\t\tiv, src, length_in_bits, dst);\n \t\t\t/* Verify digest. */\n \t\t\tif (memcmp(dst, ops[i]->sym->auth.digest.data,\n \t\t\t\t\tSNOW3G_DIGEST_LENGTH) != 0)\n-\t\t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;\n+\t\t\t\tops[i]->status =\n+\t\t\t\t\tRTE_CRYPTO_OP_STATUS_AUTH_FAILED;\n \t\t} else  {\n \t\t\tdst = ops[i]->sym->auth.digest.data;\n \n-\t\t\tIMB_SNOW3G_F9_1_BUFFER(qp->mgr,\n+\t\t\tIMB_SNOW3G_F9_1_BUFFER(qp->mb_mgr,\n \t\t\t\t\t&session->pKeySched_hash,\n \t\t\t\t\tiv, src, length_in_bits, dst);\n \t\t}\n@@ -294,11 +274,11 @@ process_snow3g_hash_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n /** Process a batch of crypto ops which shares the same session. */\n static int\n process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n-\t\tstruct snow3g_qp *qp, uint8_t num_ops,\n+\t\tstruct ipsec_mb_qp *qp, uint8_t num_ops,\n \t\tuint16_t *accumulated_enqueued_ops)\n {\n-\tunsigned i;\n-\tunsigned enqueued_ops, processed_ops;\n+\tuint32_t i;\n+\tuint32_t enqueued_ops, processed_ops;\n \n #ifdef RTE_LIBRTE_PMD_SNOW3G_DEBUG\n \tfor (i = 0; i < num_ops; i++) {\n@@ -306,7 +286,8 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n \t\t\t\t(ops[i]->sym->m_dst != NULL &&\n \t\t\t\t!rte_pktmbuf_is_contiguous(\n \t\t\t\t\t\tops[i]->sym->m_dst))) {\n-\t\t\tSNOW3G_LOG(ERR, \"PMD supports only contiguous mbufs, \"\n+\t\t\tIPSEC_MB_LOG(ERR,\n+\t\t\t\t\"PMD supports only contiguous mbufs, \"\n \t\t\t\t\"op (%p) provides noncontiguous mbuf as \"\n \t\t\t\t\"source/destination buffer.\\n\", ops[i]);\n \t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n@@ -316,20 +297,24 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n #endif\n \n \tswitch (session->op) {\n-\tcase SNOW3G_OP_ONLY_CIPHER:\n+\tcase IPSEC_MB_OP_ENCRYPT_ONLY:\n+\tcase IPSEC_MB_OP_DECRYPT_ONLY:\n \t\tprocessed_ops = process_snow3g_cipher_op(qp, ops,\n \t\t\t\tsession, num_ops);\n \t\tbreak;\n-\tcase SNOW3G_OP_ONLY_AUTH:\n+\tcase IPSEC_MB_OP_HASH_GEN_ONLY:\n+\tcase IPSEC_MB_OP_HASH_VERIFY_ONLY:\n \t\tprocessed_ops = process_snow3g_hash_op(qp, ops, session,\n \t\t\t\tnum_ops);\n \t\tbreak;\n-\tcase SNOW3G_OP_CIPHER_AUTH:\n+\tcase IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN:\n+\tcase IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY:\n \t\tprocessed_ops = process_snow3g_cipher_op(qp, ops, session,\n \t\t\t\tnum_ops);\n \t\tprocess_snow3g_hash_op(qp, ops, session, processed_ops);\n \t\tbreak;\n-\tcase SNOW3G_OP_AUTH_CIPHER:\n+\tcase IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT:\n+\tcase IPSEC_MB_OP_HASH_GEN_THEN_ENCRYPT:\n \t\tprocessed_ops = process_snow3g_hash_op(qp, ops, session,\n \t\t\t\tnum_ops);\n \t\tprocess_snow3g_cipher_op(qp, ops, session, processed_ops);\n@@ -358,9 +343,9 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n \t\t}\n \t}\n \n-\tenqueued_ops = rte_ring_enqueue_burst(qp->processed_ops,\n+\tenqueued_ops = rte_ring_enqueue_burst(qp->ingress_queue,\n \t\t\t(void **)ops, processed_ops, NULL);\n-\tqp->qp_stats.enqueued_count += enqueued_ops;\n+\tqp->stats.enqueued_count += enqueued_ops;\n \t*accumulated_enqueued_ops += enqueued_ops;\n \n \treturn enqueued_ops;\n@@ -369,24 +354,29 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n /** Process a crypto op with length/offset in bits. */\n static int\n process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session,\n-\t\tstruct snow3g_qp *qp, uint16_t *accumulated_enqueued_ops)\n+\t\tstruct ipsec_mb_qp *qp, uint16_t *accumulated_enqueued_ops)\n {\n-\tunsigned enqueued_op, processed_op;\n+\tuint32_t enqueued_op, processed_op;\n \n \tswitch (session->op) {\n-\tcase SNOW3G_OP_ONLY_CIPHER:\n+\tcase IPSEC_MB_OP_ENCRYPT_ONLY:\n+\tcase IPSEC_MB_OP_DECRYPT_ONLY:\n+\n \t\tprocessed_op = process_snow3g_cipher_op_bit(qp, op,\n \t\t\t\tsession);\n \t\tbreak;\n-\tcase SNOW3G_OP_ONLY_AUTH:\n+\tcase IPSEC_MB_OP_HASH_GEN_ONLY:\n+\tcase IPSEC_MB_OP_HASH_VERIFY_ONLY:\n \t\tprocessed_op = process_snow3g_hash_op(qp, &op, session, 1);\n \t\tbreak;\n-\tcase SNOW3G_OP_CIPHER_AUTH:\n+\tcase IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN:\n+\tcase IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY:\n \t\tprocessed_op = process_snow3g_cipher_op_bit(qp, op, session);\n \t\tif (processed_op == 1)\n \t\t\tprocess_snow3g_hash_op(qp, &op, session, 1);\n \t\tbreak;\n-\tcase SNOW3G_OP_AUTH_CIPHER:\n+\tcase IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT:\n+\tcase IPSEC_MB_OP_HASH_GEN_THEN_ENCRYPT:\n \t\tprocessed_op = process_snow3g_hash_op(qp, &op, session, 1);\n \t\tif (processed_op == 1)\n \t\t\tprocess_snow3g_cipher_op_bit(qp, op, session);\n@@ -410,43 +400,49 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session,\n \t\top->sym->session = NULL;\n \t}\n \n-\tenqueued_op = rte_ring_enqueue_burst(qp->processed_ops,\n+\tenqueued_op = rte_ring_enqueue_burst(qp->ingress_queue,\n \t\t\t(void **)&op, processed_op, NULL);\n-\tqp->qp_stats.enqueued_count += enqueued_op;\n+\tqp->stats.enqueued_count += enqueued_op;\n \t*accumulated_enqueued_ops += enqueued_op;\n \n \treturn enqueued_op;\n }\n \n static uint16_t\n-snow3g_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,\n-\t\tuint16_t nb_ops)\n+snow3g_pmd_dequeue_burst(void *queue_pair,\n+\t\tstruct rte_crypto_op **ops, uint16_t nb_ops)\n {\n+\tstruct ipsec_mb_qp *qp = queue_pair;\n \tstruct rte_crypto_op *c_ops[SNOW3G_MAX_BURST];\n \tstruct rte_crypto_op *curr_c_op;\n \n \tstruct snow3g_session *prev_sess = NULL, *curr_sess = NULL;\n-\tstruct snow3g_qp *qp = queue_pair;\n-\tunsigned i;\n+\tuint32_t i;\n \tuint8_t burst_size = 0;\n \tuint16_t enqueued_ops = 0;\n \tuint8_t processed_ops;\n+\tuint32_t nb_dequeued;\n \n-\tfor (i = 0; i < nb_ops; i++) {\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 \t\tcurr_c_op = ops[i];\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 = snow3g_get_session(qp, curr_c_op);\n+\t\tcurr_sess = ipsec_mb_get_session_private(qp, curr_c_op);\n \t\tif (unlikely(curr_sess == NULL ||\n-\t\t\t\tcurr_sess->op == SNOW3G_OP_NOT_SUPPORTED)) {\n+\t\t\t\tcurr_sess->op == IPSEC_MB_OP_NOT_SUPPORTED)) {\n \t\t\tcurr_c_op->status =\n \t\t\t\t\tRTE_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/* If length/offset is at bit-level,\n+\t\t * process this buffer alone.\n+\t\t */\n \t\tif (((curr_c_op->sym->cipher.data.length % BYTE_LEN) != 0)\n \t\t\t\t|| ((curr_c_op->sym->cipher.data.offset\n \t\t\t\t\t% BYTE_LEN) != 0)) {\n@@ -517,131 +513,43 @@ snow3g_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,\n \t\t\t\tqp, burst_size, &enqueued_ops);\n \t}\n \n-\tqp->qp_stats.enqueue_err_count += nb_ops - enqueued_ops;\n-\treturn enqueued_ops;\n-}\n-\n-static uint16_t\n-snow3g_pmd_dequeue_burst(void *queue_pair,\n-\t\tstruct rte_crypto_op **c_ops, uint16_t nb_ops)\n-{\n-\tstruct snow3g_qp *qp = queue_pair;\n \n-\tunsigned nb_dequeued;\n \n-\tnb_dequeued = rte_ring_dequeue_burst(qp->processed_ops,\n-\t\t\t(void **)c_ops, nb_ops, NULL);\n-\tqp->qp_stats.dequeued_count += nb_dequeued;\n+\tqp->stats.dequeued_count += i;\n \n-\treturn nb_dequeued;\n+\treturn i;\n }\n \n-static int cryptodev_snow3g_remove(struct rte_vdev_device *vdev);\n-\n-static int\n-cryptodev_snow3g_create(const char *name,\n-\t\t\tstruct rte_vdev_device *vdev,\n-\t\t\tstruct rte_cryptodev_pmd_init_params *init_params)\n-{\n-\tstruct rte_cryptodev *dev;\n-\tstruct snow3g_private *internals;\n-\tMB_MGR *mgr;\n-\n-\tdev = rte_cryptodev_pmd_create(name, &vdev->device, init_params);\n-\tif (dev == NULL) {\n-\t\tSNOW3G_LOG(ERR, \"failed to create cryptodev vdev\");\n-\t\tgoto init_error;\n-\t}\n-\n-\tdev->driver_id = cryptodev_driver_id;\n-\tdev->dev_ops = rte_snow3g_pmd_ops;\n+struct rte_cryptodev_ops snow3g_pmd_ops = {\n+\t.dev_configure = ipsec_mb_pmd_config,\n+\t.dev_start = ipsec_mb_pmd_start,\n+\t.dev_stop = ipsec_mb_pmd_stop,\n+\t.dev_close = ipsec_mb_pmd_close,\n \n-\t/* Register RX/TX burst functions for data path. */\n-\tdev->dequeue_burst = snow3g_pmd_dequeue_burst;\n-\tdev->enqueue_burst = snow3g_pmd_enqueue_burst;\n+\t.stats_get = ipsec_mb_pmd_stats_get,\n+\t.stats_reset = ipsec_mb_pmd_stats_reset,\n \n-\tdev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n-\t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n-\t\t\tRTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA |\n-\t\t\tRTE_CRYPTODEV_FF_SYM_SESSIONLESS |\n-\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n+\t.dev_infos_get = ipsec_mb_pmd_info_get,\n \n-\tmgr = alloc_mb_mgr(0);\n-\tif (mgr == NULL)\n-\t\treturn -ENOMEM;\n-\n-\tif (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) {\n-\t\tdev->feature_flags |= RTE_CRYPTODEV_FF_CPU_AVX2;\n-\t\tinit_mb_mgr_avx2(mgr);\n-\t} else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX)) {\n-\t\tdev->feature_flags |= RTE_CRYPTODEV_FF_CPU_AVX;\n-\t\tinit_mb_mgr_avx(mgr);\n-\t} else {\n-\t\tdev->feature_flags |= RTE_CRYPTODEV_FF_CPU_SSE;\n-\t\tinit_mb_mgr_sse(mgr);\n-\t}\n+\t.queue_pair_setup = ipsec_mb_pmd_qp_setup,\n+\t.queue_pair_release = ipsec_mb_pmd_qp_release,\n \n-\tinternals = dev->data->dev_private;\n-\tinternals->mgr = mgr;\n-\n-\tinternals->max_nb_queue_pairs = init_params->max_nb_queue_pairs;\n-\n-\treturn 0;\n-init_error:\n-\tSNOW3G_LOG(ERR, \"driver %s: cryptodev_snow3g_create failed\",\n-\t\t\tinit_params->name);\n+\t.sym_session_get_size = ipsec_mb_pmd_sym_session_get_size,\n+\t.sym_session_configure = ipsec_mb_pmd_sym_session_configure,\n+\t.sym_session_clear = ipsec_mb_pmd_sym_session_clear\n+};\n \n-\tcryptodev_snow3g_remove(vdev);\n-\treturn -EFAULT;\n-}\n+struct rte_cryptodev_ops *rte_snow3g_pmd_ops = &snow3g_pmd_ops;\n \n static int\n cryptodev_snow3g_probe(struct rte_vdev_device *vdev)\n {\n-\tstruct rte_cryptodev_pmd_init_params init_params = {\n-\t\t\"\",\n-\t\tsizeof(struct snow3g_private),\n-\t\trte_socket_id(),\n-\t\tRTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS\n-\t};\n-\tconst char *name;\n-\tconst char *input_args;\n-\n-\tname = rte_vdev_device_name(vdev);\n-\tif (name == NULL)\n-\t\treturn -EINVAL;\n-\tinput_args = rte_vdev_device_args(vdev);\n-\n-\trte_cryptodev_pmd_parse_input_args(&init_params, input_args);\n-\n-\treturn cryptodev_snow3g_create(name, vdev, &init_params);\n-}\n-\n-static int\n-cryptodev_snow3g_remove(struct rte_vdev_device *vdev)\n-{\n-\tstruct rte_cryptodev *cryptodev;\n-\tconst char *name;\n-\tstruct snow3g_private *internals;\n-\n-\tname = rte_vdev_device_name(vdev);\n-\tif (name == NULL)\n-\t\treturn -EINVAL;\n-\n-\tcryptodev = rte_cryptodev_pmd_get_named_dev(name);\n-\tif (cryptodev == NULL)\n-\t\treturn -ENODEV;\n-\n-\tinternals = cryptodev->data->dev_private;\n-\n-\tfree_mb_mgr(internals->mgr);\n-\n-\treturn rte_cryptodev_pmd_destroy(cryptodev);\n+\treturn cryptodev_ipsec_mb_create(vdev, IPSEC_MB_PMD_TYPE_SNOW3G);\n }\n \n static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {\n \t.probe = cryptodev_snow3g_probe,\n-\t.remove = cryptodev_snow3g_remove\n+\t.remove = cryptodev_ipsec_mb_remove\n };\n \n static struct cryptodev_driver snow3g_crypto_drv;\n@@ -649,8 +557,27 @@ static struct cryptodev_driver snow3g_crypto_drv;\n RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd_drv);\n RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_SNOW3G_PMD, cryptodev_snow3g_pmd);\n RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,\n-\t\"max_nb_queue_pairs=<int> \"\n-\t\"socket_id=<int>\");\n+\t\t\t       \"max_nb_queue_pairs=<int> socket_id=<int>\");\n RTE_PMD_REGISTER_CRYPTO_DRIVER(snow3g_crypto_drv,\n-\t\tcryptodev_snow3g_pmd_drv.driver, cryptodev_driver_id);\n-RTE_LOG_REGISTER_DEFAULT(snow3g_logtype_driver, INFO);\n+\t\t\t\tcryptodev_snow3g_pmd_drv.driver,\n+\t\t\t\tpmd_driver_id_snow3g);\n+\n+/* Constructor function to register snow3g PMD */\n+RTE_INIT(ipsec_mb_register_snow3g)\n+{\n+\tstruct ipsec_mb_pmd_data *snow3g_data\n+\t\t= &ipsec_mb_pmds[IPSEC_MB_PMD_TYPE_SNOW3G];\n+\n+\tsnow3g_data->caps = snow3g_capabilities;\n+\tsnow3g_data->dequeue_burst = snow3g_pmd_dequeue_burst;\n+\tsnow3g_data->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n+\t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n+\t\t\tRTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA |\n+\t\t\tRTE_CRYPTODEV_FF_SYM_SESSIONLESS |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n+\tsnow3g_data->internals_priv_size = 0;\n+\tsnow3g_data->ops = &snow3g_pmd_ops;\n+\tsnow3g_data->qp_priv_size = sizeof(struct snow3g_qp_data);\n+\tsnow3g_data->session_configure = snow3g_session_configure;\n+\tsnow3g_data->session_priv_size = sizeof(struct snow3g_session);\n+}\ndiff --git a/drivers/crypto/ipsec_mb/rte_ipsec_mb_pmd_private.h b/drivers/crypto/ipsec_mb/rte_ipsec_mb_pmd_private.h\nindex 10fa289017..8ee8b73e55 100644\n--- a/drivers/crypto/ipsec_mb/rte_ipsec_mb_pmd_private.h\n+++ b/drivers/crypto/ipsec_mb/rte_ipsec_mb_pmd_private.h\n@@ -43,6 +43,9 @@ extern RTE_DEFINE_PER_LCORE(IMB_MGR *, mb_mgr);\n #define CRYPTODEV_NAME_KASUMI_PMD crypto_kasumi\n /**< IPSEC Multi buffer PMD kasumi device name */\n \n+#define CRYPTODEV_NAME_SNOW3G_PMD crypto_snow3g\n+/**< IPSEC Multi buffer PMD snow3g device name */\n+\n /** PMD LOGTYPE DRIVER, common to all PMDs */\n extern int ipsec_mb_logtype_driver;\n #define IPSEC_MB_LOG(level, fmt, ...)                                         \\\n@@ -54,6 +57,7 @@ enum ipsec_mb_pmd_types {\n \tIPSEC_MB_PMD_TYPE_AESNI_MB = 0,\n \tIPSEC_MB_PMD_TYPE_AESNI_GCM,\n \tIPSEC_MB_PMD_TYPE_KASUMI,\n+\tIPSEC_MB_PMD_TYPE_SNOW3G,\n \tIPSEC_MB_N_PMD_TYPES\n };\n \n@@ -75,6 +79,7 @@ enum ipsec_mb_operation {\n extern uint8_t pmd_driver_id_aesni_mb;\n extern uint8_t pmd_driver_id_aesni_gcm;\n extern uint8_t pmd_driver_id_kasumi;\n+extern uint8_t pmd_driver_id_snow3g;\n \n /** Helper function. Gets driver ID based on PMD type */\n static __rte_always_inline uint8_t\n@@ -87,6 +92,8 @@ ipsec_mb_get_driver_id(enum ipsec_mb_pmd_types pmd_type)\n \t\treturn pmd_driver_id_aesni_gcm;\n \tcase IPSEC_MB_PMD_TYPE_KASUMI:\n \t\treturn pmd_driver_id_kasumi;\n+\tcase IPSEC_MB_PMD_TYPE_SNOW3G:\n+\t\treturn pmd_driver_id_snow3g;\n \tdefault:\n \t\tbreak;\n \t}\ndiff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build\nindex 5608bf9573..72b3b776a8 100644\n--- a/drivers/crypto/meson.build\n+++ b/drivers/crypto/meson.build\n@@ -22,7 +22,6 @@ drivers = [\n         'octeontx2',\n         'openssl',\n         'scheduler',\n-        'snow3g',\n         'virtio',\n         'zuc',\n ]\ndiff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build\ndeleted file mode 100644\nindex 0c087baa2a..0000000000\n--- a/drivers/crypto/snow3g/meson.build\n+++ /dev/null\n@@ -1,24 +0,0 @@\n-# SPDX-License-Identifier: BSD-3-Clause\n-# Copyright(c) 2019-2020 Intel Corporation\n-\n-IMB_required_ver = '0.53.0'\n-lib = cc.find_library('IPSec_MB', required: false)\n-if not lib.found()\n-    build = false\n-    reason = 'missing dependency, \"libIPSec_MB\"'\n-else\n-    # version comes with quotes, so we split based on \" and take the middle\n-    imb_ver = cc.get_define('IMB_VERSION_STR',\n-        prefix : '#include<intel-ipsec-mb.h>').split('\"')[1]\n-\n-    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))\n-                reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(\n-                IMB_required_ver, imb_ver)\n-        build = false\n-    endif\n-\n-endif\n-\n-ext_deps += lib\n-sources = files('rte_snow3g_pmd.c', 'rte_snow3g_pmd_ops.c')\n-deps += ['bus_vdev', 'cryptodev']\ndiff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\ndeleted file mode 100644\nindex 3f46014b7d..0000000000\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\n+++ /dev/null\n@@ -1,323 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2016-2018 Intel Corporation\n- */\n-\n-#include <string.h>\n-\n-#include <rte_common.h>\n-#include <rte_malloc.h>\n-#include <cryptodev_pmd.h>\n-\n-#include \"snow3g_pmd_private.h\"\n-\n-static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = {\n-\t{\t/* SNOW 3G (UIA2) */\n-\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n-\t\t{.sym = {\n-\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\n-\t\t\t{.auth = {\n-\t\t\t\t.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,\n-\t\t\t\t.block_size = 16,\n-\t\t\t\t.key_size = {\n-\t\t\t\t\t.min = 16,\n-\t\t\t\t\t.max = 16,\n-\t\t\t\t\t.increment = 0\n-\t\t\t\t},\n-\t\t\t\t.digest_size = {\n-\t\t\t\t\t.min = 4,\n-\t\t\t\t\t.max = 4,\n-\t\t\t\t\t.increment = 0\n-\t\t\t\t},\n-\t\t\t\t.iv_size = {\n-\t\t\t\t\t.min = 16,\n-\t\t\t\t\t.max = 16,\n-\t\t\t\t\t.increment = 0\n-\t\t\t\t}\n-\t\t\t}, }\n-\t\t}, }\n-\t},\n-\t{\t/* SNOW 3G (UEA2) */\n-\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n-\t\t{.sym = {\n-\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,\n-\t\t\t{.cipher = {\n-\t\t\t\t.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,\n-\t\t\t\t.block_size = 16,\n-\t\t\t\t.key_size = {\n-\t\t\t\t\t.min = 16,\n-\t\t\t\t\t.max = 16,\n-\t\t\t\t\t.increment = 0\n-\t\t\t\t},\n-\t\t\t\t.iv_size = {\n-\t\t\t\t\t.min = 16,\n-\t\t\t\t\t.max = 16,\n-\t\t\t\t\t.increment = 0\n-\t\t\t\t}\n-\t\t\t}, }\n-\t\t}, }\n-\t},\n-\tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n-};\n-\n-/** Configure device */\n-static int\n-snow3g_pmd_config(__rte_unused struct rte_cryptodev *dev,\n-\t\t__rte_unused struct rte_cryptodev_config *config)\n-{\n-\treturn 0;\n-}\n-\n-/** Start device */\n-static int\n-snow3g_pmd_start(__rte_unused struct rte_cryptodev *dev)\n-{\n-\treturn 0;\n-}\n-\n-/** Stop device */\n-static void\n-snow3g_pmd_stop(__rte_unused struct rte_cryptodev *dev)\n-{\n-}\n-\n-/** Close device */\n-static int\n-snow3g_pmd_close(__rte_unused struct rte_cryptodev *dev)\n-{\n-\treturn 0;\n-}\n-\n-\n-/** Get device statistics */\n-static void\n-snow3g_pmd_stats_get(struct rte_cryptodev *dev,\n-\t\tstruct rte_cryptodev_stats *stats)\n-{\n-\tint qp_id;\n-\n-\tfor (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {\n-\t\tstruct snow3g_qp *qp = dev->data->queue_pairs[qp_id];\n-\n-\t\tstats->enqueued_count += qp->qp_stats.enqueued_count;\n-\t\tstats->dequeued_count += qp->qp_stats.dequeued_count;\n-\n-\t\tstats->enqueue_err_count += qp->qp_stats.enqueue_err_count;\n-\t\tstats->dequeue_err_count += qp->qp_stats.dequeue_err_count;\n-\t}\n-}\n-\n-/** Reset device statistics */\n-static void\n-snow3g_pmd_stats_reset(struct rte_cryptodev *dev)\n-{\n-\tint qp_id;\n-\n-\tfor (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {\n-\t\tstruct snow3g_qp *qp = dev->data->queue_pairs[qp_id];\n-\n-\t\tmemset(&qp->qp_stats, 0, sizeof(qp->qp_stats));\n-\t}\n-}\n-\n-\n-/** Get device info */\n-static void\n-snow3g_pmd_info_get(struct rte_cryptodev *dev,\n-\t\tstruct rte_cryptodev_info *dev_info)\n-{\n-\tstruct snow3g_private *internals = dev->data->dev_private;\n-\n-\tif (dev_info != NULL) {\n-\t\tdev_info->driver_id = dev->driver_id;\n-\t\tdev_info->max_nb_queue_pairs = internals->max_nb_queue_pairs;\n-\t\t/* No limit of number of sessions */\n-\t\tdev_info->sym.max_nb_sessions = 0;\n-\t\tdev_info->feature_flags = dev->feature_flags;\n-\t\tdev_info->capabilities = snow3g_pmd_capabilities;\n-\t}\n-}\n-\n-/** Release queue pair */\n-static int\n-snow3g_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)\n-{\n-\tif (dev->data->queue_pairs[qp_id] != NULL) {\n-\t\tstruct snow3g_qp *qp = dev->data->queue_pairs[qp_id];\n-\n-\t\tif (qp->processed_ops)\n-\t\t\trte_ring_free(qp->processed_ops);\n-\n-\t\trte_free(dev->data->queue_pairs[qp_id]);\n-\t\tdev->data->queue_pairs[qp_id] = NULL;\n-\t}\n-\treturn 0;\n-}\n-\n-/** set a unique name for the queue pair based on its name, dev_id and qp_id */\n-static int\n-snow3g_pmd_qp_set_unique_name(struct rte_cryptodev *dev,\n-\t\tstruct snow3g_qp *qp)\n-{\n-\tunsigned n = snprintf(qp->name, sizeof(qp->name),\n-\t\t\t\"snow3g_pmd_%u_qp_%u\",\n-\t\t\tdev->data->dev_id, qp->id);\n-\n-\tif (n >= sizeof(qp->name))\n-\t\treturn -1;\n-\n-\treturn 0;\n-}\n-\n-/** Create a ring to place processed ops on */\n-static struct rte_ring *\n-snow3g_pmd_qp_create_processed_ops_ring(struct snow3g_qp *qp,\n-\t\tunsigned ring_size, int socket_id)\n-{\n-\tstruct rte_ring *r;\n-\n-\tr = rte_ring_lookup(qp->name);\n-\tif (r) {\n-\t\tif (rte_ring_get_size(r) >= ring_size) {\n-\t\t\tSNOW3G_LOG(INFO, \"Reusing existing ring %s\"\n-\t\t\t\t\t\" for processed packets\",\n-\t\t\t\t\t qp->name);\n-\t\t\treturn r;\n-\t\t}\n-\n-\t\tSNOW3G_LOG(ERR, \"Unable to reuse existing ring %s\"\n-\t\t\t\t\" for processed packets\",\n-\t\t\t\t qp->name);\n-\t\treturn NULL;\n-\t}\n-\n-\treturn rte_ring_create(qp->name, ring_size, socket_id,\n-\t\t\tRING_F_SP_ENQ | RING_F_SC_DEQ);\n-}\n-\n-/** Setup a queue pair */\n-static int\n-snow3g_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,\n-\t\tconst struct rte_cryptodev_qp_conf *qp_conf,\n-\t\tint socket_id)\n-{\n-\tstruct snow3g_qp *qp = NULL;\n-\tstruct snow3g_private *internals = dev->data->dev_private;\n-\n-\t/* Free memory prior to re-allocation if needed. */\n-\tif (dev->data->queue_pairs[qp_id] != NULL)\n-\t\tsnow3g_pmd_qp_release(dev, qp_id);\n-\n-\t/* Allocate the queue pair data structure. */\n-\tqp = rte_zmalloc_socket(\"SNOW 3G PMD Queue Pair\", sizeof(*qp),\n-\t\t\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n-\tif (qp == NULL)\n-\t\treturn (-ENOMEM);\n-\n-\tqp->id = qp_id;\n-\tdev->data->queue_pairs[qp_id] = qp;\n-\n-\tif (snow3g_pmd_qp_set_unique_name(dev, qp))\n-\t\tgoto qp_setup_cleanup;\n-\n-\tqp->processed_ops = snow3g_pmd_qp_create_processed_ops_ring(qp,\n-\t\t\tqp_conf->nb_descriptors, socket_id);\n-\tif (qp->processed_ops == NULL)\n-\t\tgoto qp_setup_cleanup;\n-\n-\tqp->mgr = internals->mgr;\n-\tqp->sess_mp = qp_conf->mp_session;\n-\tqp->sess_mp_priv = qp_conf->mp_session_private;\n-\n-\tmemset(&qp->qp_stats, 0, sizeof(qp->qp_stats));\n-\n-\treturn 0;\n-\n-qp_setup_cleanup:\n-\tif (qp)\n-\t\trte_free(qp);\n-\n-\treturn -1;\n-}\n-\n-/** Returns the size of the SNOW 3G session structure */\n-static unsigned\n-snow3g_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)\n-{\n-\treturn sizeof(struct snow3g_session);\n-}\n-\n-/** Configure a SNOW 3G session from a crypto xform chain */\n-static int\n-snow3g_pmd_sym_session_configure(struct rte_cryptodev *dev,\n-\t\tstruct rte_crypto_sym_xform *xform,\n-\t\tstruct rte_cryptodev_sym_session *sess,\n-\t\tstruct rte_mempool *mempool)\n-{\n-\tvoid *sess_private_data;\n-\tint ret;\n-\tstruct snow3g_private *internals = dev->data->dev_private;\n-\n-\tif (unlikely(sess == NULL)) {\n-\t\tSNOW3G_LOG(ERR, \"invalid session struct\");\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tif (rte_mempool_get(mempool, &sess_private_data)) {\n-\t\tSNOW3G_LOG(ERR,\n-\t\t\t\"Couldn't get object from session mempool\");\n-\t\treturn -ENOMEM;\n-\t}\n-\n-\tret = snow3g_set_session_parameters(internals->mgr,\n-\t\t\t\t\tsess_private_data, xform);\n-\tif (ret != 0) {\n-\t\tSNOW3G_LOG(ERR, \"failed configure session parameters\");\n-\n-\t\t/* Return session to mempool */\n-\t\trte_mempool_put(mempool, sess_private_data);\n-\t\treturn ret;\n-\t}\n-\n-\tset_sym_session_private_data(sess, dev->driver_id,\n-\t\tsess_private_data);\n-\n-\treturn 0;\n-}\n-\n-/** Clear the memory of session so it doesn't leave key material behind */\n-static void\n-snow3g_pmd_sym_session_clear(struct rte_cryptodev *dev,\n-\t\tstruct rte_cryptodev_sym_session *sess)\n-{\n-\tuint8_t index = dev->driver_id;\n-\tvoid *sess_priv = get_sym_session_private_data(sess, index);\n-\n-\t/* Zero out the whole structure */\n-\tif (sess_priv) {\n-\t\tmemset(sess_priv, 0, sizeof(struct snow3g_session));\n-\t\tstruct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);\n-\t\tset_sym_session_private_data(sess, index, NULL);\n-\t\trte_mempool_put(sess_mp, sess_priv);\n-\t}\n-}\n-\n-struct rte_cryptodev_ops snow3g_pmd_ops = {\n-\t\t.dev_configure      = snow3g_pmd_config,\n-\t\t.dev_start          = snow3g_pmd_start,\n-\t\t.dev_stop           = snow3g_pmd_stop,\n-\t\t.dev_close          = snow3g_pmd_close,\n-\n-\t\t.stats_get          = snow3g_pmd_stats_get,\n-\t\t.stats_reset        = snow3g_pmd_stats_reset,\n-\n-\t\t.dev_infos_get      = snow3g_pmd_info_get,\n-\n-\t\t.queue_pair_setup   = snow3g_pmd_qp_setup,\n-\t\t.queue_pair_release = snow3g_pmd_qp_release,\n-\n-\t\t.sym_session_get_size   = snow3g_pmd_sym_session_get_size,\n-\t\t.sym_session_configure  = snow3g_pmd_sym_session_configure,\n-\t\t.sym_session_clear      = snow3g_pmd_sym_session_clear\n-};\n-\n-struct rte_cryptodev_ops *rte_snow3g_pmd_ops = &snow3g_pmd_ops;\ndiff --git a/drivers/crypto/snow3g/snow3g_pmd_private.h b/drivers/crypto/snow3g/snow3g_pmd_private.h\ndeleted file mode 100644\nindex 23cf078a9c..0000000000\n--- a/drivers/crypto/snow3g/snow3g_pmd_private.h\n+++ /dev/null\n@@ -1,84 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2016-2019 Intel Corporation\n- */\n-\n-#ifndef _SNOW3G_PMD_PRIVATE_H_\n-#define _SNOW3G_PMD_PRIVATE_H_\n-\n-#include <intel-ipsec-mb.h>\n-\n-#define CRYPTODEV_NAME_SNOW3G_PMD\tcrypto_snow3g\n-/**< SNOW 3G PMD device name */\n-\n-/** SNOW 3G PMD LOGTYPE DRIVER */\n-extern int snow3g_logtype_driver;\n-\n-#define SNOW3G_LOG(level, fmt, ...)  \\\n-\trte_log(RTE_LOG_ ## level, snow3g_logtype_driver,  \\\n-\t\t\t\"%s() line %u: \" fmt \"\\n\", __func__, __LINE__,  \\\n-\t\t\t\t\t## __VA_ARGS__)\n-\n-#define SNOW3G_DIGEST_LENGTH 4\n-#define SNOW3G_MAX_KEY_SIZE  128\n-\n-/** private data structure for each virtual SNOW 3G device */\n-struct snow3g_private {\n-\tunsigned max_nb_queue_pairs;\n-\t/**< Max number of queue pairs supported by device */\n-\tMB_MGR *mgr;\n-\t/**< Multi-buffer instance */\n-};\n-\n-/** SNOW 3G buffer queue pair */\n-struct snow3g_qp {\n-\tuint16_t id;\n-\t/**< Queue Pair Identifier */\n-\tchar name[RTE_CRYPTODEV_NAME_MAX_LEN];\n-\t/**< Unique Queue Pair Name */\n-\tstruct rte_ring *processed_ops;\n-\t/**< Ring for placing processed ops */\n-\tstruct rte_mempool *sess_mp;\n-\t/**< Session Mempool */\n-\tstruct rte_mempool *sess_mp_priv;\n-\t/**< Session Private Data Mempool */\n-\tstruct rte_cryptodev_stats qp_stats;\n-\t/**< Queue pair statistics */\n-\tuint8_t temp_digest[SNOW3G_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-\tMB_MGR *mgr;\n-\t/**< Multi-buffer instance */\n-} __rte_cache_aligned;\n-\n-enum snow3g_operation {\n-\tSNOW3G_OP_ONLY_CIPHER,\n-\tSNOW3G_OP_ONLY_AUTH,\n-\tSNOW3G_OP_CIPHER_AUTH,\n-\tSNOW3G_OP_AUTH_CIPHER,\n-\tSNOW3G_OP_NOT_SUPPORTED\n-};\n-\n-/** SNOW 3G private session structure */\n-struct snow3g_session {\n-\tenum snow3g_operation op;\n-\tenum rte_crypto_auth_operation auth_op;\n-\tsnow3g_key_schedule_t pKeySched_cipher;\n-\tsnow3g_key_schedule_t pKeySched_hash;\n-\tuint16_t cipher_iv_offset;\n-\tuint16_t auth_iv_offset;\n-} __rte_cache_aligned;\n-\n-\n-extern int\n-snow3g_set_session_parameters(MB_MGR *mgr, struct snow3g_session *sess,\n-\t\tconst struct rte_crypto_sym_xform *xform);\n-\n-\n-/** device specific operations function pointer structure */\n-extern struct rte_cryptodev_ops *rte_snow3g_pmd_ops;\n-\n-\n-\n-#endif /* _SNOW3G_PMD_PRIVATE_H_ */\ndiff --git a/drivers/crypto/snow3g/version.map b/drivers/crypto/snow3g/version.map\ndeleted file mode 100644\nindex c2e0723b4c..0000000000\n--- a/drivers/crypto/snow3g/version.map\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-DPDK_22 {\n-\tlocal: *;\n-};\n",
    "prefixes": [
        "v3",
        "06/10"
    ]
}