From ad10c178210e11bfa468f7f5ecca597644d2eb34 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Mon, 3 Jul 2017 12:04:07 +0200 Subject: [PATCH] mem: do not advertise physical address when no hugepages When populating a mempool with a virtual memory area, the mempool library expects to be able to get the physical address of each page. When started with --no-huge, the physical addresses may not be available because the pages are not locked in memory. It sometimes returns RTE_BAD_PHYS_ADDR, which makes the mempool_populate() function to fail. This was working before the commit cdc242f260e7 ("eal/linux: support running as unprivileged user"), because rte_mem_virt2phy() was returning 0 instead of RTE_BAD_PHYS_ADDR, which was seen as a valid physical address. Since --no-huge is a debug function that breaks the support of physical drivers, always set physical addresses to RTE_BAD_PHYS_ADDR in memzones or in rte_mem_virt2phy(), and ensure that mempool won't complain in that case. Fixes: cdc242f260e7 ("eal/linux: support running as unprivileged user") Cc: stable@dpdk.org Signed-off-by: Olivier Matz Reviewed-by: Jan Blunck --- lib/librte_eal/common/include/rte_malloc.h | 2 +- lib/librte_eal/common/rte_malloc.c | 4 +++- lib/librte_eal/linuxapp/eal/eal_memory.c | 9 ++++++++- lib/librte_mempool/rte_mempool.c | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/include/rte_malloc.h b/lib/librte_eal/common/include/rte_malloc.h index 61aac322b2..3d37f79b87 100644 --- a/lib/librte_eal/common/include/rte_malloc.h +++ b/lib/librte_eal/common/include/rte_malloc.h @@ -329,7 +329,7 @@ rte_malloc_set_limit(const char *type, size_t max); * @param addr * Address obtained from a previous rte_malloc call * @return - * NULL on error + * RTE_BAD_PHYS_ADDR on error * otherwise return physical address of the buffer */ phys_addr_t diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index f4a8835292..5c0627bf44 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -253,6 +253,8 @@ rte_malloc_virt2phy(const void *addr) { const struct malloc_elem *elem = malloc_elem_from_data(addr); if (elem == NULL) - return 0; + return RTE_BAD_PHYS_ADDR; + if (elem->ms->phys_addr == RTE_BAD_PHYS_ADDR) + return RTE_BAD_PHYS_ADDR; return elem->ms->phys_addr + ((uintptr_t)addr - (uintptr_t)elem->ms->addr); } diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 647d89c58d..040f24a43c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -112,6 +112,13 @@ test_phys_addrs_available(void) if (rte_xen_dom0_supported()) return; + if (!rte_eal_has_hugepages()) { + RTE_LOG(ERR, EAL, + "Started without hugepages support, physical addresses not available\n"); + phys_addrs_available = false; + return; + } + physaddr = rte_mem_virt2phy(&tmp); if (physaddr == RTE_BAD_PHYS_ADDR) { RTE_LOG(ERR, EAL, @@ -1054,7 +1061,7 @@ rte_eal_hugepage_init(void) strerror(errno)); return -1; } - mcfg->memseg[0].phys_addr = (phys_addr_t)(uintptr_t)addr; + mcfg->memseg[0].phys_addr = RTE_BAD_PHYS_ADDR; mcfg->memseg[0].addr = addr; mcfg->memseg[0].hugepage_sz = RTE_PGSIZE_4K; mcfg->memseg[0].len = internal_config.memory; diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index f65310f60a..6fc3c9c7cb 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -476,7 +476,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr, /* required for xen_dom0 to get the machine address */ paddr = rte_mem_phy2mch(-1, paddr); - if (paddr == RTE_BAD_PHYS_ADDR) { + if (paddr == RTE_BAD_PHYS_ADDR && rte_eal_has_hugepages()) { ret = -EINVAL; goto fail; } -- 2.20.1