malloc: allow attaching to external memory chunks

[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 fcd5613..1b95c04 100644 (file)
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -417,6 +417,89 @@ unlock:
        return ret;
 }
 
+struct sync_mem_walk_arg {
+       void *va_addr;
+       size_t len;
+       int result;
+};
+
+static int
+attach_mem_walk(const struct rte_memseg_list *msl, void *arg)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       struct sync_mem_walk_arg *wa = arg;
+       size_t len = msl->page_sz * msl->memseg_arr.len;
+
+       if (msl->base_va == wa->va_addr &&
+                       len == wa->len) {
+               struct rte_memseg_list *found_msl;
+               int msl_idx, ret;
+
+               /* msl is const */
+               msl_idx = msl - mcfg->memsegs;
+               found_msl = &mcfg->memsegs[msl_idx];
+
+               ret = rte_fbarray_attach(&found_msl->memseg_arr);
+
+               if (ret < 0)
+                       wa->result = -rte_errno;
+               else
+                       wa->result = 0;
+               return 1;
+       }
+       return 0;
+}
+
+int
+rte_malloc_heap_memory_attach(const char *heap_name, void *va_addr, size_t len)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       struct malloc_heap *heap = NULL;
+       struct sync_mem_walk_arg wa;
+       int ret;
+
+       if (heap_name == NULL || va_addr == NULL || len == 0 ||
+                       strnlen(heap_name, RTE_HEAP_NAME_MAX_LEN) == 0 ||
+                       strnlen(heap_name, RTE_HEAP_NAME_MAX_LEN) ==
+                               RTE_HEAP_NAME_MAX_LEN) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+       rte_rwlock_read_lock(&mcfg->memory_hotplug_lock);
+
+       /* find our heap */
+       heap = find_named_heap(heap_name);
+       if (heap == NULL) {
+               rte_errno = ENOENT;
+               ret = -1;
+               goto unlock;
+       }
+       /* we shouldn't be able to attach to internal heaps */
+       if (heap->socket_id < RTE_MAX_NUMA_NODES) {
+               rte_errno = EPERM;
+               ret = -1;
+               goto unlock;
+       }
+
+       /* find corresponding memseg list to attach to */
+       wa.va_addr = va_addr;
+       wa.len = len;
+       wa.result = -ENOENT; /* fail unless explicitly told to succeed */
+
+       /* we're already holding a read lock */
+       rte_memseg_list_walk_thread_unsafe(attach_mem_walk, &wa);
+
+       if (wa.result < 0) {
+               rte_errno = -wa.result;
+               ret = -1;
+       } else {
+               ret = 0;
+       }
+unlock:
+       rte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);
+       return ret;
+}
+
 int
 rte_malloc_heap_create(const char *heap_name)
 {