eal: hide shared memory config

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

diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index 8a0b387..228d6b3 100644 (file)
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -57,6 +57,7 @@
 #include "eal_internal_cfg.h"
 #include "eal_filesystem.h"
 #include "eal_hugepages.h"
+#include "eal_memcfg.h"
 #include "eal_options.h"
 #include "eal_vfio.h"
 #include "hotplug_mp.h"
@@ -985,6 +986,7 @@ rte_eal_init(int argc, char **argv)
        static char logid[PATH_MAX];
        char cpuset[RTE_CPU_AFFINITY_STR_LEN];
        char thread_name[RTE_MAX_THREAD_NAME_LEN];
+       bool phys_addrs;
 
        /* checks if the machine is adequate */
        if (!rte_cpu_is_supported()) {
@@ -1075,25 +1077,46 @@ rte_eal_init(int argc, char **argv)
                return -1;
        }
 
+       phys_addrs = rte_eal_using_phys_addrs() != 0;
+
        /* 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();
+               /* autodetect the IOVA mapping mode */
+               enum rte_iova_mode iova_mode = rte_bus_get_iommu_class();
 
+               if (iova_mode == RTE_IOVA_DC) {
+                       iova_mode = phys_addrs ? RTE_IOVA_PA : RTE_IOVA_VA;
+                       RTE_LOG(DEBUG, EAL,
+                               "Buses did not request a specific IOVA mode, using '%s' based on physical addresses availability.\n",
+                               phys_addrs ? "PA" : "VA");
+               }
+#ifdef RTE_LIBRTE_KNI
                /* Workaround for KNI which requires physical address to work */
-               if (rte_eal_get_configuration()->iova_mode == RTE_IOVA_VA &&
+               if (iova_mode == RTE_IOVA_VA &&
                                rte_eal_check_module("rte_kni") == 1) {
-                       rte_eal_get_configuration()->iova_mode = RTE_IOVA_PA;
-                       RTE_LOG(WARNING, EAL,
-                               "Some devices want IOVA as VA but PA will be used because.. "
-                               "KNI module inserted\n");
+                       if (phys_addrs) {
+                               iova_mode = RTE_IOVA_PA;
+                               RTE_LOG(WARNING, EAL, "Forcing IOVA as 'PA' because KNI module is loaded\n");
+                       } else {
+                               RTE_LOG(DEBUG, EAL, "KNI can not work since physical addresses are unavailable\n");
+                       }
                }
+#endif
+               rte_eal_get_configuration()->iova_mode = iova_mode;
        } else {
                rte_eal_get_configuration()->iova_mode =
                        internal_config.iova_mode;
        }
 
+       if (rte_eal_iova_mode() == RTE_IOVA_PA && !phys_addrs) {
+               rte_eal_init_alert("Cannot use IOVA as 'PA' since physical addresses are not available");
+               rte_errno = EINVAL;
+               return -1;
+       }
+
+       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 ?