bus/fslmc: run secondary debug app without restriction

dpaa2 hw impose limits on some HW access devices like DPMCP(Management
control Port) and DPIO (HW portal). This causes issue in their shared
usages in case of multi-process applications. It can overcome by using
whitelist/blacklist in primary and secondary applications.
However it imposes restrictions on standard debugging apps like
dpdk-procinfo, which can be used to debug any existing application.

This patch introduces reserving extra DPMCP and DPIO to be used by
secondary process if devices are not blocked previously in primary
application.
This leaves the last DPMCP and DPIO for the secondary process usages.

Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
Signed-off-by: Sachin Saxena <sachin.saxena@oss.nxp.com>
Acked-by: Nipun Gupta <nipun.gupta@nxp.com>

diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index fdfa6fd..d656b7f 100644 (file)
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -538,6 +538,19 @@ For blacklisting a DPAA2 device, following commands can be used.
 
 Where x is the device object id as configured in resource container.
 
+Running secondary debug app without blacklist
+---------------------------------------------
+
+dpaa2 hardware imposes limits on some H/W access devices like Management
+Control Port and H/W portal. This causes issue in their shared usages in
+case of multi-process applications. It can overcome by using
+whitelist/blacklist in primary and secondary applications.
+
+In order to ease usage of standard debugging apps like dpdk-procinfo, dpaa2
+driver reserves extra Management Control Port and H/W portal which can be
+used by debug application to debug any existing application without
+blacklisting these devices in primary process.
+
 Limitations
 -----------
 

diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 2e1803a..aba55b4 100644 (file)
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -805,10 +805,29 @@ fslmc_vfio_process_group(void)
        int ret;
        int found_mportal = 0;
        struct rte_dpaa2_device *dev, *dev_temp;
+       bool is_dpmcp_in_blocklist = false, is_dpio_in_blocklist = false;
+       int dpmcp_count = 0, dpio_count = 0, current_device;
+
+       TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
+               if (dev->dev_type == DPAA2_MPORTAL) {
+                       dpmcp_count++;
+                       if (dev->device.devargs &&
+                           dev->device.devargs->policy == RTE_DEV_BLACKLISTED)
+                               is_dpmcp_in_blocklist = true;
+               }
+               if (dev->dev_type == DPAA2_IO) {
+                       dpio_count++;
+                       if (dev->device.devargs &&
+                           dev->device.devargs->policy == RTE_DEV_BLACKLISTED)
+                               is_dpio_in_blocklist = true;
+               }
+       }
 
        /* Search the MCP as that should be initialized first. */
+       current_device = 0;
        TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
                if (dev->dev_type == DPAA2_MPORTAL) {
+                       current_device++;
                        if (dev->device.devargs &&
                            dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {
                                DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping",
@@ -818,13 +837,24 @@ fslmc_vfio_process_group(void)
                                continue;
                        }
 
-                       ret = fslmc_process_mcp(dev);
-                       if (ret) {
-                               DPAA2_BUS_ERR("Unable to map MC Portal");
-                               return -1;
+                       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+                           !is_dpmcp_in_blocklist) {
+                               if (dpmcp_count == 1 ||
+                                   current_device != dpmcp_count) {
+                                       TAILQ_REMOVE(&rte_fslmc_bus.device_list,
+                                                    dev, next);
+                                       continue;
+                               }
                        }
-                       if (!found_mportal)
+
+                       if (!found_mportal) {
+                               ret = fslmc_process_mcp(dev);
+                               if (ret) {
+                                       DPAA2_BUS_ERR("Unable to map MC Portal");
+                                       return -1;
+                               }
                                found_mportal = 1;
+                       }
 
                        TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
                        free(dev);
@@ -841,7 +871,10 @@ fslmc_vfio_process_group(void)
                return -1;
        }
 
+       current_device = 0;
        TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
+               if (dev->dev_type == DPAA2_IO)
+                       current_device++;
                if (dev->device.devargs &&
                    dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {
                        DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping",
@@ -849,6 +882,14 @@ fslmc_vfio_process_group(void)
                        TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
                        continue;
                }
+               if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+                   dev->dev_type != DPAA2_ETH &&
+                   dev->dev_type != DPAA2_CRYPTO &&
+                   dev->dev_type != DPAA2_QDMA &&
+                   dev->dev_type != DPAA2_IO) {
+                       TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
+                       continue;
+               }
                switch (dev->dev_type) {
                case DPAA2_ETH:
                case DPAA2_CRYPTO:
@@ -885,6 +926,21 @@ fslmc_vfio_process_group(void)
 
                        break;
                case DPAA2_IO:
+                       if (!is_dpio_in_blocklist && dpio_count > 1) {
+                               if (rte_eal_process_type() == RTE_PROC_SECONDARY
+                                   && current_device != dpio_count) {
+                                       TAILQ_REMOVE(&rte_fslmc_bus.device_list,
+                                                    dev, next);
+                                       break;
+                               }
+                               if (rte_eal_process_type() == RTE_PROC_PRIMARY
+                                   && current_device == dpio_count) {
+                                       TAILQ_REMOVE(&rte_fslmc_bus.device_list,
+                                                    dev, next);
+                                       break;
+                               }
+                       }
+
                        ret = fslmc_process_iodevices(dev);
                        if (ret) {
                                DPAA2_BUS_DEBUG("Dev (%s) init failed",