New upstream version 18.08

[deb_dpdk.git] / lib / librte_eal / common / include / rte_eal_memconfig.h

diff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h
index 29fa0b6..aff0688 100644 (file)
--- a/lib/librte_eal/common/include/rte_eal_memconfig.h
+++ b/lib/librte_eal/common/include/rte_eal_memconfig.h
@@ -12,11 +12,30 @@
 #include <rte_malloc_heap.h>
 #include <rte_rwlock.h>
 #include <rte_pause.h>
+#include <rte_fbarray.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ * memseg list is a special case as we need to store a bunch of other data
+ * together with the array itself.
+ */
+struct rte_memseg_list {
+       RTE_STD_C11
+       union {
+               void *base_va;
+               /**< Base virtual address for this memseg list. */
+               uint64_t addr_64;
+               /**< Makes sure addr is always 64-bits */
+       };
+       int socket_id; /**< Socket ID for all memsegs in this list. */
+       uint64_t page_sz; /**< Page size for all memsegs in this list. */
+       volatile uint32_t version; /**< version number for multiprocess sync. */
+       struct rte_fbarray memseg_arr;
+};
+
 /**
  * the structure for the memory configuration for the RTE.
  * Used by the rte_config structure. It is separated out, as for multi-process
@@ -40,11 +59,14 @@ struct rte_mem_config {
        rte_rwlock_t qlock;   /**< used for tailq operation for thread safe. */
        rte_rwlock_t mplock;  /**< only used by mempool LIB for thread-safe. */
 
-       uint32_t memzone_cnt; /**< Number of allocated memzones */
+       rte_rwlock_t memory_hotplug_lock;
+       /**< indicates whether memory hotplug request is in progress. */
 
        /* memory segments and zones */
-       struct rte_memseg memseg[RTE_MAX_MEMSEG];    /**< Physmem descriptors. */
-       struct rte_memzone memzone[RTE_MAX_MEMZONE]; /**< Memzone descriptors. */
+       struct rte_fbarray memzones; /**< Memzone descriptors. */
+
+       struct rte_memseg_list memsegs[RTE_MAX_MEMSEG_LISTS];
+       /**< list of dynamic arrays holding memsegs */
 
        struct rte_tailq_head tailq_head[RTE_MAX_TAILQ]; /**< Tailqs for objects */