eal: compute IOVA mode based on PA availability

[dpdk.git] / lib / librte_eal / freebsd / eal / eal.c

diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index 2c77a86..a8b9b8b 100644 (file)
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -288,10 +288,11 @@ rte_eal_config_attach(void)
        }
 
        rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
-                               PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
-       close(mem_cfg_fd);
-       mem_cfg_fd = -1;
+                               PROT_READ, MAP_SHARED, mem_cfg_fd, 0);
+       /* don't close the fd here, it will be closed on reattach */
        if (rte_mem_cfg_addr == MAP_FAILED) {
+               close(mem_cfg_fd);
+               mem_cfg_fd = -1;
                RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config! error %i (%s)\n",
                        errno, strerror(errno));
                return -1;
@@ -302,6 +303,46 @@ rte_eal_config_attach(void)
        return 0;
 }
 
+/* reattach the shared config at exact memory location primary process has it */
+static int
+rte_eal_config_reattach(void)
+{
+       struct rte_mem_config *mem_config;
+       void *rte_mem_cfg_addr;
+
+       if (internal_config.no_shconf)
+               return 0;
+
+       /* save the address primary process has mapped shared config to */
+       rte_mem_cfg_addr =
+                       (void *)(uintptr_t)rte_config.mem_config->mem_cfg_addr;
+
+       /* unmap original config */
+       munmap(rte_config.mem_config, sizeof(struct rte_mem_config));
+
+       /* remap the config at proper address */
+       mem_config = (struct rte_mem_config *) mmap(rte_mem_cfg_addr,
+                       sizeof(*mem_config), PROT_READ | PROT_WRITE, MAP_SHARED,
+                       mem_cfg_fd, 0);
+       close(mem_cfg_fd);
+       mem_cfg_fd = -1;
+
+       if (mem_config == MAP_FAILED) {
+               RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config! error %i (%s)\n",
+                               errno, strerror(errno));
+               return -1;
+       } else if (mem_config != rte_mem_cfg_addr) {
+               /* errno is stale, don't use */
+               RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config at [%p], got [%p]\n",
+                         rte_mem_cfg_addr, mem_config);
+               return -1;
+       }
+
+       rte_config.mem_config = mem_config;
+
+       return 0;
+}
+
 /* Detect if we are a primary or a secondary process */
 enum rte_proc_type_t
 eal_proc_type_detect(void)
@@ -342,6 +383,8 @@ rte_config_init(void)
                if (rte_eal_config_attach() < 0)
                        return -1;
                rte_eal_mcfg_wait_complete(rte_config.mem_config);
+               if (rte_eal_config_reattach() < 0)
+                       return -1;
                break;
        case RTE_PROC_AUTO:
        case RTE_PROC_INVALID:
@@ -594,6 +637,8 @@ rte_eal_mcfg_complete(void)
        /* ALL shared mem_config related INIT DONE */
        if (rte_config.process_type == RTE_PROC_PRIMARY)
                rte_config.mem_config->magic = RTE_MAGIC;
+
+       internal_config.init_complete = 1;
 }
 
 /* return non-zero if hugepages are enabled. */
@@ -720,13 +765,19 @@ rte_eal_init(int argc, char **argv)
        /* if no EAL option "--iova-mode=<pa|va>", use bus IOVA scheme */
        if (internal_config.iova_mode == RTE_IOVA_DC) {
                /* autodetect the IOVA mapping mode (default is RTE_IOVA_PA) */
-               rte_eal_get_configuration()->iova_mode =
-                       rte_bus_get_iommu_class();
+               enum rte_iova_mode iova_mode = rte_bus_get_iommu_class();
+
+               if (iova_mode == RTE_IOVA_DC)
+                       iova_mode = RTE_IOVA_PA;
+               rte_eal_get_configuration()->iova_mode = iova_mode;
        } else {
                rte_eal_get_configuration()->iova_mode =
                        internal_config.iova_mode;
        }
 
+       RTE_LOG(INFO, EAL, "Selected IOVA mode '%s'\n",
+               rte_eal_iova_mode() == RTE_IOVA_PA ? "PA" : "VA");
+
        if (internal_config.no_hugetlbfs == 0) {
                /* rte_config isn't initialized yet */
                ret = internal_config.process_type == RTE_PROC_PRIMARY ?
@@ -881,7 +932,7 @@ rte_eal_init(int argc, char **argv)
        return fctret;
 }
 
-int __rte_experimental
+int
 rte_eal_cleanup(void)
 {
        rte_service_finalize();