From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v3 09/13] cryptodev: move PCI specific helpers to drivers/crypto
Date: Mon, 25 Sep 2017 17:24:06 +0200 [thread overview]
Message-ID: <648c5b195a7d3c98eeb6284e2bbb729cc3fb5407.1506352672.git.gaetan.rivet@6wind.com> (raw)
In-Reply-To: <cover.1506352670.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1506352670.git.gaetan.rivet@6wind.com>
Those helpers rely on the PCI bus driver implementation.
Other similar libraries relied on the bus-specifics being handled in
inlined functions, to be compiled on demand by drivers, once the proper
PCI dependency has been settled. This seems unsafe.
Move the PCI-specific helpers out of the lib directory to the
drivers/crypto directory, properly following the dependency hierarchy.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/Makefile | 2 +-
drivers/crypto/Makefile | 4 +-
drivers/crypto/pci/Makefile | 52 +++++++++
drivers/crypto/pci/rte_cryptodev_pci.c | 128 +++++++++++++++++++++++
drivers/crypto/pci/rte_cryptodev_pci.h | 94 +++++++++++++++++
drivers/crypto/pci/rte_cryptodev_pci_version.map | 7 ++
lib/librte_cryptodev/Makefile | 1 -
lib/librte_cryptodev/rte_cryptodev_pci.h | 92 ----------------
lib/librte_cryptodev/rte_cryptodev_pmd.c | 94 -----------------
lib/librte_cryptodev/rte_cryptodev_version.map | 2 -
10 files changed, 285 insertions(+), 191 deletions(-)
create mode 100644 drivers/crypto/pci/Makefile
create mode 100644 drivers/crypto/pci/rte_cryptodev_pci.c
create mode 100644 drivers/crypto/pci/rte_cryptodev_pci.h
create mode 100644 drivers/crypto/pci/rte_cryptodev_pci_version.map
delete mode 100644 lib/librte_cryptodev/rte_cryptodev_pci.h
diff --git a/drivers/Makefile b/drivers/Makefile
index 7fef66d..a5d3fa0 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -37,7 +37,7 @@ DEPDIRS-mempool := bus
DIRS-y += net
DEPDIRS-net := bus mempool
DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
-DEPDIRS-crypto := mempool
+DEPDIRS-crypto := bus mempool
DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event
DEPDIRS-event := bus
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 7a719b9..cfd6cb6 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -33,6 +33,8 @@ include $(RTE_SDK)/mk/rte.vars.mk
core-libs := librte_eal librte_mbuf librte_mempool librte_ring librte_cryptodev
+DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci
+DEPDIRS-pci = $(core-libs)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm
DEPDIRS-aesni_gcm = $(core-libs)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb
@@ -42,7 +44,7 @@ DEPDIRS-armv8 = $(core-libs)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl
DEPDIRS-openssl = $(core-libs)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat
-DEPDIRS-qat = $(core-libs)
+DEPDIRS-qat = $(core-libs) librte_cryptodev_pci
DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler
DEPDIRS-scheduler = $(core-libs) librte_kvargs librte_reorder
DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g
diff --git a/drivers/crypto/pci/Makefile b/drivers/crypto/pci/Makefile
new file mode 100644
index 0000000..da819f2
--- /dev/null
+++ b/drivers/crypto/pci/Makefile
@@ -0,0 +1,52 @@
+# BSD LICENSE
+#
+# Copyright(c) 2017 6WIND S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of 6WIND S.A. nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+# library name
+LIB = librte_cryptodev_pci.a
+
+# library version
+LIBABIVER := 1
+
+# build flags
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+
+# library source files
+SRCS-y += rte_cryptodev_pci.c
+
+# export include files
+SYMLINK-y-include += rte_cryptodev_pci.h
+
+# versioning export map
+EXPORT_MAP := rte_cryptodev_pci_version.map
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/pci/rte_cryptodev_pci.c b/drivers/crypto/pci/rte_cryptodev_pci.c
new file mode 100644
index 0000000..a2a1366
--- /dev/null
+++ b/drivers/crypto/pci/rte_cryptodev_pci.c
@@ -0,0 +1,128 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 6WIND S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <rte_malloc.h>
+
+#include "rte_cryptodev_pci.h"
+
+int
+rte_cryptodev_pci_generic_probe(struct rte_pci_device *pci_dev,
+ size_t private_data_size,
+ cryptodev_pci_init_t dev_init)
+{
+ struct rte_cryptodev *cryptodev;
+
+ char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
+
+ int retval;
+
+ rte_pci_device_name(&pci_dev->addr, cryptodev_name,
+ sizeof(cryptodev_name));
+
+ cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id());
+ if (cryptodev == NULL)
+ return -ENOMEM;
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ cryptodev->data->dev_private =
+ rte_zmalloc_socket(
+ "cryptodev private structure",
+ private_data_size,
+ RTE_CACHE_LINE_SIZE,
+ rte_socket_id());
+
+ if (cryptodev->data->dev_private == NULL)
+ rte_panic("Cannot allocate memzone for private "
+ "device data");
+ }
+
+ cryptodev->device = &pci_dev->device;
+
+ /* init user callbacks */
+ TAILQ_INIT(&(cryptodev->link_intr_cbs));
+
+ /* Invoke PMD device initialization function */
+ RTE_FUNC_PTR_OR_ERR_RET(*dev_init, -EINVAL);
+ retval = dev_init(cryptodev);
+ if (retval == 0)
+ return 0;
+
+ CDEV_LOG_ERR("driver %s: crypto_dev_init(vendor_id=0x%x device_id=0x%x)"
+ " failed", pci_dev->device.driver->name,
+ (unsigned int) pci_dev->id.vendor_id,
+ (unsigned int) pci_dev->id.device_id);
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ rte_free(cryptodev->data->dev_private);
+
+ /* free crypto device */
+ rte_cryptodev_pmd_release_device(cryptodev);
+
+ return -ENXIO;
+}
+
+int
+rte_cryptodev_pci_generic_remove(struct rte_pci_device *pci_dev,
+ cryptodev_pci_uninit_t dev_uninit)
+{
+ struct rte_cryptodev *cryptodev;
+ char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
+ int ret;
+
+ if (pci_dev == NULL)
+ return -EINVAL;
+
+ rte_pci_device_name(&pci_dev->addr, cryptodev_name,
+ sizeof(cryptodev_name));
+
+ cryptodev = rte_cryptodev_pmd_get_named_dev(cryptodev_name);
+ if (cryptodev == NULL)
+ return -ENODEV;
+
+ /* Invoke PMD device uninit function */
+ if (dev_uninit) {
+ ret = dev_uninit(cryptodev);
+ if (ret)
+ return ret;
+ }
+
+ /* free crypto device */
+ rte_cryptodev_pmd_release_device(cryptodev);
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ rte_free(cryptodev->data->dev_private);
+
+ cryptodev->device = NULL;
+ cryptodev->data = NULL;
+
+ return 0;
+}
diff --git a/drivers/crypto/pci/rte_cryptodev_pci.h b/drivers/crypto/pci/rte_cryptodev_pci.h
new file mode 100644
index 0000000..97b6f1e
--- /dev/null
+++ b/drivers/crypto/pci/rte_cryptodev_pci.h
@@ -0,0 +1,94 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_CRYPTODEV_PCI_H_
+#define _RTE_CRYPTODEV_PCI_H_
+
+#include <rte_pci.h>
+#include <rte_bus_pci.h>
+#include <rte_cryptodev.h>
+#include <rte_cryptodev_pmd.h>
+
+/**
+ * Initialisation function of a crypto driver invoked for each matching
+ * crypto PCI device detected during the PCI probing phase.
+ *
+ * @param dev The dev pointer is the address of the *rte_cryptodev*
+ * structure associated with the matching device and which
+ * has been [automatically] allocated in the
+ * *rte_crypto_devices* array.
+ *
+ * @return
+ * - 0: Success, the device is properly initialised by the driver.
+ * In particular, the driver MUST have set up the *dev_ops* pointer
+ * of the *dev* structure.
+ * - <0: Error code of the device initialisation failure.
+ */
+typedef int (*cryptodev_pci_init_t)(struct rte_cryptodev *dev);
+
+/**
+ * Finalisation function of a driver invoked for each matching
+ * PCI device detected during the PCI closing phase.
+ *
+ * @param dev The dev pointer is the address of the *rte_cryptodev*
+ * structure associated with the matching device and which
+ * has been [automatically] allocated in the
+ * *rte_crypto_devices* array.
+ *
+ * * @return
+ * - 0: Success, the device is properly finalised by the driver.
+ * In particular, the driver MUST free the *dev_ops* pointer
+ * of the *dev* structure.
+ * - <0: Error code of the device initialisation failure.
+ */
+typedef int (*cryptodev_pci_uninit_t)(struct rte_cryptodev *dev);
+
+/**
+ * @internal
+ * Wrapper for use by pci drivers as a .probe function to attach to a crypto
+ * interface.
+ */
+int
+rte_cryptodev_pci_generic_probe(struct rte_pci_device *pci_dev,
+ size_t private_data_size,
+ cryptodev_pci_init_t dev_init);
+
+/**
+ * @internal
+ * Wrapper for use by pci drivers as a .remove function to detach a crypto
+ * interface.
+ */
+int
+rte_cryptodev_pci_generic_remove(struct rte_pci_device *pci_dev,
+ cryptodev_pci_uninit_t dev_uninit);
+
+#endif /* _RTE_CRYPTODEV_PCI_H_ */
diff --git a/drivers/crypto/pci/rte_cryptodev_pci_version.map b/drivers/crypto/pci/rte_cryptodev_pci_version.map
new file mode 100644
index 0000000..0510fef
--- /dev/null
+++ b/drivers/crypto/pci/rte_cryptodev_pci_version.map
@@ -0,0 +1,7 @@
+DPDK_17.11 {
+ global:
+
+ rte_cryptodev_pci_generic_probe;
+ rte_cryptodev_pci_generic_remove;
+
+};
diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile
index 6ac331b..bd94cf7 100644
--- a/lib/librte_cryptodev/Makefile
+++ b/lib/librte_cryptodev/Makefile
@@ -49,7 +49,6 @@ SYMLINK-y-include += rte_crypto_sym.h
SYMLINK-y-include += rte_cryptodev.h
SYMLINK-y-include += rte_cryptodev_pmd.h
SYMLINK-y-include += rte_cryptodev_vdev.h
-SYMLINK-y-include += rte_cryptodev_pci.h
# versioning export map
EXPORT_MAP := rte_cryptodev_version.map
diff --git a/lib/librte_cryptodev/rte_cryptodev_pci.h b/lib/librte_cryptodev/rte_cryptodev_pci.h
deleted file mode 100644
index 67eda96..0000000
--- a/lib/librte_cryptodev/rte_cryptodev_pci.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2017 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RTE_CRYPTODEV_PCI_H_
-#define _RTE_CRYPTODEV_PCI_H_
-
-#include <rte_pci.h>
-#include "rte_cryptodev.h"
-
-/**
- * Initialisation function of a crypto driver invoked for each matching
- * crypto PCI device detected during the PCI probing phase.
- *
- * @param dev The dev pointer is the address of the *rte_cryptodev*
- * structure associated with the matching device and which
- * has been [automatically] allocated in the
- * *rte_crypto_devices* array.
- *
- * @return
- * - 0: Success, the device is properly initialised by the driver.
- * In particular, the driver MUST have set up the *dev_ops* pointer
- * of the *dev* structure.
- * - <0: Error code of the device initialisation failure.
- */
-typedef int (*cryptodev_pci_init_t)(struct rte_cryptodev *dev);
-
-/**
- * Finalisation function of a driver invoked for each matching
- * PCI device detected during the PCI closing phase.
- *
- * @param dev The dev pointer is the address of the *rte_cryptodev*
- * structure associated with the matching device and which
- * has been [automatically] allocated in the
- * *rte_crypto_devices* array.
- *
- * * @return
- * - 0: Success, the device is properly finalised by the driver.
- * In particular, the driver MUST free the *dev_ops* pointer
- * of the *dev* structure.
- * - <0: Error code of the device initialisation failure.
- */
-typedef int (*cryptodev_pci_uninit_t)(struct rte_cryptodev *dev);
-
-/**
- * @internal
- * Wrapper for use by pci drivers as a .probe function to attach to a crypto
- * interface.
- */
-int
-rte_cryptodev_pci_generic_probe(struct rte_pci_device *pci_dev,
- size_t private_data_size,
- cryptodev_pci_init_t dev_init);
-
-/**
- * @internal
- * Wrapper for use by pci drivers as a .remove function to detach a crypto
- * interface.
- */
-int
-rte_cryptodev_pci_generic_remove(struct rte_pci_device *pci_dev,
- cryptodev_pci_uninit_t dev_uninit);
-
-#endif /* _RTE_CRYPTODEV_PCI_H_ */
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c
index a57faad..ec5c33b 100644
--- a/lib/librte_cryptodev/rte_cryptodev_pmd.c
+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c
@@ -33,7 +33,6 @@
#include <rte_malloc.h>
#include "rte_cryptodev_vdev.h"
-#include "rte_cryptodev_pci.h"
#include "rte_cryptodev_pmd.h"
/**
@@ -154,96 +153,3 @@ rte_cryptodev_vdev_parse_init_params(struct rte_crypto_vdev_init_params *params,
rte_kvargs_free(kvlist);
return ret;
}
-
-int
-rte_cryptodev_pci_generic_probe(struct rte_pci_device *pci_dev,
- size_t private_data_size,
- cryptodev_pci_init_t dev_init)
-{
- struct rte_cryptodev *cryptodev;
-
- char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
-
- int retval;
-
- rte_pci_device_name(&pci_dev->addr, cryptodev_name,
- sizeof(cryptodev_name));
-
- cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id());
- if (cryptodev == NULL)
- return -ENOMEM;
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- cryptodev->data->dev_private =
- rte_zmalloc_socket(
- "cryptodev private structure",
- private_data_size,
- RTE_CACHE_LINE_SIZE,
- rte_socket_id());
-
- if (cryptodev->data->dev_private == NULL)
- rte_panic("Cannot allocate memzone for private "
- "device data");
- }
-
- cryptodev->device = &pci_dev->device;
-
- /* init user callbacks */
- TAILQ_INIT(&(cryptodev->link_intr_cbs));
-
- /* Invoke PMD device initialization function */
- RTE_FUNC_PTR_OR_ERR_RET(*dev_init, -EINVAL);
- retval = dev_init(cryptodev);
- if (retval == 0)
- return 0;
-
- CDEV_LOG_ERR("driver %s: crypto_dev_init(vendor_id=0x%x device_id=0x%x)"
- " failed", pci_dev->device.driver->name,
- (unsigned int) pci_dev->id.vendor_id,
- (unsigned int) pci_dev->id.device_id);
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- rte_free(cryptodev->data->dev_private);
-
- /* free crypto device */
- rte_cryptodev_pmd_release_device(cryptodev);
-
- return -ENXIO;
-}
-
-int
-rte_cryptodev_pci_generic_remove(struct rte_pci_device *pci_dev,
- cryptodev_pci_uninit_t dev_uninit)
-{
- struct rte_cryptodev *cryptodev;
- char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
- int ret;
-
- if (pci_dev == NULL)
- return -EINVAL;
-
- rte_pci_device_name(&pci_dev->addr, cryptodev_name,
- sizeof(cryptodev_name));
-
- cryptodev = rte_cryptodev_pmd_get_named_dev(cryptodev_name);
- if (cryptodev == NULL)
- return -ENODEV;
-
- /* Invoke PMD device uninit function */
- if (dev_uninit) {
- ret = dev_uninit(cryptodev);
- if (ret)
- return ret;
- }
-
- /* free crypto device */
- rte_cryptodev_pmd_release_device(cryptodev);
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- rte_free(cryptodev->data->dev_private);
-
- cryptodev->device = NULL;
- cryptodev->data = NULL;
-
- return 0;
-}
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index e9ba88a..496253d 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -68,8 +68,6 @@ DPDK_17.08 {
rte_cryptodev_get_aead_algo_enum;
rte_cryptodev_get_header_session_size;
rte_cryptodev_get_private_session_size;
- rte_cryptodev_pci_generic_probe;
- rte_cryptodev_pci_generic_remove;
rte_cryptodev_sym_capability_check_aead;
rte_cryptodev_sym_session_init;
rte_cryptodev_sym_session_clear;
--
2.1.4
next prev parent reply other threads:[~2017-09-25 15:24 UTC|newest]
Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 9:04 [dpdk-dev] [PATCH 00/13] Move PCI away from the EAL Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 01/13] eal: expose rte_eal_using_phys_addrs Gaetan Rivet
2017-09-04 13:24 ` Burakov, Anatoly
2017-08-25 9:04 ` [dpdk-dev] [PATCH 02/13] ethdev: remove useless PCI dependency Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 03/13] bus: properly include rte_debug Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 04/13] eal: remove references to PCI Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 05/13] pci: introduce PCI lib and bus Gaetan Rivet
2017-08-25 9:31 ` Luca Boccassi
2017-08-25 9:34 ` Gaëtan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 06/13] pci: avoid inlining functions Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 07/13] pci: avoid over-complicated macro Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 08/13] pci: deprecate misnamed functions Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 09/13] lib: include rte_bus_pci Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 10/13] drivers: " Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 11/13] test: " Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 12/13] app/testpmd: " Gaetan Rivet
2017-08-25 9:04 ` [dpdk-dev] [PATCH 13/13] cryptodev: move PCI specific helpers to drivers/crypto Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 00/14] Move PCI away from the EAL Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 01/14] eal: expose rte_eal_using_phys_addrs Gaetan Rivet
2017-09-18 10:47 ` Shreyansh Jain
2017-09-18 11:37 ` Gaëtan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 02/14] ethdev: remove useless PCI dependency Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 03/14] bus: properly include rte_debug Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 04/14] eal: remove references to PCI Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 05/14] pci: introduce PCI lib and bus Gaetan Rivet
2017-09-18 11:53 ` Shreyansh Jain
2017-09-18 11:51 ` Gaëtan Rivet
2017-09-18 12:18 ` Shreyansh Jain
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 06/14] lib: include rte_bus_pci Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 07/14] drivers: " Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 08/14] test: " Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 09/14] app/testpmd: " Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 10/14] cryptodev: move PCI specific helpers to drivers/crypto Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 11/14] pci: avoid inlining functions Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 12/14] pci: avoid over-complicated macro Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 13/14] pci: deprecate misnamed functions Gaetan Rivet
2017-09-18 9:31 ` [dpdk-dev] [PATCH v2 14/14] doc: add notes on EAL PCI API update Gaetan Rivet
2017-09-18 11:22 ` Mcnamara, John
2017-09-25 15:23 ` [dpdk-dev] [PATCH v3 00/13] Move PCI away from the EAL Gaetan Rivet
2017-09-25 15:23 ` [dpdk-dev] [PATCH v3 01/13] eal: expose rte_eal_using_phys_addrs Gaetan Rivet
2017-09-25 15:23 ` [dpdk-dev] [PATCH v3 02/13] ethdev: remove useless PCI dependency Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 03/13] bus: properly include rte_debug Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 04/13] pci: introduce PCI lib and bus Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 05/13] lib: include rte_bus_pci Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 06/13] drivers: " Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 07/13] test: " Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 08/13] app/testpmd: " Gaetan Rivet
2017-09-25 15:24 ` Gaetan Rivet [this message]
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 10/13] pci: avoid inlining functions Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 11/13] pci: avoid over-complicated macro Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 12/13] pci: deprecate misnamed functions Gaetan Rivet
2017-09-25 15:24 ` [dpdk-dev] [PATCH v3 13/13] doc: add notes on EAL PCI API update Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 00/16] Move PCI away from the EAL Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 01/16] eal: include debug header in bus source Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 02/16] ethdev: remove useless PCI dependency Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 03/16] pci: introduce PCI lib and bus Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 04/16] lib: include PCI bus header Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 05/16] drivers: " Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 06/16] test: " Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 07/16] app/testpmd: " Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 08/16] cryptodev: move PCI specific helpers to drivers/crypto Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 09/16] net/bonding: use local prefix for local function Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 10/16] pci: avoid inlining functions Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 11/16] pci: avoid over-complicated macro Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 12/16] pci: deprecate misnamed functions Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 13/16] pci: introduce PCI address parsing function Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 14/16] pci: make specialized parsing functions private Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 15/16] bus/pci: use new PCI addr parsing function Gaetan Rivet
2017-10-12 8:17 ` [dpdk-dev] [PATCH v4 16/16] doc: add notes on EAL PCI API update Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 00/20] Move PCI away from the EAL Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 01/20] eal: include debug header in bus source Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 02/20] ethdev: remove useless PCI dependency Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 03/20] pci: introduce PCI lib and bus Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 04/20] lib: include PCI bus header Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 05/20] drivers: " Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 06/20] test: " Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 07/20] app/testpmd: " Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 08/20] cryptodev: move PCI specific helpers to drivers/crypto Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 09/20] net/bonding: use local prefix for local function Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 10/20] pci: avoid inlining functions Gaetan Rivet
2017-10-17 18:20 ` Aaron Conole
2017-10-18 8:54 ` Gaëtan Rivet
2017-10-18 14:30 ` Aaron Conole
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 11/20] pci: avoid over-complicated macro Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 12/20] pci: deprecate misnamed functions Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 13/20] pci: introduce PCI address parsing function Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 14/20] pci: make specialized parsing functions private Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 15/20] bus/pci: use new PCI addr parsing function Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 16/20] bus/pci: do not expose private functions Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 17/20] bus/pci: do not expose PCI match function Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 18/20] bus/pci: do not expose IOVA mode getter Gaetan Rivet
2017-10-12 10:54 ` Gaëtan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 19/20] doc: add notes on EAL PCI API update Gaetan Rivet
2017-10-12 10:45 ` [dpdk-dev] [PATCH v5 20/20] bus: rename scan policy as probe policy Gaetan Rivet
2017-10-12 10:55 ` Gaëtan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 00/25] Move PCI away from the EAL Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 01/25] ethdev: remove useless PCI dependency Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 02/25] eal: include debug header in bus source Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 03/25] eal: include stdint in private header Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 04/25] eal: include common header Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 05/25] eal: expose rte_eal_using_phys_addrs Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 06/25] eal: expose internal config elements Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 07/25] eal: expose vfio symbols Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 08/25] vfio: remove useless PCI headers and add vfio one Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 09/25] vfio: check PCI dependency from within PCI code Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 10/25] vfio: move PCI-related functions out of vfio header Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 11/25] pci: avoid inlining functions Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 12/25] pci: avoid over-complicated macro Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 13/25] pci: deprecate misnamed functions Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 14/25] pci: introduce PCI address parsing function Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 15/25] pci: make specialized parsing functions private Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 16/25] pci: use new PCI addr comparison function Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 17/25] pci: use new PCI addr parsing function Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 18/25] pci: do not expose private functions Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 19/25] pci: do not expose PCI match function Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 20/25] pci: do not expose IOVA mode getter Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 21/25] pci: use EAL exposed configuration Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 22/25] net/bonding: use local prefix for local function Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 23/25] pci: introduce PCI lib and bus Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 24/25] doc: add notes on EAL PCI API update Gaetan Rivet
2017-10-25 22:38 ` [dpdk-dev] [PATCH v7 25/25] maintainers: claim maintainership of PCI lib Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 00/25] Move PCI away from the EAL Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 01/25] ethdev: remove useless PCI dependency Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 02/25] eal: include debug header in bus source Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 03/25] eal: include stdint in private header Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 04/25] eal: include common header Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 05/25] eal: expose rte_eal_using_phys_addrs Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 06/25] eal: expose internal config elements Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 07/25] eal: expose vfio symbols Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 08/25] vfio: remove useless PCI headers Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 09/25] vfio: check PCI dependency from within PCI code Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 10/25] vfio: move PCI-related symbols out of vfio header Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 11/25] pci: avoid inlining functions Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 12/25] pci: avoid over-complicated macro Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 13/25] pci: deprecate misnamed functions Gaetan Rivet
2017-10-26 10:05 ` [dpdk-dev] [PATCH v8 14/25] pci: introduce PCI address parsing function Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 15/25] pci: make specialized parsing functions private Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 16/25] pci: use new PCI addr comparison function Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 17/25] pci: use new PCI addr parsing function Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 18/25] pci: do not expose private functions Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 19/25] pci: do not expose PCI match function Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 20/25] pci: do not expose IOVA mode getter Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 21/25] pci: use EAL exposed configuration Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 22/25] net/bonding: use local prefix for local function Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 23/25] pci: introduce PCI lib and bus Gaetan Rivet
2017-10-26 15:56 ` Thomas Monjalon
2017-10-26 17:44 ` Thomas Monjalon
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 24/25] doc: add notes on EAL PCI API update Gaetan Rivet
2017-10-26 10:06 ` [dpdk-dev] [PATCH v8 25/25] maintainers: claim maintainership of PCI lib Gaetan Rivet
2017-10-26 21:23 ` [dpdk-dev] [PATCH v8 00/25] Move PCI away from the EAL Thomas Monjalon
2017-10-29 16:47 ` Andrew Rybchenko
2017-10-30 5:16 ` Gaëtan Rivet
2017-10-11 14:19 ` [dpdk-dev] [PATCH v2 00/14] " Doherty, Declan
2017-10-11 14:32 ` Gaëtan Rivet
2017-10-23 8:44 ` De Lara Guarch, Pablo
2017-10-23 8:49 ` Gaëtan Rivet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=648c5b195a7d3c98eeb6284e2bbb729cc3fb5407.1506352672.git.gaetan.rivet@6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).