crypto/octeontx2: fix multi-process

[dpdk.git] / drivers / crypto / octeontx2 / otx2_cryptodev.c

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c
index efc17cb..1de04f4 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_cryptodev.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev.c
@@ -14,15 +14,17 @@
 
 #include "otx2_common.h"
 #include "otx2_cryptodev.h"
+#include "otx2_cryptodev_capabilities.h"
 #include "otx2_cryptodev_mbox.h"
 #include "otx2_cryptodev_ops.h"
+#include "otx2_cryptodev_sec.h"
 #include "otx2_dev.h"
 
 /* CPT common headers */
 #include "cpt_common.h"
 #include "cpt_pmd_logs.h"
 
-int otx2_cpt_logtype;
+uint8_t otx2_cryptodev_driver_id;
 
 static struct rte_pci_id pci_id_cpt_table[] = {
        {
@@ -68,39 +70,68 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 
        otx2_dev = &vf->otx2_dev;
 
-       /* Initialize the base otx2_dev object */
-       ret = otx2_dev_init(pci_dev, otx2_dev);
-       if (ret) {
-               CPT_LOG_ERR("Could not initialize otx2_dev");
-               goto pmd_destroy;
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               /* Initialize the base otx2_dev object */
+               ret = otx2_dev_init(pci_dev, otx2_dev);
+               if (ret) {
+                       CPT_LOG_ERR("Could not initialize otx2_dev");
+                       goto pmd_destroy;
+               }
+
+               /* Get number of queues available on the device */
+               ret = otx2_cpt_available_queues_get(dev, &nb_queues);
+               if (ret) {
+                       CPT_LOG_ERR("Could not determine the number of queues available");
+                       goto otx2_dev_fini;
+               }
+
+               /* Don't exceed the limits set per VF */
+               nb_queues = RTE_MIN(nb_queues, OTX2_CPT_MAX_QUEUES_PER_VF);
+
+               if (nb_queues == 0) {
+                       CPT_LOG_ERR("No free queues available on the device");
+                       goto otx2_dev_fini;
+               }
+
+               vf->max_queues = nb_queues;
+
+               CPT_LOG_INFO("Max queues supported by device: %d",
+                               vf->max_queues);
+
+               ret = otx2_cpt_hardware_caps_get(dev, vf->hw_caps);
+               if (ret) {
+                       CPT_LOG_ERR("Could not determine hardware capabilities");
+                       goto otx2_dev_fini;
+               }
        }
 
-       /* Get number of queues available on the device */
-       ret = otx2_cpt_available_queues_get(dev, &nb_queues);
-       if (ret) {
-               CPT_LOG_ERR("Could not determine the number of queues available");
-               goto otx2_dev_fini;
-       }
-
-       /* Don't exceed the limits set per VF */
-       nb_queues = RTE_MIN(nb_queues, OTX2_CPT_MAX_QUEUES_PER_VF);
+       otx2_crypto_capabilities_init(vf->hw_caps);
+       otx2_crypto_sec_capabilities_init(vf->hw_caps);
 
-       if (nb_queues == 0) {
-               CPT_LOG_ERR("No free queues available on the device");
+       /* Create security ctx */
+       ret = otx2_crypto_sec_ctx_create(dev);
+       if (ret)
                goto otx2_dev_fini;
-       }
-
-       vf->max_queues = nb_queues;
-
-       CPT_LOG_INFO("Max queues supported by device: %d", vf->max_queues);
 
        dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
-                            RTE_CRYPTODEV_FF_HW_ACCELERATED;
+                            RTE_CRYPTODEV_FF_HW_ACCELERATED |
+                            RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+                            RTE_CRYPTODEV_FF_IN_PLACE_SGL |
+                            RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
+                            RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |
+                            RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |
+                            RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |
+                            RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
+                            RTE_CRYPTODEV_FF_SECURITY;
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+               otx2_cpt_set_enqdeq_fns(dev);
 
        return 0;
 
 otx2_dev_fini:
-       otx2_dev_fini(pci_dev, otx2_dev);
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               otx2_dev_fini(pci_dev, otx2_dev);
 pmd_destroy:
        rte_cryptodev_pmd_destroy(dev);
 exit:
@@ -124,6 +155,9 @@ otx2_cpt_pci_remove(struct rte_pci_device *pci_dev)
        if (dev == NULL)
                return -ENODEV;
 
+       /* Destroy security ctx */
+       otx2_crypto_sec_ctx_destroy(dev);
+
        return rte_cryptodev_pmd_destroy(dev);
 }
 
@@ -136,16 +170,9 @@ static struct rte_pci_driver otx2_cryptodev_pmd = {
 
 static struct cryptodev_driver otx2_cryptodev_drv;
 
-RTE_INIT(otx2_cpt_init_log);
 RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_OCTEONTX2_PMD, otx2_cryptodev_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(CRYPTODEV_NAME_OCTEONTX2_PMD, pci_id_cpt_table);
+RTE_PMD_REGISTER_KMOD_DEP(CRYPTODEV_NAME_OCTEONTX2_PMD, "vfio-pci");
 RTE_PMD_REGISTER_CRYPTO_DRIVER(otx2_cryptodev_drv, otx2_cryptodev_pmd.driver,
                otx2_cryptodev_driver_id);
-
-RTE_INIT(otx2_cpt_init_log)
-{
-       /* Bus level logs */
-       otx2_cpt_logtype = rte_log_register("pmd.crypto.octeontx2");
-       if (otx2_cpt_logtype >= 0)
-               rte_log_set_level(otx2_cpt_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(otx2_cpt_logtype, pmd.crypto.octeontx2, NOTICE);