Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117297/?format=api
{ "id": 117297, "url": "http://patches.dpdk.org/api/patches/117297/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20221004095132.198777-4-david.marchand@redhat.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": "<20221004095132.198777-4-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221004095132.198777-4-david.marchand@redhat.com", "date": "2022-10-04T09:51:31", "name": "[v2,3/4] crypto/ccp: fix IOVA handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0c86c3335020e6fa78397543279343e338005a17", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.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/20221004095132.198777-4-david.marchand@redhat.com/mbox/", "series": [ { "id": 24961, "url": "http://patches.dpdk.org/api/series/24961/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24961", "date": "2022-10-04T09:51:28", "name": "crypto/ccp cleanup", "version": 2, "mbox": "http://patches.dpdk.org/series/24961/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/117297/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/117297/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 8CD7AA0543;\n\tTue, 4 Oct 2022 11:52:04 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B7058427F5;\n\tTue, 4 Oct 2022 11:51:59 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 1896142836\n for <dev@dpdk.org>; Tue, 4 Oct 2022 11:51:58 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-170-OqOWaDfTNm6tti1UL4fDiA-1; Tue, 04 Oct 2022 05:51:53 -0400", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33C50101A528;\n Tue, 4 Oct 2022 09:51:53 +0000 (UTC)", "from localhost.localdomain (unknown [10.40.195.42])\n by smtp.corp.redhat.com (Postfix) with ESMTP id E7F5E4099B53;\n Tue, 4 Oct 2022 09:51:51 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1664877117;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=1wniGjHYe9uOz2RLoGQT0xVbk2qDPBd0/1X2K8ThGMk=;\n b=O6B7rYChpetr/utDEEoxVFoNv16t27wTUjDBnVy5IrAtQwl/4HHi5E6Wtb7uub0qHxQfcR\n R0Pyf06aGePjHCilxNHe3kZzNtrDUS+0MEYA3JT2u7Wm2Mi0tZlWrs+sRm7b+JFs91NEpM\n /GQ2gNAlgmcYAJmJGkD5NbcuALPXmqQ=", "X-MC-Unique": "OqOWaDfTNm6tti1UL4fDiA-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "gakhil@marvell.com, sunilprakashrao.uttarwar@amd.com, stable@dpdk.org,\n Amaranath Somalapuram <asomalap@amd.com>", "Subject": "[PATCH v2 3/4] crypto/ccp: fix IOVA handling", "Date": "Tue, 4 Oct 2022 11:51:31 +0200", "Message-Id": "<20221004095132.198777-4-david.marchand@redhat.com>", "In-Reply-To": "<20221004095132.198777-1-david.marchand@redhat.com>", "References": "<20220909150411.3702860-1-david.marchand@redhat.com>\n <20221004095132.198777-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.1", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Using IOVA or physical addresses is something that the user (via\n--iova-mode=) or the bus code decides.\n\nThe crypto/ccp PCI driver should only use rte_mem_virt2iova.\nIt should not try to decide what to use solely based on the kmod\nthe PCI device is bound to.\n\nWhile at it, the global variable sha_ctx looks unsafe and unneeded.\nRemove it.\n\nFixes: 09a0fd736a08 (\"crypto/ccp: enable IOMMU\")\nCc: stable@dpdk.org\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/crypto/ccp/ccp_crypto.c | 105 ++++++-------------------------\n drivers/crypto/ccp/ccp_dev.c | 9 +--\n drivers/crypto/ccp/ccp_pci.c | 34 ----------\n drivers/crypto/ccp/ccp_pci.h | 3 -\n drivers/crypto/ccp/rte_ccp_pmd.c | 3 -\n 5 files changed, 19 insertions(+), 135 deletions(-)", "diff": "diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c\nindex 4bab18323b..351d8ac63e 100644\n--- a/drivers/crypto/ccp/ccp_crypto.c\n+++ b/drivers/crypto/ccp/ccp_crypto.c\n@@ -33,8 +33,6 @@\n #include <openssl/err.h>\n #include <openssl/hmac.h>\n \n-extern int iommu_mode;\n-void *sha_ctx;\n /* SHA initial context values */\n uint32_t ccp_sha1_init[SHA_COMMON_DIGEST_SIZE / sizeof(uint32_t)] = {\n \tSHA1_H4, SHA1_H3,\n@@ -748,13 +746,8 @@ ccp_configure_session_cipher(struct ccp_session *sess,\n \t\tCCP_LOG_ERR(\"Invalid CCP Engine\");\n \t\treturn -ENOTSUP;\n \t}\n-\tif (iommu_mode == 2) {\n-\t\tsess->cipher.nonce_phys = rte_mem_virt2iova(sess->cipher.nonce);\n-\t\tsess->cipher.key_phys = rte_mem_virt2iova(sess->cipher.key_ccp);\n-\t} else {\n-\t\tsess->cipher.nonce_phys = rte_mem_virt2phy(sess->cipher.nonce);\n-\t\tsess->cipher.key_phys = rte_mem_virt2phy(sess->cipher.key_ccp);\n-\t}\n+\tsess->cipher.nonce_phys = rte_mem_virt2iova(sess->cipher.nonce);\n+\tsess->cipher.key_phys = rte_mem_virt2iova(sess->cipher.key_ccp);\n \treturn 0;\n }\n \n@@ -793,7 +786,6 @@ ccp_configure_session_auth(struct ccp_session *sess,\n \t\tsess->auth.ctx = (void *)ccp_sha1_init;\n \t\tsess->auth.ctx_len = CCP_SB_BYTES;\n \t\tsess->auth.offset = CCP_SB_BYTES - SHA1_DIGEST_SIZE;\n-\t\trte_memcpy(sha_ctx, sess->auth.ctx, SHA_COMMON_DIGEST_SIZE);\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n \t\tif (sess->auth_opt) {\n@@ -832,7 +824,6 @@ ccp_configure_session_auth(struct ccp_session *sess,\n \t\tsess->auth.ctx = (void *)ccp_sha224_init;\n \t\tsess->auth.ctx_len = CCP_SB_BYTES;\n \t\tsess->auth.offset = CCP_SB_BYTES - SHA224_DIGEST_SIZE;\n-\t\trte_memcpy(sha_ctx, sess->auth.ctx, SHA256_DIGEST_SIZE);\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n \t\tif (sess->auth_opt) {\n@@ -895,7 +886,6 @@ ccp_configure_session_auth(struct ccp_session *sess,\n \t\tsess->auth.ctx = (void *)ccp_sha256_init;\n \t\tsess->auth.ctx_len = CCP_SB_BYTES;\n \t\tsess->auth.offset = CCP_SB_BYTES - SHA256_DIGEST_SIZE;\n-\t\trte_memcpy(sha_ctx, sess->auth.ctx, SHA256_DIGEST_SIZE);\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n \t\tif (sess->auth_opt) {\n@@ -958,7 +948,6 @@ ccp_configure_session_auth(struct ccp_session *sess,\n \t\tsess->auth.ctx = (void *)ccp_sha384_init;\n \t\tsess->auth.ctx_len = CCP_SB_BYTES << 1;\n \t\tsess->auth.offset = (CCP_SB_BYTES << 1) - SHA384_DIGEST_SIZE;\n-\t\trte_memcpy(sha_ctx, sess->auth.ctx, SHA512_DIGEST_SIZE);\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n \t\tif (sess->auth_opt) {\n@@ -1023,7 +1012,6 @@ ccp_configure_session_auth(struct ccp_session *sess,\n \t\tsess->auth.ctx = (void *)ccp_sha512_init;\n \t\tsess->auth.ctx_len = CCP_SB_BYTES << 1;\n \t\tsess->auth.offset = (CCP_SB_BYTES << 1) - SHA512_DIGEST_SIZE;\n-\t\trte_memcpy(sha_ctx, sess->auth.ctx, SHA512_DIGEST_SIZE);\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n \t\tif (sess->auth_opt) {\n@@ -1173,13 +1161,8 @@ ccp_configure_session_aead(struct ccp_session *sess,\n \t\tCCP_LOG_ERR(\"Unsupported aead algo\");\n \t\treturn -ENOTSUP;\n \t}\n-\tif (iommu_mode == 2) {\n-\t\tsess->cipher.nonce_phys = rte_mem_virt2iova(sess->cipher.nonce);\n-\t\tsess->cipher.key_phys = rte_mem_virt2iova(sess->cipher.key_ccp);\n-\t} else {\n-\t\tsess->cipher.nonce_phys = rte_mem_virt2phy(sess->cipher.nonce);\n-\t\tsess->cipher.key_phys = rte_mem_virt2phy(sess->cipher.key_ccp);\n-\t}\n+\tsess->cipher.nonce_phys = rte_mem_virt2iova(sess->cipher.nonce);\n+\tsess->cipher.key_phys = rte_mem_virt2iova(sess->cipher.key_ccp);\n \treturn 0;\n }\n \n@@ -1594,14 +1577,8 @@ ccp_perform_hmac(struct rte_crypto_op *op,\n \t\t\t\t\t op->sym->auth.data.offset);\n \tappend_ptr = (void *)rte_pktmbuf_append(op->sym->m_src,\n \t\t\t\t\t\tsession->auth.ctx_len);\n-\tif (iommu_mode == 2) {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2iova(append_ptr);\n-\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)addr);\n-\t} else {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2phy(append_ptr);\n-\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy((void *)addr);\n-\t}\n-\tdest_addr_t = dest_addr;\n+\tdest_addr_t = dest_addr = (phys_addr_t)rte_mem_virt2iova(append_ptr);\n+\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)addr);\n \n \t/** Load PHash1 to LSB*/\n \tpst.dest_addr = (phys_addr_t)(cmd_q->sb_sha * CCP_SB_BYTES);\n@@ -1683,10 +1660,7 @@ ccp_perform_hmac(struct rte_crypto_op *op,\n \n \t/** Load PHash2 to LSB*/\n \taddr += session->auth.ctx_len;\n-\tif (iommu_mode == 2)\n-\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)addr);\n-\telse\n-\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy((void *)addr);\n+\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)addr);\n \tpst.dest_addr = (phys_addr_t)(cmd_q->sb_sha * CCP_SB_BYTES);\n \tpst.len = session->auth.ctx_len;\n \tpst.dir = 1;\n@@ -1774,14 +1748,8 @@ ccp_perform_sha(struct rte_crypto_op *op,\n \t\t\t\t\t op->sym->auth.data.offset);\n \tappend_ptr = (void *)rte_pktmbuf_append(op->sym->m_src,\n \t\t\t\t\t\tsession->auth.ctx_len);\n-\tif (iommu_mode == 2) {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2iova(append_ptr);\n-\t\tpst.src_addr = (phys_addr_t)sha_ctx;\n-\t} else {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2phy(append_ptr);\n-\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy((void *)\n-\t\t\t\t\t\t session->auth.ctx);\n-\t}\n+\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)session->auth.ctx);\n+\tdest_addr = (phys_addr_t)rte_mem_virt2iova(append_ptr);\n \n \t/** Passthru sha context*/\n \n@@ -1871,15 +1839,8 @@ ccp_perform_sha3_hmac(struct rte_crypto_op *op,\n \t\tCCP_LOG_ERR(\"CCP MBUF append failed\\n\");\n \t\treturn -1;\n \t}\n-\tif (iommu_mode == 2) {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);\n-\t\tctx_paddr = (phys_addr_t)rte_mem_virt2iova(\n-\t\t\t\t\tsession->auth.pre_compute);\n-\t} else {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2phy((void *)append_ptr);\n-\t\tctx_paddr = (phys_addr_t)rte_mem_virt2phy(\n-\t\t\t\t\tsession->auth.pre_compute);\n-\t}\n+\tdest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);\n+\tctx_paddr = (phys_addr_t)rte_mem_virt2iova(session->auth.pre_compute);\n \tdest_addr_t = dest_addr + (session->auth.ctx_len / 2);\n \tdesc = &cmd_q->qbase_desc[cmd_q->qidx];\n \tmemset(desc, 0, Q_DESC_SIZE);\n@@ -2017,13 +1978,8 @@ ccp_perform_sha3(struct rte_crypto_op *op,\n \t\tCCP_LOG_ERR(\"CCP MBUF append failed\\n\");\n \t\treturn -1;\n \t}\n-\tif (iommu_mode == 2) {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);\n-\t\tctx_paddr = (phys_addr_t)rte_mem_virt2iova((void *)ctx_addr);\n-\t} else {\n-\t\tdest_addr = (phys_addr_t)rte_mem_virt2phy((void *)append_ptr);\n-\t\tctx_paddr = (phys_addr_t)rte_mem_virt2phy((void *)ctx_addr);\n-\t}\n+\tdest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr);\n+\tctx_paddr = (phys_addr_t)rte_mem_virt2iova((void *)ctx_addr);\n \n \tctx_addr = session->auth.sha3_ctx;\n \n@@ -2099,13 +2055,7 @@ ccp_perform_aes_cmac(struct rte_crypto_op *op,\n \n \t\tctx_addr = session->auth.pre_compute;\n \t\tmemset(ctx_addr, 0, AES_BLOCK_SIZE);\n-\t\tif (iommu_mode == 2)\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova(\n-\t\t\t\t\t\t\t(void *)ctx_addr);\n-\t\telse\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy(\n-\t\t\t\t\t\t\t(void *)ctx_addr);\n-\n+\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)ctx_addr);\n \t\tpst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES);\n \t\tpst.len = CCP_SB_BYTES;\n \t\tpst.dir = 1;\n@@ -2143,12 +2093,7 @@ ccp_perform_aes_cmac(struct rte_crypto_op *op,\n \t} else {\n \t\tctx_addr = session->auth.pre_compute + CCP_SB_BYTES;\n \t\tmemset(ctx_addr, 0, AES_BLOCK_SIZE);\n-\t\tif (iommu_mode == 2)\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova(\n-\t\t\t\t\t\t\t(void *)ctx_addr);\n-\t\telse\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy(\n-\t\t\t\t\t\t\t(void *)ctx_addr);\n+\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *)ctx_addr);\n \t\tpst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES);\n \t\tpst.len = CCP_SB_BYTES;\n \t\tpst.dir = 1;\n@@ -2342,12 +2287,7 @@ ccp_perform_3des(struct rte_crypto_op *op,\n \n \t\trte_memcpy(lsb_buf + (CCP_SB_BYTES - session->iv.length),\n \t\t\t iv, session->iv.length);\n-\t\tif (iommu_mode == 2)\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova(\n-\t\t\t\t\t\t\t(void *) lsb_buf);\n-\t\telse\n-\t\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2phy(\n-\t\t\t\t\t\t\t(void *) lsb_buf);\n+\t\tpst.src_addr = (phys_addr_t)rte_mem_virt2iova((void *) lsb_buf);\n \t\tpst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES);\n \t\tpst.len = CCP_SB_BYTES;\n \t\tpst.dir = 1;\n@@ -2370,11 +2310,7 @@ ccp_perform_3des(struct rte_crypto_op *op,\n \telse\n \t\tdest_addr = src_addr;\n \n-\tif (iommu_mode == 2)\n-\t\tkey_addr = rte_mem_virt2iova(session->cipher.key_ccp);\n-\telse\n-\t\tkey_addr = rte_mem_virt2phy(session->cipher.key_ccp);\n-\n+\tkey_addr = rte_mem_virt2iova(session->cipher.key_ccp);\n \tdesc = &cmd_q->qbase_desc[cmd_q->qidx];\n \n \tmemset(desc, 0, Q_DESC_SIZE);\n@@ -2768,12 +2704,7 @@ process_ops_to_enqueue(struct ccp_qp *qp,\n \tb_info->lsb_buf_idx = 0;\n \tb_info->desccnt = 0;\n \tb_info->cmd_q = cmd_q;\n-\tif (iommu_mode == 2)\n-\t\tb_info->lsb_buf_phys =\n-\t\t\t(phys_addr_t)rte_mem_virt2iova((void *)b_info->lsb_buf);\n-\telse\n-\t\tb_info->lsb_buf_phys =\n-\t\t\t(phys_addr_t)rte_mem_virt2phy((void *)b_info->lsb_buf);\n+\tb_info->lsb_buf_phys = (phys_addr_t)rte_mem_virt2iova((void *)b_info->lsb_buf);\n \n \trte_atomic64_sub(&b_info->cmd_q->free_slots, slots_req);\n \ndiff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c\nindex 410e62121e..14c54929c4 100644\n--- a/drivers/crypto/ccp/ccp_dev.c\n+++ b/drivers/crypto/ccp/ccp_dev.c\n@@ -23,7 +23,6 @@\n #include \"ccp_pci.h\"\n #include \"ccp_pmd_private.h\"\n \n-int iommu_mode;\n struct ccp_list ccp_list = TAILQ_HEAD_INITIALIZER(ccp_list);\n static int ccp_dev_id;\n \n@@ -652,7 +651,7 @@ is_ccp_device(const char *dirname,\n static int\n ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev)\n {\n-\tstruct ccp_device *ccp_dev = NULL;\n+\tstruct ccp_device *ccp_dev;\n \n \tccp_dev = rte_zmalloc(\"ccp_device\", sizeof(*ccp_dev),\n \t\t\t RTE_CACHE_LINE_SIZE);\n@@ -683,16 +682,10 @@ ccp_probe_devices(struct rte_pci_device *pci_dev,\n \tstruct dirent *d;\n \tDIR *dir;\n \tint ret = 0;\n-\tint module_idx = 0;\n \tuint16_t domain;\n \tuint8_t bus, devid, function;\n \tchar dirname[PATH_MAX];\n \n-\tmodule_idx = ccp_check_pci_uio_module();\n-\tif (module_idx < 0)\n-\t\treturn -1;\n-\n-\tiommu_mode = module_idx;\n \tTAILQ_INIT(&ccp_list);\n \tdir = opendir(SYSFS_PCI_DEVICES);\n \tif (dir == NULL)\ndiff --git a/drivers/crypto/ccp/ccp_pci.c b/drivers/crypto/ccp/ccp_pci.c\nindex c941e222c7..bd1a037f76 100644\n--- a/drivers/crypto/ccp/ccp_pci.c\n+++ b/drivers/crypto/ccp/ccp_pci.c\n@@ -11,40 +11,6 @@\n #include <rte_string_fns.h>\n \n #include \"ccp_pci.h\"\n-#include \"ccp_pmd_private.h\"\n-\n-static const char * const uio_module_names[] = {\n-\t\"igb_uio\",\n-\t\"uio_pci_generic\",\n-\t\"vfio_pci\"\n-};\n-\n-int\n-ccp_check_pci_uio_module(void)\n-{\n-\tFILE *fp;\n-\tint i;\n-\tchar buf[BUFSIZ];\n-\n-\tfp = fopen(PROC_MODULES, \"r\");\n-\tif (fp == NULL)\n-\t\treturn -1;\n-\ti = 0;\n-\twhile (uio_module_names[i] != NULL) {\n-\t\twhile (fgets(buf, sizeof(buf), fp) != NULL) {\n-\t\t\tif (!strncmp(buf, uio_module_names[i],\n-\t\t\t\t strlen(uio_module_names[i]))) {\n-\t\t\t\tfclose(fp);\n-\t\t\t\treturn i;\n-\t\t\t}\n-\t\t}\n-\t\ti++;\n-\t\trewind(fp);\n-\t}\n-\tfclose(fp);\n-\tCCP_LOG_DBG(\"Insert igb_uio or uio_pci_generic kernel module(s)\");\n-\treturn -1;/* uio not inserted */\n-}\n \n /*\n * split up a pci address into its constituent parts.\ndiff --git a/drivers/crypto/ccp/ccp_pci.h b/drivers/crypto/ccp/ccp_pci.h\nindex 6736bf8ad3..d9a8b9dcc6 100644\n--- a/drivers/crypto/ccp/ccp_pci.h\n+++ b/drivers/crypto/ccp/ccp_pci.h\n@@ -10,9 +10,6 @@\n #include <bus_pci_driver.h>\n \n #define SYSFS_PCI_DEVICES \"/sys/bus/pci/devices\"\n-#define PROC_MODULES \"/proc/modules\"\n-\n-int ccp_check_pci_uio_module(void);\n \n int ccp_parse_pci_addr_format(const char *buf, int bufsize, uint16_t *domain,\n \t\t\t uint8_t *bus, uint8_t *devid, uint8_t *function);\ndiff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c\nindex 7338ef0ae8..8b3a5a304b 100644\n--- a/drivers/crypto/ccp/rte_ccp_pmd.c\n+++ b/drivers/crypto/ccp/rte_ccp_pmd.c\n@@ -22,7 +22,6 @@\n static unsigned int ccp_pmd_init_done;\n uint8_t ccp_cryptodev_driver_id;\n uint8_t cryptodev_cnt;\n-extern void *sha_ctx;\n \n struct ccp_pmd_init_params {\n \tstruct rte_cryptodev_pmd_init_params def_p;\n@@ -213,7 +212,6 @@ cryptodev_ccp_remove(struct rte_pci_device *pci_dev)\n \t\treturn -ENODEV;\n \n \tccp_pmd_init_done = 0;\n-\trte_free(sha_ctx);\n \n \tRTE_LOG(INFO, PMD, \"Closing ccp device %s on numa socket %u\\n\",\n \t\t\tname, rte_socket_id());\n@@ -300,7 +298,6 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\t.auth_opt = CCP_PMD_AUTH_OPT_CCP,\n \t};\n \n-\tsha_ctx = (void *)rte_malloc(NULL, SHA512_DIGEST_SIZE, 64);\n \tif (ccp_pmd_init_done) {\n \t\tRTE_LOG(INFO, PMD, \"CCP PMD already initialized\\n\");\n \t\treturn -EFAULT;\n", "prefixes": [ "v2", "3/4" ] }