Imported Upstream version 16.07.2

[deb_dpdk.git] / lib / librte_eal / linuxapp / eal / eal_memory.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 42a29fa..c04cff0 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -99,6 +99,8 @@
 #include "eal_filesystem.h"
 #include "eal_hugepages.h"
 
+#define PFN_MASK_SIZE  8
+
 #ifdef RTE_LIBRTE_XEN_DOM0
 int rte_xen_dom0_supported(void)
 {
@@ -158,7 +160,7 @@ rte_mem_lock_page(const void *virt)
 phys_addr_t
 rte_mem_virt2phy(const void *virtaddr)
 {
-       int fd;
+       int fd, retval;
        uint64_t page, physaddr;
        unsigned long virt_pfn;
        int page_size;
@@ -209,10 +211,17 @@ rte_mem_virt2phy(const void *virtaddr)
                close(fd);
                return RTE_BAD_PHYS_ADDR;
        }
-       if (read(fd, &page, sizeof(uint64_t)) < 0) {
+
+       retval = read(fd, &page, PFN_MASK_SIZE);
+       close(fd);
+       if (retval < 0) {
                RTE_LOG(ERR, EAL, "%s(): cannot read /proc/self/pagemap: %s\n",
                                __func__, strerror(errno));
-               close(fd);
+               return RTE_BAD_PHYS_ADDR;
+       } else if (retval != PFN_MASK_SIZE) {
+               RTE_LOG(ERR, EAL, "%s(): read %d bytes from /proc/self/pagemap "
+                               "but expected %d:\n",
+                               __func__, retval, PFN_MASK_SIZE);
                return RTE_BAD_PHYS_ADDR;
        }
 
@@ -222,7 +231,7 @@ rte_mem_virt2phy(const void *virtaddr)
         */
        physaddr = ((page & 0x7fffffffffffffULL) * page_size)
                + ((unsigned long)virtaddr % page_size);
-       close(fd);
+
        return physaddr;
 }
 
@@ -1543,7 +1552,8 @@ rte_eal_hugepage_attach(void)
        struct hugepage_file *hp = NULL;
        unsigned num_hp = 0;
        unsigned i, s = 0; /* s used to track the segment number */
-       off_t size;
+       unsigned max_seg = RTE_MAX_MEMSEG;
+       off_t size = 0;
        int fd, fd_zero = -1, fd_hugepage = -1;
 
        if (aslr_enabled() > 0) {
@@ -1610,6 +1620,9 @@ rte_eal_hugepage_attach(void)
                                "in /dev/zero to requested address [%p]: '%s'\n",
                                (unsigned long long)mcfg->memseg[s].len,
                                mcfg->memseg[s].addr, strerror(errno));
+                       max_seg = s;
+                       if (base_addr != MAP_FAILED)
+                               munmap(base_addr, mcfg->memseg[s].len);
                        if (aslr_enabled() > 0) {
                                RTE_LOG(ERR, EAL, "It is recommended to "
                                        "disable ASLR in the kernel "
@@ -1692,11 +1705,8 @@ rte_eal_hugepage_attach(void)
        return 0;
 
 error:
-       s = 0;
-       while (s < RTE_MAX_MEMSEG && mcfg->memseg[s].len > 0) {
-               munmap(mcfg->memseg[s].addr, mcfg->memseg[s].len);
-               s++;
-       }
+       for (i = 0; i < max_seg && mcfg->memseg[i].len > 0; i++)
+               munmap(mcfg->memseg[i].addr, mcfg->memseg[i].len);
        if (hp != NULL && hp != MAP_FAILED)
                munmap(hp, size);
        if (fd_zero >= 0)