vfio: fix headers for C++ support

[dpdk.git] / lib / librte_eal / common / rte_malloc.c

diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
index c313a57..e0e0d0b 100644 (file)
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdint.h>
@@ -39,7 +10,6 @@
 
 #include <rte_memcpy.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_branch_prediction.h>
@@ -77,6 +47,9 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket_arg)
        if (size == 0 || (align && !rte_is_power_of_2(align)))
                return NULL;
 
+       if (!rte_eal_has_hugepages())
+               socket_arg = SOCKET_ID_ANY;
+
        if (socket_arg == SOCKET_ID_ANY)
                socket = malloc_get_numa_socket();
        else
@@ -87,7 +60,7 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket_arg)
                return NULL;
 
        ret = malloc_heap_alloc(&mcfg->malloc_heaps[socket], type,
-                               size, align == 0 ? 1 : align);
+                               size, 0, align == 0 ? 1 : align, 0);
        if (ret != NULL || socket_arg != SOCKET_ID_ANY)
                return ret;
 
@@ -98,7 +71,7 @@ rte_malloc_socket(const char *type, size_t size, unsigned align, int socket_arg)
                        continue;
 
                ret = malloc_heap_alloc(&mcfg->malloc_heaps[i], type,
-                                       size, align == 0 ? 1 : align);
+                                       size, 0, align == 0 ? 1 : align, 0);
                if (ret != NULL)
                        return ret;
        }
@@ -121,11 +94,7 @@ rte_malloc(const char *type, size_t size, unsigned align)
 void *
 rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)
 {
-       void *ptr = rte_malloc_socket(type, size, align, socket);
-
-       if (ptr != NULL)
-               memset(ptr, 0, size);
-       return ptr;
+       return rte_malloc_socket(type, size, align, socket);
 }
 
 /*
@@ -248,13 +217,22 @@ rte_malloc_set_limit(__rte_unused const char *type,
 }
 
 /*
- * Return the physical address of a virtual address obtained through rte_malloc
+ * Return the IO address of a virtual address obtained through rte_malloc
  */
-phys_addr_t
-rte_malloc_virt2phy(const void *addr)
+rte_iova_t
+rte_malloc_virt2iova(const void *addr)
 {
+       rte_iova_t iova;
        const struct malloc_elem *elem = malloc_elem_from_data(addr);
        if (elem == NULL)
-               return 0;
-       return elem->mz->phys_addr + ((uintptr_t)addr - (uintptr_t)elem->mz->addr);
+               return RTE_BAD_IOVA;
+       if (elem->ms->iova == RTE_BAD_IOVA)
+               return RTE_BAD_IOVA;
+
+       if (rte_eal_iova_mode() == RTE_IOVA_VA)
+               iova = (uintptr_t)addr;
+       else
+               iova = elem->ms->iova +
+                       RTE_PTR_DIFF(addr, elem->ms->addr);
+       return iova;
 }