d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cryptodev: remove crypto device driver name

Browse Source 
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>
This commit is contained in:
Slawomir Mrozowicz 2017-05-22 15:54:30 +02:00 committed by Pablo de Lara
parent 7a364faef1
commit a3277ad47f
15 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guides/rel_notes/deprecation.rst
View File

@ -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.

2
doc/guides/rel_notes/release_17_08.rst
View File

@ -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

3
drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h
View File

@ -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), \

3
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h
View File

@ -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), \

3
drivers/crypto/armv8/rte_armv8_pmd_private.h
View File

@ -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), \

3
drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
View File

@ -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 */

3
drivers/crypto/kasumi/rte_kasumi_pmd_private.h
View File

@ -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), \

3
drivers/crypto/null/null_crypto_pmd_private.h
View File

@ -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), \

2
drivers/crypto/openssl/rte_openssl_pmd_private.h
View File

@ -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", \

3
drivers/crypto/qat/qat_crypto.h
View File

@ -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

3
drivers/crypto/scheduler/scheduler_pmd_private.h
View File

@ -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...) \

3
drivers/crypto/snow3g/rte_snow3g_pmd_private.h
View File

@ -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), \

3
drivers/crypto/zuc/rte_zuc_pmd_private.h
View File

@ -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), \

23
lib/librte_cryptodev/rte_cryptodev.h
View File

@ -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 */

12
test/test/test_cryptodev.h
View File

@ -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
*