net/mlx5: add flow action functions to glue

[dpdk.git] / drivers / bus / fslmc / fslmc_vfio.c

diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 3800c26..493b6e5 100644 (file)
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -194,7 +194,8 @@ static int fslmc_map_dma(uint64_t vaddr, rte_iova_t iovaddr, size_t len);
 static int fslmc_unmap_dma(uint64_t vaddr, rte_iova_t iovaddr, size_t len);
 
 static void
-fslmc_memevent_cb(enum rte_mem_event type, const void *addr, size_t len)
+fslmc_memevent_cb(enum rte_mem_event type, const void *addr, size_t len,
+               void *arg __rte_unused)
 {
        struct rte_memseg_list *msl;
        struct rte_memseg *ms;
@@ -220,6 +221,13 @@ fslmc_memevent_cb(enum rte_mem_event type, const void *addr, size_t len)
                                        "alloc" : "dealloc",
                                va, virt_addr, iova_addr, map_len);
 
+               /* iova_addr may be set to RTE_BAD_IOVA */
+               if (iova_addr == RTE_BAD_IOVA) {
+                       DPAA2_BUS_DEBUG("Segment has invalid iova, skipping\n");
+                       cur_len += map_len;
+                       continue;
+               }
+
                if (type == RTE_MEM_EVENT_ALLOC)
                        ret = fslmc_map_dma(virt_addr, iova_addr, map_len);
                else
@@ -317,11 +325,15 @@ fslmc_unmap_dma(uint64_t vaddr, uint64_t iovaddr __rte_unused, size_t len)
 
 static int
 fslmc_dmamap_seg(const struct rte_memseg_list *msl __rte_unused,
-                const struct rte_memseg *ms, void *arg)
+               const struct rte_memseg *ms, void *arg)
 {
        int *n_segs = arg;
        int ret;
 
+       /* if IOVA address is invalid, skip */
+       if (ms->iova == RTE_BAD_IOVA)
+               return 0;
+
        ret = fslmc_map_dma(ms->addr_64, ms->iova, ms->len);
        if (ret)
                DPAA2_BUS_ERR("Unable to VFIO map (addr=%p, len=%zu)",
@@ -347,7 +359,7 @@ int rte_fslmc_vfio_dmamap(void)
        }
 
        ret = rte_mem_event_callback_register("fslmc_memevent_clb",
-                                             fslmc_memevent_cb);
+                       fslmc_memevent_cb, NULL);
        if (ret && rte_errno == ENOTSUP)
                DPAA2_BUS_DEBUG("Memory event callbacks not supported");
        else if (ret)
@@ -401,9 +413,6 @@ static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj)
                goto MC_FAILURE;
        }
 
-       DPAA2_BUS_DEBUG("Region offset = 0x%"PRIx64"  , region size = %"PRIu64"",
-                       (uint64_t)reg_info.offset, (uint64_t)reg_info.size);
-
        v_addr = (size_t)mmap(NULL, reg_info.size,
                PROT_WRITE | PROT_READ, MAP_SHARED,
                mc_fd, reg_info.offset);
@@ -563,46 +572,47 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
                break;
        }
 
-       DPAA2_BUS_DEBUG("Device (%s) abstracted from VFIO",
-                       dev->device.name);
+       DPAA2_BUS_LOG(DEBUG, "Device (%s) abstracted from VFIO",
+                     dev->device.name);
        return 0;
 }
 
 static int
 fslmc_process_mcp(struct rte_dpaa2_device *dev)
 {
+       int ret;
        intptr_t v_addr;
-       char *dev_name;
+       char *dev_name = NULL;
        struct fsl_mc_io dpmng  = {0};
        struct mc_version mc_ver_info = {0};
 
        rte_mcp_ptr_list = malloc(sizeof(void *) * 1);
        if (!rte_mcp_ptr_list) {
                DPAA2_BUS_ERR("Unable to allocate MC portal memory");
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto cleanup;
        }
 
        dev_name = strdup(dev->device.name);
        if (!dev_name) {
                DPAA2_BUS_ERR("Unable to allocate MC device name memory");
-               free(rte_mcp_ptr_list);
-               rte_mcp_ptr_list = NULL;
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto cleanup;
        }
 
        v_addr = vfio_map_mcp_obj(&vfio_group, dev_name);
        if (v_addr == (intptr_t)MAP_FAILED) {
                DPAA2_BUS_ERR("Error mapping region (errno = %d)", errno);
-               free(rte_mcp_ptr_list);
-               rte_mcp_ptr_list = NULL;
-               return -1;
+               ret = -1;
+               goto cleanup;
        }
 
        /* check the MC version compatibility */
        dpmng.regs = (void *)v_addr;
        if (mc_get_version(&dpmng, CMD_PRI_LOW, &mc_ver_info)) {
                DPAA2_BUS_ERR("Unable to obtain MC version");
-               return -1;
+               ret = -1;
+               goto cleanup;
        }
 
        if ((mc_ver_info.major != MC_VER_MAJOR) ||
@@ -612,13 +622,24 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)
                              MC_VER_MAJOR, MC_VER_MINOR,
                              mc_ver_info.major, mc_ver_info.minor,
                              mc_ver_info.revision);
-               free(rte_mcp_ptr_list);
-               rte_mcp_ptr_list = NULL;
-               return -1;
+               ret = -1;
+               goto cleanup;
        }
        rte_mcp_ptr_list[0] = (void *)v_addr;
 
+       free(dev_name);
        return 0;
+
+cleanup:
+       if (dev_name)
+               free(dev_name);
+
+       if (rte_mcp_ptr_list) {
+               free(rte_mcp_ptr_list);
+               rte_mcp_ptr_list = NULL;
+       }
+
+       return ret;
 }
 
 int
@@ -655,9 +676,6 @@ fslmc_vfio_process_group(void)
        }
 
        TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
-               if (!dev)
-                       break;
-
                switch (dev->dev_type) {
                case DPAA2_ETH:
                case DPAA2_CRYPTO: