From patchwork Thu Aug 5 20:02:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 96685 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id CAE09A0C41; Thu, 5 Aug 2021 22:03:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 602F241295; Thu, 5 Aug 2021 22:03:08 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id ACC744128B for ; Thu, 5 Aug 2021 22:03:05 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 175K1slX002814; Thu, 5 Aug 2021 13:02:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=TyvoDx9ZdNQmiQfxhIAm62nj+EKOzeButFyq0nXD9xo=; b=iOBveaqF0dU9K0DIgMHGdj5YsSzf5TggnHS01LzEpGsFLBSCuDEAaRXqq7jmlV2okiyM 431lSGQ/GWrJvb64hX1gvENRGkbQeB+Xnfjf9Omv2cSkexYCuNi2a+SLBOgyPZ1YxMKy RbsNm8e8d/SUAnvQmB8RvJWiNXz4wkf3W+6YZ++FP1c0Eb1Ku2xMhqrcxBiwFAJ1W6Lr xJzpO4k5cwMynDSDj9/eos9DHY8iHAjB+5i+ZpXXYAp4BZTm56egoDh/3+IJpmeskLOY wN7BeoIdgnbEBA/ut6IG6w2LOfuFAY89ZYD+FzFJX8WJpPaQ6R5kyePm0L60vqGIeiT1 Pw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 3a8bkbabhf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Aug 2021 13:02:54 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 13:02:52 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 5 Aug 2021 13:02:52 -0700 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id B83063F7061; Thu, 5 Aug 2021 13:02:47 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , Akhil Goyal Date: Fri, 6 Aug 2021 01:32:33 +0530 Message-ID: <20210805200236.1180289-2-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805200236.1180289-1-gakhil@marvell.com> References: <20210805200236.1180289-1-gakhil@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: XxINBJjDrSVy0rxaYFeeVfujRZ6LFEf7 X-Proofpoint-ORIG-GUID: XxINBJjDrSVy0rxaYFeeVfujRZ6LFEf7 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-08-05_10:2021-08-05, 2021-08-05 signatures=0 Subject: [dpdk-dev] [PATCH 1/4] test/crypto: remove illegal header include X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" rte_cryptodev_pmd.h is an interface between driver and library and it is mentioned in the file that application cannot use it directly. Hence, removing the include. Signed-off-by: Akhil Goyal Acked-by: Fan Zhang --- app/test/test_cryptodev.c | 1 - app/test/test_cryptodev_asym.c | 1 - app/test/test_cryptodev_blockcipher.c | 1 - app/test/test_cryptodev_security_pdcp.c | 1 - app/test/test_ipsec.c | 1 - 5 files changed, 5 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 9ad0b37473..e8d63b2bc3 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -16,7 +16,6 @@ #include #include -#include #include #ifdef RTE_CRYPTO_SCHEDULER diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index afa0e91a45..603b2e4609 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -12,7 +12,6 @@ #include #include -#include #include #include "test_cryptodev.h" diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c index 53fd4718af..1c948eb008 100644 --- a/app/test/test_cryptodev_blockcipher.c +++ b/app/test/test_cryptodev_blockcipher.c @@ -11,7 +11,6 @@ #include #include -#include #include "test.h" #include "test_cryptodev.h" diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c index 30f3eb892c..a7641bab7a 100644 --- a/app/test/test_cryptodev_security_pdcp.c +++ b/app/test/test_cryptodev_security_pdcp.c @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index fb90130ae2..c6d6b88d6d 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include From patchwork Thu Aug 5 20:02:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 96684 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 463B5A0C41; Thu, 5 Aug 2021 22:03:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31A0E4128F; Thu, 5 Aug 2021 22:03:07 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id B17514128C for ; Thu, 5 Aug 2021 22:03:05 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 175K16UO012523; Thu, 5 Aug 2021 13:03:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=M7aZO5E7KNAkX0zj0SL0NrVrByclnX5WUwJnNdE0ar0=; b=dzCZDsv96sE+JXHp3DP0qAEBDA6hLgDCohTiT5jlj7BW5VFZHtcd4dnnMVP6+RN66Geu qX/3SBxwNYUm3wumW7idckjPQF3fcn9CnxjHS3aIfsAgkfuhi3TWIKkNa3iWHOKCBqqs Rkudv9epzBMHz0UNXLfMXSCEcLuf3igMma0ttAgoYLxUS3D30wVNqQSISmT2sB56jqF2 BEAt7M6vqRsc/zu/fcgSv1dyA1JyFfroXVGPjZBxvxyk9/YblILny2/tcrMbjf8OBm5J LZMNnWK2dBUU4Padj961PIvUw/kZ5N6yuxBxf1Z+EL0Kmkg9b83fmVt4EteSsoukzaNa HA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3a8ata2cky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Aug 2021 13:03:00 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 13:02:58 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 5 Aug 2021 13:02:58 -0700 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 48DF63F705D; Thu, 5 Aug 2021 13:02:53 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , Akhil Goyal Date: Fri, 6 Aug 2021 01:32:34 +0530 Message-ID: <20210805200236.1180289-3-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805200236.1180289-1-gakhil@marvell.com> References: <20210805200236.1180289-1-gakhil@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: YVt3Pyp-N2WNrJAbXAWL-pKUrm5GPqKF X-Proofpoint-GUID: YVt3Pyp-N2WNrJAbXAWL-pKUrm5GPqKF X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-08-05_10:2021-08-05, 2021-08-05 signatures=0 Subject: [dpdk-dev] [PATCH 2/4] cryptodev: change valid dev API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The API rte_cryptodev_pmd_is_valid_dev, can be used by the application as well as PMD to check whether the device is valid or not. Hence, _pmd is removed from the API. The applications and drivers which use this API are also updated. Signed-off-by: Akhil Goyal Acked-by: Fan Zhang --- .../net/softnic/rte_eth_softnic_cryptodev.c | 2 +- examples/fips_validation/main.c | 2 +- examples/ip_pipeline/cryptodev.c | 3 +- lib/cryptodev/rte_cryptodev.c | 50 +++++++++---------- lib/cryptodev/rte_cryptodev.h | 11 ++++ lib/cryptodev/rte_cryptodev_pmd.h | 11 ---- lib/cryptodev/version.map | 2 +- lib/eventdev/rte_event_crypto_adapter.c | 4 +- lib/eventdev/rte_eventdev.c | 2 +- lib/pipeline/rte_table_action.c | 2 +- 10 files changed, 44 insertions(+), 45 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic_cryptodev.c b/drivers/net/softnic/rte_eth_softnic_cryptodev.c index a1a4ca5650..8e278801c5 100644 --- a/drivers/net/softnic/rte_eth_softnic_cryptodev.c +++ b/drivers/net/softnic/rte_eth_softnic_cryptodev.c @@ -82,7 +82,7 @@ softnic_cryptodev_create(struct pmd_internals *p, dev_id = (uint32_t)status; } else { - if (rte_cryptodev_pmd_is_valid_dev(params->dev_id) == 0) + if (rte_cryptodev_is_valid_dev(params->dev_id) == 0) return NULL; dev_id = params->dev_id; diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index c175fe6ac2..e892078f0e 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -196,7 +196,7 @@ parse_cryptodev_id_arg(char *arg) } - if (!rte_cryptodev_pmd_is_valid_dev(cryptodev_id)) { + if (!rte_cryptodev_is_valid_dev(cryptodev_id)) { RTE_LOG(ERR, USER1, "Error %i: invalid cryptodev id %s\n", cryptodev_id, arg); return -1; diff --git a/examples/ip_pipeline/cryptodev.c b/examples/ip_pipeline/cryptodev.c index b0d9f3d217..9997d97456 100644 --- a/examples/ip_pipeline/cryptodev.c +++ b/examples/ip_pipeline/cryptodev.c @@ -6,7 +6,6 @@ #include #include -#include #include #include "cryptodev.h" @@ -74,7 +73,7 @@ cryptodev_create(const char *name, struct cryptodev_params *params) dev_id = (uint32_t)status; } else { - if (rte_cryptodev_pmd_is_valid_dev(params->dev_id) == 0) + if (rte_cryptodev_is_valid_dev(params->dev_id) == 0) return NULL; dev_id = params->dev_id; diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index 447aa9d519..37502b9b3c 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -663,7 +663,7 @@ rte_cryptodev_is_valid_device_data(uint8_t dev_id) } unsigned int -rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id) +rte_cryptodev_is_valid_dev(uint8_t dev_id) { struct rte_cryptodev *dev = NULL; @@ -761,7 +761,7 @@ rte_cryptodev_socket_id(uint8_t dev_id) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) + if (!rte_cryptodev_is_valid_dev(dev_id)) return -1; dev = rte_cryptodev_pmd_get_dev(dev_id); @@ -1032,7 +1032,7 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config) struct rte_cryptodev *dev; int diag; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1080,7 +1080,7 @@ rte_cryptodev_start(uint8_t dev_id) CDEV_LOG_DEBUG("Start dev_id=%" PRIu8, dev_id); - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1110,7 +1110,7 @@ rte_cryptodev_stop(uint8_t dev_id) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return; } @@ -1136,7 +1136,7 @@ rte_cryptodev_close(uint8_t dev_id) struct rte_cryptodev *dev; int retval; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -1; } @@ -1176,7 +1176,7 @@ rte_cryptodev_get_qp_status(uint8_t dev_id, uint16_t queue_pair_id) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1207,7 +1207,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1283,7 +1283,7 @@ rte_cryptodev_add_enq_callback(uint8_t dev_id, return NULL; } - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); rte_errno = ENODEV; return NULL; @@ -1349,7 +1349,7 @@ rte_cryptodev_remove_enq_callback(uint8_t dev_id, return -EINVAL; } - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); return -ENODEV; } @@ -1418,7 +1418,7 @@ rte_cryptodev_add_deq_callback(uint8_t dev_id, return NULL; } - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); rte_errno = ENODEV; return NULL; @@ -1484,7 +1484,7 @@ rte_cryptodev_remove_deq_callback(uint8_t dev_id, return -EINVAL; } - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); return -ENODEV; } @@ -1542,7 +1542,7 @@ rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); return -ENODEV; } @@ -1565,7 +1565,7 @@ rte_cryptodev_stats_reset(uint8_t dev_id) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return; } @@ -1581,7 +1581,7 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info) { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%d", dev_id); return; } @@ -1608,7 +1608,7 @@ rte_cryptodev_callback_register(uint8_t dev_id, if (!cb_fn) return -EINVAL; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1652,7 +1652,7 @@ rte_cryptodev_callback_unregister(uint8_t dev_id, if (!cb_fn) return -EINVAL; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1720,7 +1720,7 @@ rte_cryptodev_sym_session_init(uint8_t dev_id, uint8_t index; int ret; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1765,7 +1765,7 @@ rte_cryptodev_asym_session_init(uint8_t dev_id, uint8_t index; int ret; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1939,7 +1939,7 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, struct rte_cryptodev *dev; uint8_t driver_id; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -1969,7 +1969,7 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id, { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } @@ -2079,7 +2079,7 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id) struct rte_cryptodev *dev; unsigned int priv_sess_size; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) + if (!rte_cryptodev_is_valid_dev(dev_id)) return 0; dev = rte_cryptodev_pmd_get_dev(dev_id); @@ -2099,7 +2099,7 @@ rte_cryptodev_asym_get_private_session_size(uint8_t dev_id) unsigned int header_size = sizeof(void *) * nb_drivers; unsigned int priv_sess_size; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) + if (!rte_cryptodev_is_valid_dev(dev_id)) return 0; dev = rte_cryptodev_pmd_get_dev(dev_id); @@ -2156,7 +2156,7 @@ rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id, { struct rte_cryptodev *dev; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { sym_crypto_fill_status(vec, EINVAL); return 0; } @@ -2179,7 +2179,7 @@ rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id) int32_t size = sizeof(struct rte_crypto_raw_dp_ctx); int32_t priv_size; - if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) + if (!rte_cryptodev_is_valid_dev(dev_id)) return -EINVAL; dev = rte_cryptodev_pmd_get_dev(dev_id); diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index 425f459143..33aac44446 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -1358,6 +1358,17 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id); unsigned int rte_cryptodev_asym_get_private_session_size(uint8_t dev_id); +/** + * Validate if the crypto device index is valid attached crypto device. + * + * @param dev_id Crypto device index. + * + * @return + * - If the device index is valid (1) or not (0). + */ +unsigned int +rte_cryptodev_is_valid_dev(uint8_t dev_id); + /** * Provide driver identifier. * diff --git a/lib/cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/rte_cryptodev_pmd.h index 1274436870..dd2a4940a2 100644 --- a/lib/cryptodev/rte_cryptodev_pmd.h +++ b/lib/cryptodev/rte_cryptodev_pmd.h @@ -94,17 +94,6 @@ rte_cryptodev_pmd_get_dev(uint8_t dev_id); struct rte_cryptodev * rte_cryptodev_pmd_get_named_dev(const char *name); -/** - * Validate if the crypto device index is valid attached crypto device. - * - * @param dev_id Crypto device index. - * - * @return - * - If the device index is valid (1) or not (0). - */ -unsigned int -rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id); - /** * The pool of rte_cryptodev structures. */ diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map index 707a2e32d3..9c1f860211 100644 --- a/lib/cryptodev/version.map +++ b/lib/cryptodev/version.map @@ -37,6 +37,7 @@ DPDK_22 { rte_cryptodev_get_feature_name; rte_cryptodev_get_sec_ctx; rte_cryptodev_info_get; + rte_cryptodev_is_valid_dev; rte_cryptodev_name_get; rte_cryptodev_pmd_allocate; rte_cryptodev_pmd_callback_process; @@ -45,7 +46,6 @@ DPDK_22 { rte_cryptodev_pmd_destroy; rte_cryptodev_pmd_get_dev; rte_cryptodev_pmd_get_named_dev; - rte_cryptodev_pmd_is_valid_dev; rte_cryptodev_pmd_parse_input_args; rte_cryptodev_pmd_release_device; rte_cryptodev_queue_pair_count; diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index e1d38d383d..2d38389858 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -781,7 +781,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); - if (!rte_cryptodev_pmd_is_valid_dev(cdev_id)) { + if (!rte_cryptodev_is_valid_dev(cdev_id)) { RTE_EDEV_LOG_ERR("Invalid dev_id=%" PRIu8, cdev_id); return -EINVAL; } @@ -898,7 +898,7 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); - if (!rte_cryptodev_pmd_is_valid_dev(cdev_id)) { + if (!rte_cryptodev_is_valid_dev(cdev_id)) { RTE_EDEV_LOG_ERR("Invalid dev_id=%" PRIu8, cdev_id); return -EINVAL; } diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index 594dd5e759..cb0ed7b620 100644 --- a/lib/eventdev/rte_eventdev.c +++ b/lib/eventdev/rte_eventdev.c @@ -165,7 +165,7 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id, struct rte_cryptodev *cdev; RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL); - if (!rte_cryptodev_pmd_is_valid_dev(cdev_id)) + if (!rte_cryptodev_is_valid_dev(cdev_id)) return -EINVAL; dev = &rte_eventdevs[dev_id]; diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c index 98f3438774..54721ed96a 100644 --- a/lib/pipeline/rte_table_action.c +++ b/lib/pipeline/rte_table_action.c @@ -1732,7 +1732,7 @@ struct sym_crypto_data { static int sym_crypto_cfg_check(struct rte_table_action_sym_crypto_config *cfg) { - if (!rte_cryptodev_pmd_is_valid_dev(cfg->cryptodev_id)) + if (!rte_cryptodev_is_valid_dev(cfg->cryptodev_id)) return -EINVAL; if (cfg->mp_create == NULL || cfg->mp_init == NULL) return -EINVAL; From patchwork Thu Aug 5 20:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 96686 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 68F48A0C41; Thu, 5 Aug 2021 22:03:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 948864129A; Thu, 5 Aug 2021 22:03:14 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id F100F4128E for ; Thu, 5 Aug 2021 22:03:12 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 175K17h9012534; Thu, 5 Aug 2021 13:03:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=uvO8sR6cP1T/dZr3vOCN8uZ0aI9hkhZ9Nozi35bFqKI=; b=bA8a72eBNriytHFtRfJ0ZWy4/e2+IUVaBWJTq2oALcZ4yGL3iNIrOxSs5SrOoknbpOTq +pNGYMhUDkY6IIM2bRwUPBeERt8VP3yvevCzyPZZRSK8+vvJW5ZmZfKOKYuxG08d67Yr 4Nm4mEaX4rpx+77C+8FIiHdd67ydDywDkxBHvDsqi0A0JwgZn/lmZVFaj/ne0EAB1M7b ft7J/ljjorSjgIZQxjz+tfrTPs8ldgzoVHtaz6NMglCR5Gh1nn68qdH2AK1ITzhJzwdB A6Tl6ze00GGBPTLZGuOgJnfKDvlzCC8tHZcb7fyXqrGElMPhBupNNoKpRChibiXYU+4T yQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3a8ata2cm8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Aug 2021 13:03:06 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 13:03:04 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 5 Aug 2021 13:03:04 -0700 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id D09F93F705F; Thu, 5 Aug 2021 13:02:58 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , Akhil Goyal Date: Fri, 6 Aug 2021 01:32:35 +0530 Message-ID: <20210805200236.1180289-4-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805200236.1180289-1-gakhil@marvell.com> References: <20210805200236.1180289-1-gakhil@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: U0aC4lDOINSSibDiaqYx_7oUweSkCF2P X-Proofpoint-GUID: U0aC4lDOINSSibDiaqYx_7oUweSkCF2P X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-08-05_10:2021-08-05, 2021-08-05 signatures=0 Subject: [dpdk-dev] [PATCH 3/4] examples/fips_validation: remove illegal usage of APIs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Some of the cryptodev APIs are not allowed to be used by application directly. Hence removing the usage of 1. queue_pair_release: it is not required, as configure of queue pair release the previous queue pairs and the dev is not directly exposed to application, hence cannot use its ops from app. 2. rte_cryptodev_stop: it can be used directly without checking if the device is started or not. 3. rte_cryptodev_pmd_destroy: application should use rte_cryptodev_close instead. Signed-off-by: Akhil Goyal --- examples/fips_validation/fips_dev_self_test.c | 19 ++----------------- examples/fips_validation/main.c | 7 ++----- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/examples/fips_validation/fips_dev_self_test.c b/examples/fips_validation/fips_dev_self_test.c index 17e85973c0..b4eab05a98 100644 --- a/examples/fips_validation/fips_dev_self_test.c +++ b/examples/fips_validation/fips_dev_self_test.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "fips_dev_self_test.h" @@ -1523,12 +1523,6 @@ static void fips_dev_auto_test_uninit(uint8_t dev_id, struct fips_dev_auto_test_env *env) { - struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(dev_id); - uint32_t i; - - if (!dev) - return; - if (env->mbuf) rte_pktmbuf_free(env->mbuf); if (env->op) @@ -1542,16 +1536,7 @@ fips_dev_auto_test_uninit(uint8_t dev_id, if (env->sess_priv_pool) rte_mempool_free(env->sess_priv_pool); - if (dev->data->dev_started) - rte_cryptodev_stop(dev_id); - - if (dev->data->nb_queue_pairs) { - for (i = 0; i < dev->data->nb_queue_pairs; i++) - (*dev->dev_ops->queue_pair_release)(dev, i); - dev->data->nb_queue_pairs = 0; - rte_free(dev->data->queue_pairs); - dev->data->queue_pairs = NULL; - } + rte_cryptodev_stop(dev_id); } static int diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index e892078f0e..a8daad1f48 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include @@ -73,10 +73,7 @@ cryptodev_fips_validate_app_int(void) if (env.self_test) { ret = fips_dev_self_test(env.dev_id, env.broken_test_config); if (ret < 0) { - struct rte_cryptodev *cryptodev = - rte_cryptodev_pmd_get_dev(env.dev_id); - - rte_cryptodev_pmd_destroy(cryptodev); + rte_cryptodev_close(env.dev_id); return ret; } From patchwork Thu Aug 5 20:02:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil Goyal X-Patchwork-Id: 96687 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 5359DA0C41; Thu, 5 Aug 2021 22:03:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9A9A412A0; Thu, 5 Aug 2021 22:03:18 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 6DB6D412A0 for ; Thu, 5 Aug 2021 22:03:17 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 175K16dg012522; Thu, 5 Aug 2021 13:03:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=W70/7FMJJN14N3R7TDu0SX33SVnzMpm0dCTNJa7pRH8=; b=eHXJlvSBc3iIb1NQ211CZUegTHGEkYeBX43zy/TIGhbpxCGo0TzEKmediBt8a/JFgryN I5v0jr17aeGI7pZlgCXvS9zVe446/uoZEkm7+jIPxNj9CQyV8n/eT1TJRw5e7X2mYr0v 7Zz3Djez+DkGpt6SWIgNt29ERxEr/468SO0WWuj6gcYdmoy7VvgoJGgc8O+aXk2sFvQb H9RH3+SiA0WsnqBR8pycocOdhVlKsHxQr9p3XcH+O4PZ4P850N/ZJWpnqYaaB+hjUA7/ bnb8rKTL+/242xst6dTzw1TzUjmmQABEYKX3uIXOLqdkAPxQ7m0UUNWzxOQ+5spXYhFO Jw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3a8ata2cmd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Aug 2021 13:03:11 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 13:03:09 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 5 Aug 2021 13:03:09 -0700 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 642E83F70A5; Thu, 5 Aug 2021 13:03:04 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , Akhil Goyal Date: Fri, 6 Aug 2021 01:32:36 +0530 Message-ID: <20210805200236.1180289-5-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805200236.1180289-1-gakhil@marvell.com> References: <20210805200236.1180289-1-gakhil@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Wi3eUdx_Feg_hdbiwiMUq8i06rZ1IpGl X-Proofpoint-GUID: Wi3eUdx_Feg_hdbiwiMUq8i06rZ1IpGl X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-08-05_10:2021-08-05, 2021-08-05 signatures=0 Subject: [dpdk-dev] [PATCH 4/4] cryptodev: expose driver interface as internal X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The rte_cryptodev_pmd.* files are for drivers only and should be private to DPDK, and not installed for app use. Signed-off-by: Akhil Goyal --- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 2 +- drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 2 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 2 +- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 2 +- drivers/crypto/bcmfs/bcmfs_sym_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_sym_session.h | 2 +- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/ccp_crypto.c | 2 +- drivers/crypto/ccp/ccp_pmd_ops.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.h | 2 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/kasumi/rte_kasumi_pmd.c | 2 +- drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.h | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 2 +- drivers/crypto/nitrox/nitrox_sym.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd_ops.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/octeontx/otx_cryptodev_ops.c | 2 +- drivers/crypto/octeontx2/otx2_cryptodev.c | 2 +- drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 2 +- drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 2 +- drivers/crypto/qat/qat_asym.h | 2 +- drivers/crypto/qat/qat_asym_pmd.c | 2 +- drivers/crypto/qat/qat_sym.h | 2 +- drivers/crypto/qat/qat_sym_hw_dp.c | 2 +- drivers/crypto/qat/qat_sym_pmd.c | 2 +- drivers/crypto/qat/qat_sym_session.h | 2 +- .../scheduler/rte_cryptodev_scheduler.c | 2 +- drivers/crypto/scheduler/scheduler_pmd.c | 2 +- drivers/crypto/scheduler/scheduler_pmd_ops.c | 2 +- drivers/crypto/snow3g/rte_snow3g_pmd.c | 2 +- drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_rxtx.c | 2 +- drivers/crypto/zuc/rte_zuc_pmd.c | 2 +- drivers/crypto/zuc/rte_zuc_pmd_ops.c | 2 +- .../octeontx2/otx2_evdev_crypto_adptr_rx.h | 2 +- .../octeontx2/otx2_evdev_crypto_adptr_tx.h | 2 +- .../net/softnic/rte_eth_softnic_cryptodev.c | 2 +- .../{rte_cryptodev_pmd.c => cryptodev_pmd.c} | 2 +- .../{rte_cryptodev_pmd.h => cryptodev_pmd.h} | 16 +++++++++--- lib/cryptodev/meson.build | 18 ++++++++++--- lib/cryptodev/rte_cryptodev.c | 2 +- lib/cryptodev/version.map | 25 +++++++++++-------- lib/eventdev/rte_event_crypto_adapter.c | 2 +- lib/eventdev/rte_eventdev.c | 2 +- lib/pipeline/rte_table_action.c | 2 +- 62 files changed, 101 insertions(+), 76 deletions(-) rename lib/cryptodev/{rte_cryptodev_pmd.c => cryptodev_pmd.c} (99%) rename lib/cryptodev/{rte_cryptodev_pmd.h => cryptodev_pmd.h} (98%) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index 886e2a5aaa..330aad8157 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c index 18dbc4c18c..edb7275e76 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "aesni_gcm_pmd_private.h" diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index a01c826a3c..60963a8208 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c index fc7fdfec8e..48a8f91868 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "aesni_mb_pmd_private.h" diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index c642ac350f..36a1a9bb4f 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c index 01ccfb4b23..1b2749fe62 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c +++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "armv8_pmd_private.h" diff --git a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c index aa7fad6d70..d1dd22823e 100644 --- a/drivers/crypto/bcmfs/bcmfs_sym_pmd.c +++ b/drivers/crypto/bcmfs/bcmfs_sym_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "bcmfs_device.h" #include "bcmfs_logs.h" diff --git a/drivers/crypto/bcmfs/bcmfs_sym_session.h b/drivers/crypto/bcmfs/bcmfs_sym_session.h index 8240c6fc25..d40595b4bd 100644 --- a/drivers/crypto/bcmfs/bcmfs_sym_session.h +++ b/drivers/crypto/bcmfs/bcmfs_sym_session.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include "bcmfs_sym_defs.h" #include "bcmfs_sym_req.h" diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index 3fb3fe0f8a..258750afe7 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index f37d35f18f..70daed791e 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "ccp_dev.h" #include "ccp_crypto.h" diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c index 98f964f361..0d615d311c 100644 --- a/drivers/crypto/ccp/ccp_pmd_ops.c +++ b/drivers/crypto/ccp/ccp_pmd_ops.c @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "ccp_pmd_private.h" diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index ab9416942e..a54d81de46 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/cnxk/cn10k_cryptodev.c b/drivers/crypto/cnxk/cn10k_cryptodev.c index db7b5aa7c6..012eb0c051 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index 2e1a73939c..d9b53128bc 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include #include "cn10k_cryptodev.h" diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h index d500b7d227..198e9ea5bd 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h @@ -6,7 +6,7 @@ #define _CN10K_CRYPTODEV_OPS_H_ #include -#include +#include extern struct rte_cryptodev_ops cn10k_cpt_ops; diff --git a/drivers/crypto/cnxk/cn9k_cryptodev.c b/drivers/crypto/cnxk/cn9k_cryptodev.c index 9ff2383d98..b12138c40b 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 724965be5b..97fbf780fe 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "cn9k_cryptodev.h" #include "cn9k_cryptodev_ops.h" diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.h b/drivers/crypto/cnxk/cn9k_cryptodev_ops.h index 2277f6bcfb..d042d18474 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.h @@ -5,7 +5,7 @@ #ifndef _CN9K_CRYPTODEV_OPS_H_ #define _CN9K_CRYPTODEV_OPS_H_ -#include +#include extern struct rte_cryptodev_ops cn9k_cpt_ops; diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index 440dbc3adb..55cfe9159c 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include #include "roc_cpt.h" diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 1ccead3641..bf69c61916 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 19d4684e24..3d53746ef1 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #ifdef RTE_LIB_SECURITY diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index 48b7db9e9b..d6f927417a 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c index 43376c1aa0..f075054807 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "kasumi_pmd_private.h" diff --git a/drivers/crypto/mlx5/mlx5_crypto.h b/drivers/crypto/mlx5/mlx5_crypto.h index d49b0001f0..3c256ef275 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.h +++ b/drivers/crypto/mlx5/mlx5_crypto.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c index ed85bb6547..a72642a772 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c index fa36461276..3064b1f136 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include "mrvl_pmd_private.h" diff --git a/drivers/crypto/nitrox/nitrox_sym.c b/drivers/crypto/nitrox/nitrox_sym.c index 2768bdd2e1..f8b7edcd69 100644 --- a/drivers/crypto/nitrox/nitrox_sym.c +++ b/drivers/crypto/nitrox/nitrox_sym.c @@ -4,7 +4,7 @@ #include -#include +#include #include #include "nitrox_sym.h" diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c index 179e5ff36d..f9935d52cc 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include #include diff --git a/drivers/crypto/null/null_crypto_pmd_ops.c b/drivers/crypto/null/null_crypto_pmd_ops.c index d67892a1bb..a8b5a06e7f 100644 --- a/drivers/crypto/null/null_crypto_pmd_ops.c +++ b/drivers/crypto/null/null_crypto_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "null_crypto_pmd_private.h" diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c index 3822c0d779..c294f86d79 100644 --- a/drivers/crypto/octeontx/otx_cryptodev.c +++ b/drivers/crypto/octeontx/otx_cryptodev.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c index eac6796cfb..9b5bde53f8 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_ops.c +++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c index 75fb4f9a3b..85b1f00263 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c index 42100154cd..09ddbb5f34 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c @@ -4,7 +4,7 @@ #include -#include +#include #include #include #include diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h index 1970187f88..8d135909b3 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h @@ -5,7 +5,7 @@ #ifndef _OTX2_CRYPTODEV_OPS_H_ #define _OTX2_CRYPTODEV_OPS_H_ -#include +#include #define OTX2_CPT_MIN_HEADROOM_REQ 24 #define OTX2_CPT_MIN_TAILROOM_REQ 8 diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 47004337d5..f149366c2a 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index ed75877581..52715f86f8 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "openssl_pmd_private.h" #include "compat.h" diff --git a/drivers/crypto/qat/qat_asym.h b/drivers/crypto/qat/qat_asym.h index 2838aee76f..308b6b2e0b 100644 --- a/drivers/crypto/qat/qat_asym.h +++ b/drivers/crypto/qat/qat_asym.h @@ -5,7 +5,7 @@ #ifndef _QAT_ASYM_H_ #define _QAT_ASYM_H_ -#include +#include #include #include "icp_qat_fw_pke.h" #include "qat_common.h" diff --git a/drivers/crypto/qat/qat_asym_pmd.c b/drivers/crypto/qat/qat_asym_pmd.c index 0c25cce09e..e91bb0d317 100644 --- a/drivers/crypto/qat/qat_asym_pmd.c +++ b/drivers/crypto/qat/qat_asym_pmd.c @@ -2,7 +2,7 @@ * Copyright(c) 2019 Intel Corporation */ -#include +#include #include "qat_logs.h" diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h index 20b1b53d36..e3ec7f0de4 100644 --- a/drivers/crypto/qat/qat_sym.h +++ b/drivers/crypto/qat/qat_sym.h @@ -5,7 +5,7 @@ #ifndef _QAT_SYM_H_ #define _QAT_SYM_H_ -#include +#include #ifdef RTE_LIB_SECURITY #include #endif diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c index ac9ac05363..36d11e0dc9 100644 --- a/drivers/crypto/qat/qat_sym_hw_dp.c +++ b/drivers/crypto/qat/qat_sym_hw_dp.c @@ -2,7 +2,7 @@ * Copyright(c) 2020 Intel Corporation */ -#include +#include #include "adf_transport_access_macros.h" #include "icp_qat_fw.h" diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c index 6868e5f001..efda921c05 100644 --- a/drivers/crypto/qat/qat_sym_pmd.c +++ b/drivers/crypto/qat/qat_sym_pmd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #ifdef RTE_LIB_SECURITY #include #endif diff --git a/drivers/crypto/qat/qat_sym_session.h b/drivers/crypto/qat/qat_sym_session.h index 33b236e49b..6ebc176729 100644 --- a/drivers/crypto/qat/qat_sym_session.h +++ b/drivers/crypto/qat/qat_sym_session.h @@ -5,7 +5,7 @@ #define _QAT_SYM_SESSION_H_ #include -#include +#include #ifdef RTE_LIB_SECURITY #include #endif diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c index 1e0b4df0ca..1e0c4fe464 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "rte_cryptodev_scheduler.h" diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c index 632197833c..560c26af50 100644 --- a/drivers/crypto/scheduler/scheduler_pmd.c +++ b/drivers/crypto/scheduler/scheduler_pmd.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c index cb125e8027..465b88ade8 100644 --- a/drivers/crypto/scheduler/scheduler_pmd_ops.c +++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "scheduler_pmd_private.h" diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 9aab357846..8284ac0b66 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c index 906a0fe60b..3f46014b7d 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "snow3g_pmd_private.h" diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index 4bae74a487..8faa39df4a 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include "virtio_cryptodev.h" diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index e1cb4ad104..a65524a306 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. */ -#include +#include #include "virtqueue.h" #include "virtio_cryptodev.h" diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c index 42b669f188..d4b343a7af 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd.c +++ b/drivers/crypto/zuc/rte_zuc_pmd.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/crypto/zuc/rte_zuc_pmd_ops.c b/drivers/crypto/zuc/rte_zuc_pmd_ops.c index dc9dc25ef8..38642d45ab 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd_ops.c +++ b/drivers/crypto/zuc/rte_zuc_pmd_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "zuc_pmd_private.h" diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h index a543225376..b33cb7e139 100644 --- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h +++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h @@ -6,7 +6,7 @@ #define _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_ #include -#include +#include #include #include "cpt_pmd_logs.h" diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h index ecf7eb9f56..1fc56f903b 100644 --- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h +++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h @@ -6,7 +6,7 @@ #define _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_ #include -#include +#include #include #include diff --git a/drivers/net/softnic/rte_eth_softnic_cryptodev.c b/drivers/net/softnic/rte_eth_softnic_cryptodev.c index 8e278801c5..9a7d006f1a 100644 --- a/drivers/net/softnic/rte_eth_softnic_cryptodev.c +++ b/drivers/net/softnic/rte_eth_softnic_cryptodev.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include "rte_eth_softnic_internals.h" diff --git a/lib/cryptodev/rte_cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c similarity index 99% rename from lib/cryptodev/rte_cryptodev_pmd.c rename to lib/cryptodev/cryptodev_pmd.c index e342daabc4..71e34140cd 100644 --- a/lib/cryptodev/rte_cryptodev_pmd.c +++ b/lib/cryptodev/cryptodev_pmd.c @@ -5,7 +5,7 @@ #include #include -#include "rte_cryptodev_pmd.h" +#include "cryptodev_pmd.h" /** * Parse name from argument diff --git a/lib/cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h similarity index 98% rename from lib/cryptodev/rte_cryptodev_pmd.h rename to lib/cryptodev/cryptodev_pmd.h index dd2a4940a2..ec7bb82be8 100644 --- a/lib/cryptodev/rte_cryptodev_pmd.h +++ b/lib/cryptodev/cryptodev_pmd.h @@ -2,8 +2,8 @@ * Copyright(c) 2015-2020 Intel Corporation. */ -#ifndef _RTE_CRYPTODEV_PMD_H_ -#define _RTE_CRYPTODEV_PMD_H_ +#ifndef _CRYPTODEV_PMD_H_ +#define _CRYPTODEV_PMD_H_ /** @file * RTE Crypto PMD APIs @@ -80,6 +80,7 @@ struct cryptodev_driver { * @return * - The rte_cryptodev structure pointer for the given device ID. */ +__rte_internal struct rte_cryptodev * rte_cryptodev_pmd_get_dev(uint8_t dev_id); @@ -91,6 +92,7 @@ rte_cryptodev_pmd_get_dev(uint8_t dev_id); * @return * - The rte_cryptodev structure pointer for the given device ID. */ +__rte_internal struct rte_cryptodev * rte_cryptodev_pmd_get_named_dev(const char *name); @@ -401,6 +403,7 @@ struct rte_cryptodev_ops { * @return * - Slot in the rte_dev_devices array for a new device; */ +__rte_internal struct rte_cryptodev * rte_cryptodev_pmd_allocate(const char *name, int socket_id); @@ -414,6 +417,7 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id); * @return * - 0 on success, negative on error */ +__rte_internal extern int rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev); @@ -435,6 +439,7 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev); * - 0 on success * - errno on failure */ +__rte_internal int rte_cryptodev_pmd_parse_input_args( struct rte_cryptodev_pmd_init_params *params, @@ -454,6 +459,7 @@ rte_cryptodev_pmd_parse_input_args( * - crypto device instance on success * - NULL on creation failure */ +__rte_internal struct rte_cryptodev * rte_cryptodev_pmd_create(const char *name, struct rte_device *device, @@ -471,6 +477,7 @@ rte_cryptodev_pmd_create(const char *name, * - 0 on success * - errno on failure */ +__rte_internal int rte_cryptodev_pmd_destroy(struct rte_cryptodev *cryptodev); @@ -484,6 +491,7 @@ rte_cryptodev_pmd_destroy(struct rte_cryptodev *cryptodev); * @return * void */ +__rte_internal void rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev, enum rte_cryptodev_event_type event); @@ -491,6 +499,7 @@ void rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev, * @internal * Create unique device name */ +__rte_internal int rte_cryptodev_pmd_create_dev_name(char *name, const char *dev_name_prefix); @@ -506,6 +515,7 @@ rte_cryptodev_pmd_create_dev_name(char *name, const char *dev_name_prefix); * @return * The driver type identifier */ +__rte_internal uint8_t rte_cryptodev_allocate_driver(struct cryptodev_driver *crypto_drv, const struct rte_driver *drv); @@ -555,4 +565,4 @@ set_asym_session_private_data(struct rte_cryptodev_asym_session *sess, } #endif -#endif /* _RTE_CRYPTODEV_PMD_H_ */ +#endif /* _CRYPTODEV_PMD_H_ */ diff --git a/lib/cryptodev/meson.build b/lib/cryptodev/meson.build index bec80beab3..735935df4a 100644 --- a/lib/cryptodev/meson.build +++ b/lib/cryptodev/meson.build @@ -1,12 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 'cryptodev_trace_points.c') -headers = files('rte_cryptodev.h', - 'rte_cryptodev_pmd.h', +sources = files( + 'cryptodev_pmd.c', + 'cryptodev_trace_points.c', + 'rte_cryptodev.c', +) +headers = files( + 'rte_cryptodev.h', 'rte_cryptodev_trace.h', 'rte_cryptodev_trace_fp.h', 'rte_crypto.h', 'rte_crypto_sym.h', - 'rte_crypto_asym.h') + 'rte_crypto_asym.h', +) + +driver_sdk_headers += files( + 'cryptodev_pmd.h', +) + deps += ['kvargs', 'mbuf', 'rcu'] diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index 37502b9b3c..9fa3aff1d3 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -39,7 +39,7 @@ #include "rte_crypto.h" #include "rte_cryptodev.h" -#include "rte_cryptodev_pmd.h" +#include "cryptodev_pmd.h" #include "rte_cryptodev_trace.h" static uint8_t nb_drivers; diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map index 9c1f860211..2fdf70002d 100644 --- a/lib/cryptodev/version.map +++ b/lib/cryptodev/version.map @@ -8,7 +8,6 @@ DPDK_22 { rte_crypto_cipher_algorithm_strings; rte_crypto_cipher_operation_strings; rte_crypto_op_pool_create; - rte_cryptodev_allocate_driver; rte_cryptodev_asym_capability_get; rte_cryptodev_asym_get_header_session_size; @@ -39,15 +38,6 @@ DPDK_22 { rte_cryptodev_info_get; rte_cryptodev_is_valid_dev; rte_cryptodev_name_get; - rte_cryptodev_pmd_allocate; - rte_cryptodev_pmd_callback_process; - rte_cryptodev_pmd_create; - rte_cryptodev_pmd_create_dev_name; - rte_cryptodev_pmd_destroy; - rte_cryptodev_pmd_get_dev; - rte_cryptodev_pmd_get_named_dev; - rte_cryptodev_pmd_parse_input_args; - rte_cryptodev_pmd_release_device; rte_cryptodev_queue_pair_count; rte_cryptodev_queue_pair_setup; rte_cryptodev_socket_id; @@ -119,3 +109,18 @@ EXPERIMENTAL { rte_cryptodev_remove_enq_callback; }; + +INTERNAL { + global: + + rte_cryptodev_allocate_driver; + rte_cryptodev_pmd_allocate; + rte_cryptodev_pmd_callback_process; + rte_cryptodev_pmd_create; + rte_cryptodev_pmd_create_dev_name; + rte_cryptodev_pmd_destroy; + rte_cryptodev_pmd_get_dev; + rte_cryptodev_pmd_get_named_dev; + rte_cryptodev_pmd_parse_input_args; + rte_cryptodev_pmd_release_device; +}; diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index 2d38389858..ebfc8326a8 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c index cb0ed7b620..e347d6dfd5 100644 --- a/lib/eventdev/rte_eventdev.c +++ b/lib/eventdev/rte_eventdev.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "rte_eventdev.h" diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c index 54721ed96a..ad7904c0ee 100644 --- a/lib/pipeline/rte_table_action.c +++ b/lib/pipeline/rte_table_action.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "rte_table_action.h"