Skip to content

opal: add basic memory accounting for free lists and objects #6282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

opal: add basic memory accounting for free lists and objects #6282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 34 additions & 16 deletions opal/class/opal_free_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2012-2018 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2019 Triad National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -32,7 +34,17 @@
#include "opal/mca/rcache/rcache.h"
#include "opal/util/sys_limits.h"

typedef struct opal_free_list_item_t opal_free_list_memory_t;
/* total memory in use for free-list buffers/headers */
opal_atomic_int64_t opal_free_list_memory_allocated = 0;

struct opal_free_list_memory_t {
opal_free_list_item_t super;
ssize_t memory_size;
};
typedef struct opal_free_list_memory_t opal_free_list_memory_t;

OBJ_CLASS_DECLARATION(opal_free_list_memory_t);
OBJ_CLASS_INSTANCE(opal_free_list_memory_t, opal_free_list_item_t, NULL, NULL);

OBJ_CLASS_INSTANCE(opal_free_list_item_t,
opal_list_item_t,
Expand All @@ -54,27 +66,28 @@ static void opal_free_list_construct(opal_free_list_t* fl)
fl->fl_mpool = NULL;
fl->fl_rcache = NULL;
/* default flags */
fl->fl_rcache_reg_flags = MCA_RCACHE_FLAGS_CACHE_BYPASS |
MCA_RCACHE_FLAGS_CUDA_REGISTER_MEM;
fl->fl_rcache_reg_flags = MCA_RCACHE_FLAGS_CACHE_BYPASS;
fl->ctx = NULL;
OBJ_CONSTRUCT(&(fl->fl_allocations), opal_list_t);
}

static void opal_free_list_allocation_release (opal_free_list_t *fl, opal_free_list_memory_t *fl_mem)
{
if (NULL != fl->fl_rcache) {
fl->fl_rcache->rcache_deregister (fl->fl_rcache, fl_mem->registration);
fl->fl_rcache->rcache_deregister (fl->fl_rcache, fl_mem->super.registration);
}

if (NULL != fl->fl_mpool) {
fl->fl_mpool->mpool_free (fl->fl_mpool, fl_mem->ptr);
} else if (fl_mem->ptr) {
free (fl_mem->ptr);
fl->fl_mpool->mpool_free (fl->fl_mpool, fl_mem->super.ptr);
} else if (fl_mem->super.ptr) {
free (fl_mem->super.ptr);
}

OPAL_THREAD_FETCH_ADD64(&opal_free_list_memory_allocated, -fl_mem->memory_size);

/* destruct the item (we constructed it), then free the memory chunk */
OBJ_DESTRUCT(fl_mem);
free(fl_mem);
mca_mpool_base_default_module->mpool_free (mca_mpool_base_default_module, fl_mem);
}

static void opal_free_list_destruct(opal_free_list_t *fl)
Expand Down Expand Up @@ -204,10 +217,11 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements, opal_f
}

/* calculate head allocation size */
alloc_size = num_elements * head_size + sizeof(opal_free_list_memory_t) +
alloc_size = num_elements * head_size + sizeof (*alloc_ptr) +
flist->fl_frag_alignment;

alloc_ptr = (opal_free_list_memory_t *) malloc(alloc_size);
alloc_ptr = mca_mpool_base_default_module->mpool_alloc (mca_mpool_base_default_module, alloc_size,
flist->fl_frag_alignment, 0);
if (OPAL_UNLIKELY(NULL == alloc_ptr)) {
return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
}
Expand All @@ -216,15 +230,15 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements, opal_f
/* allocate the rest from the mpool (or use memalign/malloc) */
payload_ptr = (unsigned char *) flist->fl_mpool->mpool_alloc(flist->fl_mpool, buffer_size, align, 0);
if (NULL == payload_ptr) {
free(alloc_ptr);
mca_mpool_base_default_module->mpool_free (mca_mpool_base_default_module, alloc_ptr);
return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
}

if (flist->fl_rcache) {
rc = flist->fl_rcache->rcache_register (flist->fl_rcache, payload_ptr, num_elements * elem_size,
flist->fl_rcache_reg_flags, MCA_RCACHE_ACCESS_ANY, &reg);
if (OPAL_UNLIKELY(OPAL_SUCCESS != rc)) {
free (alloc_ptr);
mca_mpool_base_default_module->mpool_free (mca_mpool_base_default_module, alloc_ptr);
flist->fl_mpool->mpool_free (flist->fl_mpool, payload_ptr);

return rc;
Expand All @@ -234,11 +248,15 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements, opal_f

/* make the alloc_ptr a list item, save the chunk in the allocations list,
* and have ptr point to memory right after the list item structure */
OBJ_CONSTRUCT(alloc_ptr, opal_free_list_item_t);
opal_list_append(&(flist->fl_allocations), (opal_list_item_t*)alloc_ptr);
OBJ_CONSTRUCT(alloc_ptr, opal_free_list_memory_t);
opal_list_append(&(flist->fl_allocations), &alloc_ptr->super.super);

OPAL_ATOMIC_FETCH_ADD64(&opal_free_list_memory_allocated, buffer_size);

alloc_ptr->registration = reg;
alloc_ptr->ptr = payload_ptr;
/* NTH: for not this tracks the total number of bytes allocated (header and buffer) */
alloc_ptr->memory_size = buffer_size + alloc_size;
alloc_ptr->super.registration = reg;
alloc_ptr->super.ptr = payload_ptr;

ptr = (unsigned char*)alloc_ptr + sizeof(opal_free_list_memory_t);
ptr = OPAL_ALIGN_PTR(ptr, flist->fl_frag_alignment, unsigned char*);
Expand Down
4 changes: 4 additions & 0 deletions opal/class/opal_free_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2019 Triad National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -370,6 +372,8 @@ static inline void opal_free_list_return (opal_free_list_t *flist,
#define OPAL_FREE_LIST_RETURN(fl, item) \
opal_free_list_return (fl, item)

extern opal_atomic_int64_t opal_free_list_memory_allocated;

END_C_DECLS
#endif

Loading