cryptodev: remove crypto device driver name

Remove crypto device driver name string definitions from librte_cryptodev,
which avoid to library changes every time a new crypto driver was added.

The driver name is predefined internaly in the each PMD.
The applications could use the crypto device driver names based on
options with the driver name string provided in command line.

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 042d4d7869a77dfab49b16cf3dfe7e14e833599e..6c58e69de39b15833f840158f0ad7eccb12d5202 100644 (file)
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -54,9 +54,6 @@ Deprecation Notices
   Target release for removal of the legacy API will be defined once most
   PMDs have switched to rte_flow.
 
-* cryptodev: All PMD names definitions will be moved to the individual PMDs
-  in 17.08.
-
 * cryptodev: API changes are planned for 17.08 for the sessions management
   to make it agnostic to the underlying devices, removing coupling with
   crypto PMDs, so a single session can be used on multiple devices.

diff --git a/doc/guides/rel_notes/release_17_08.rst b/doc/guides/rel_notes/release_17_08.rst
index 63f55300e34aecaffbe6b2d099d946109b642d32..7a828ff093eb5e86947b1e2ff2964f7c3e622d76 100644 (file)
--- a/doc/guides/rel_notes/release_17_08.rst
+++ b/doc/guides/rel_notes/release_17_08.rst
@@ -210,6 +210,8 @@ API Changes
   * The crypto device type enumeration has been removed from cryptodev library.
   * The function ``rte_crypto_count_devtype()`` has been removed, and replaced
     by the new function ``rte_crypto_count_by_driver()``.
+  * Moved crypto device driver names definitions to the particular PMDs.
+    These names are not public anymore.
 
 
 ABI Changes

diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h
index 4885188157afd63e93ed8e5f3060de3d70b43695..7e155729b4ce2148268413476693a8a762f214d5 100644 (file)
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include "aesni_gcm_ops.h"
 
+#define CRYPTODEV_NAME_AESNI_GCM_PMD   crypto_aesni_gcm
+/**< AES-NI GCM PMD device name */
+
 #define GCM_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), \

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
index 5c50d375f92e725577bef3d4e45380fddee1311a..6676948efb3bf7e9d30c52f8cea9408b96ac2794 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include "aesni_mb_ops.h"
 
+#define CRYPTODEV_NAME_AESNI_MB_PMD    crypto_aesni_mb
+/**< AES-NI Multi buffer PMD device name */
+
 #define MB_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), \

diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
index 09d32f20ce4926093387b4b5f57d47feac765da9..0baa49f409a098c31e70e8429428884e343f9a8f 100644 (file)
--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
+++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
@@ -33,6 +33,9 @@
 #ifndef _RTE_ARMV8_PMD_PRIVATE_H_
 #define _RTE_ARMV8_PMD_PRIVATE_H_
 
+#define CRYPTODEV_NAME_ARMV8_PMD       crypto_armv8
+/**< ARMv8 Crypto PMD device name */
+
 #define ARMV8_CRYPTO_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
index a477404b5301373f1555bf6b0d07a28112dde9ab..bd85e3a10d8a1e1695ac3158e291fe5d4334608e 100644 (file)
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
@@ -34,6 +34,9 @@
 #ifndef _RTE_DPAA2_SEC_PMD_PRIVATE_H_
 #define _RTE_DPAA2_SEC_PMD_PRIVATE_H_
 
+#define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec_pmd
+/**< Open SSL Crypto PMD device name */
+
 #define MAX_QUEUES             64
 #define MAX_DESC_SIZE          64
 /** private data structure for each DPAA2_SEC device */

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
index 06031db924fe18b9cd24de6c20f8c392eeda6b6b..9315a791c74caee2a13f1b4e128317679155a0e7 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include <sso_kasumi.h>
 
+#define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
+/**< KASUMI PMD device name */
+
 #define KASUMI_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_KASUMI_PMD), \

diff --git a/drivers/crypto/null/null_crypto_pmd_private.h b/drivers/crypto/null/null_crypto_pmd_private.h
index acebc9736023913fc55958202e4aef0f99f99930..4d1c3c9e475e4392b8bc6b9567af3be8d8314c19 100644 (file)
--- a/drivers/crypto/null/null_crypto_pmd_private.h
+++ b/drivers/crypto/null/null_crypto_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include "rte_config.h"
 
+#define CRYPTODEV_NAME_NULL_PMD                crypto_null
+/**< Null crypto PMD device name */
+
 #define NULL_CRYPTO_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_NULL_PMD), \

diff --git a/drivers/crypto/openssl/rte_openssl_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h
index 44104d546cd3734548c32eb3eece00bfdc7698d9..b7f747521a1a3803ddad1e2a7e5e820c17d05bc7 100644 (file)
--- a/drivers/crypto/openssl/rte_openssl_pmd_private.h
+++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h
@@ -36,6 +36,8 @@
 #include <openssl/evp.h>
 #include <openssl/des.h>
 
+#define CRYPTODEV_NAME_OPENSSL_PMD     crypto_openssl
+/**< Open SSL Crypto PMD device name */
 
 #define OPENSSL_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \

diff --git a/drivers/crypto/qat/qat_crypto.h b/drivers/crypto/qat/qat_crypto.h
index 4151456439933fc97703af6a020cb14e7f3da634..1258b6d4527a8fc4a7a0cbb136408d9e4bc54f7a 100644 (file)
--- a/drivers/crypto/qat/qat_crypto.h
+++ b/drivers/crypto/qat/qat_crypto.h
@@ -39,6 +39,9 @@
 
 #include "qat_crypto_capabilities.h"
 
+#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
+/**< Intel QAT Symmetric Crypto PMD device name */
+
 /*
  * This macro rounds up a number to a be a multiple of
  * the alignment when the alignment is a power of 2

diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h
index efb2bbcc7c07e43755fd028fb4e7dad7ec172ac3..a78e9a6feba0a66900f3521a428fcb786c4f64c5 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd_private.h
+++ b/drivers/crypto/scheduler/scheduler_pmd_private.h
@@ -36,6 +36,9 @@
 
 #include "rte_cryptodev_scheduler.h"
 
+#define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
+/**< Scheduler Crypto PMD device name */
+
 #define PER_SLAVE_BUFF_SIZE                    (256)
 
 #define CS_LOG_ERR(fmt, args...)                                       \

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
index 786d4d8ff17b75995a36afd9a3867afca870b0ae..fba3cb866ed119866b92daea96e553d66a62257d 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include <sso_snow3g.h>
 
+#define CRYPTODEV_NAME_SNOW3G_PMD      crypto_snow3g
+/**< SNOW 3G PMD device name */
+
 #define SNOW3G_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \

diff --git a/drivers/crypto/zuc/rte_zuc_pmd_private.h b/drivers/crypto/zuc/rte_zuc_pmd_private.h
index c56c80ffb5695632b866eb1a699516af05dbac9e..b706e0aa2b59441bc7d034757ef8353a2fba528d 100644 (file)
--- a/drivers/crypto/zuc/rte_zuc_pmd_private.h
+++ b/drivers/crypto/zuc/rte_zuc_pmd_private.h
@@ -35,6 +35,9 @@
 
 #include <sso_zuc.h>
 
+#define CRYPTODEV_NAME_ZUC_PMD         crypto_zuc
+/**< KASUMI PMD device name */
+
 #define ZUC_LOG_ERR(fmt, args...) \
        RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
                        RTE_STR(CRYPTODEV_NAME_ZUC_PMD), \

diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index 9c2a37353e44f183e64d25af73b09a241ebaa131..972a3087d7b0439baeef67c2b0a8020faeae2bc3 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -51,29 +51,6 @@ extern "C" {
 #include <rte_common.h>
 #include <rte_vdev.h>
 
-#define CRYPTODEV_NAME_NULL_PMD                crypto_null
-/**< Null crypto PMD device name */
-#define CRYPTODEV_NAME_AESNI_MB_PMD    crypto_aesni_mb
-/**< AES-NI Multi buffer PMD device name */
-#define CRYPTODEV_NAME_AESNI_GCM_PMD   crypto_aesni_gcm
-/**< AES-NI GCM PMD device name */
-#define CRYPTODEV_NAME_OPENSSL_PMD     crypto_openssl
-/**< Open SSL Crypto PMD device name */
-#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
-/**< Intel QAT Symmetric Crypto PMD device name */
-#define CRYPTODEV_NAME_SNOW3G_PMD      crypto_snow3g
-/**< SNOW 3G PMD device name */
-#define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
-/**< KASUMI PMD device name */
-#define CRYPTODEV_NAME_ZUC_PMD         crypto_zuc
-/**< KASUMI PMD device name */
-#define CRYPTODEV_NAME_ARMV8_PMD       crypto_armv8
-/**< ARMv8 Crypto PMD device name */
-#define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
-/**< Scheduler Crypto PMD device name */
-#define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec
-/**< NXP DPAA2 - SEC PMD device name */
-
 extern const char **rte_cyptodev_names;
 
 /* Logging Macros */

diff --git a/test/test/test_cryptodev.h b/test/test/test_cryptodev.h
index c1ddd17f9059fcc2b28693a27686e01929a6e73f..4509a09ad6bb8a6ce1297c7961da32837681dbd5 100644 (file)
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -77,6 +77,18 @@
                sizeof(struct rte_crypto_sym_op) + DEFAULT_NUM_XFORMS * \
                sizeof(struct rte_crypto_sym_xform))
 
+#define CRYPTODEV_NAME_NULL_PMD                crypto_null
+#define CRYPTODEV_NAME_AESNI_MB_PMD    crypto_aesni_mb
+#define CRYPTODEV_NAME_AESNI_GCM_PMD   crypto_aesni_gcm
+#define CRYPTODEV_NAME_OPENSSL_PMD     crypto_openssl
+#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
+#define CRYPTODEV_NAME_SNOW3G_PMD      crypto_snow3g
+#define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
+#define CRYPTODEV_NAME_ZUC_PMD         crypto_zuc
+#define CRYPTODEV_NAME_ARMV8_PMD       crypto_armv8
+#define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec
+#define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
+
 /**
  * Write (spread) data from buffer to mbuf data
  *