From af668035f7f492424b2e199f155690815944a8ca Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Wed, 11 Aug 2021 01:20:20 +0530 Subject: [PATCH] cryptodev: expose driver interface as internal 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 Acked-by: Matan Azrad Acked-by: Fan Zhang Acked-by: Hemant Agrawal --- doc/guides/rel_notes/deprecation.rst | 3 --- doc/guides/rel_notes/release_21_11.rst | 4 +++ 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 +- 64 files changed, 105 insertions(+), 79 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/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 76a4abfd6b..59445a6f42 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -223,9 +223,6 @@ Deprecation Notices session and the private data of session. An opaque pointer can be exposed directly to application which can be attached to the ``rte_crypto_op``. -* cryptodev: The interface between library and drivers will be marked - as internal in DPDK 21.11. - * security: Hide structure ``rte_security_session`` and expose an opaque pointer for the private data to the application which can be attached to the packet while enqueuing. diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index e7ad50ba09..8785b25ff6 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -106,6 +106,10 @@ API Changes rte_cryptodev_is_valid_dev as it can be used by the application as well as PMD to check whether the device is valid or not. +* cryptodev: The rte_cryptodev_pmd.* files are renamed as cryptodev_pmd.* + as it is for drivers only and should be private to DPDK, and not + installed for app use. + ABI Changes ----------- 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 cccca77f60..3a1a4a2e29 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 diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h index b03d2eee14..d7e9f87396 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 e60b352fac..6b8cb01a12 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 40109acc3f..75277936b0 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 #include #include diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.h b/drivers/crypto/cnxk/cn9k_cryptodev_ops.h index 1255de33ae..309f507346 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 957c78063f..41d8fe49e1 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 722acb8d19..d589e0ac3d 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 37b969b916..13c6ea8724 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 1a7f759c57..8294c9f64f 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_callback_register; rte_cryptodev_callback_unregister; rte_cryptodev_close; @@ -27,15 +26,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; @@ -117,3 +107,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" -- 2.20.1