New upstream version 17.11.4

[deb_dpdk.git] / lib / librte_eal / common / eal_common_memory.c

diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 6155752..a0922f1 100644 (file)
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -35,11 +35,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <unistd.h>
 #include <inttypes.h>
+#include <sys/mman.h>
 #include <sys/queue.h>
 
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_log.h>
@@ -94,11 +95,11 @@ rte_dump_physmem_layout(FILE *f)
                if (mcfg->memseg[i].addr == NULL)
                        break;
 
-               fprintf(f, "Segment %u: phys:0x%"PRIx64", len:%zu, "
+               fprintf(f, "Segment %u: IOVA:0x%"PRIx64", len:%zu, "
                       "virt:%p, socket_id:%"PRId32", "
                       "hugepage_sz:%"PRIu64", nchannel:%"PRIx32", "
                       "nrank:%"PRIx32"\n", i,
-                      mcfg->memseg[i].phys_addr,
+                      mcfg->memseg[i].iova,
                       mcfg->memseg[i].len,
                       mcfg->memseg[i].addr,
                       mcfg->memseg[i].socket_id,
@@ -108,6 +109,49 @@ rte_dump_physmem_layout(FILE *f)
        }
 }
 
+/* 63 bits is good enough for a sanity check */
+#define MAX_DMA_MASK_BITS 63
+
+/* check memseg iovas are within the required range based on dma mask */
+int
+rte_eal_check_dma_mask(uint8_t maskbits)
+{
+
+       const struct rte_mem_config *mcfg;
+       uint64_t mask;
+       int i;
+
+       /* sanity check */
+       if (maskbits > MAX_DMA_MASK_BITS) {
+               RTE_LOG(INFO, EAL, "wrong dma mask size %u (Max: %u)\n",
+                                  maskbits, MAX_DMA_MASK_BITS);
+               return -1;
+       }
+
+       /* create dma mask */
+       mask = ~((1ULL << maskbits) - 1);
+
+       /* get pointer to global configuration */
+       mcfg = rte_eal_get_configuration()->mem_config;
+
+       for (i = 0; i < RTE_MAX_MEMSEG; i++) {
+               if (mcfg->memseg[i].addr == NULL)
+                       break;
+
+               if (mcfg->memseg[i].iova & mask) {
+                       RTE_LOG(INFO, EAL,
+                               "memseg[%d] iova %"PRIx64" out of range:\n",
+                               i, mcfg->memseg[i].iova);
+
+                       RTE_LOG(INFO, EAL, "\tusing dma mask %"PRIx64"\n",
+                               mask);
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
 /* return the number of memory channels */
 unsigned rte_memory_get_nchannel(void)
 {
@@ -135,6 +179,16 @@ rte_eal_memdevice_init(void)
        return 0;
 }
 
+/* Lock page in physical memory and prevent from swapping. */
+int
+rte_mem_lock_page(const void *virt)
+{
+       unsigned long virtual = (unsigned long)virt;
+       int page_size = getpagesize();
+       unsigned long aligned = (virtual & ~(page_size - 1));
+       return mlock((void *)aligned, page_size);
+}
+
 /* init memory subsystem */
 int
 rte_eal_memory_init(void)