Skip to content
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

Alloc ocf_data pages from pooled allocator #35

Open
wants to merge 1 commit into
base: local-master
Choose a base branch
from
Open

Alloc ocf_data pages from pooled allocator #35

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
61 changes: 37 additions & 24 deletions module/bdev/ocf/ctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,7 @@
#include "data.h"

ocf_ctx_t vbdev_ocf_ctx;

static ctx_data_t *
vbdev_ocf_ctx_data_alloc(uint32_t pages)
{
struct bdev_ocf_data *data;
void *buf;
uint32_t sz;

data = vbdev_ocf_data_alloc(1);

sz = pages * PAGE_SIZE;
buf = spdk_malloc(sz, PAGE_SIZE, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (buf == NULL) {
return NULL;
}

vbdev_ocf_iovs_add(data, buf, sz);

data->size = sz;

return data;
}
env_allocator *ocf_data_allocator;

static void
vbdev_ocf_ctx_data_free(ctx_data_t *ctx_data)
Expand All @@ -75,12 +53,39 @@ vbdev_ocf_ctx_data_free(ctx_data_t *ctx_data)
}

for (i = 0; i < data->iovcnt; i++) {
spdk_free(data->iovs[i].iov_base);
env_allocator_del(ocf_data_allocator, data->iovs[i].iov_base);
}

vbdev_ocf_data_free(data);
}

static ctx_data_t *
vbdev_ocf_ctx_data_alloc(uint32_t pages)
{
struct bdev_ocf_data *data;
void *buf;
uint32_t i;

data = vbdev_ocf_data_alloc(pages);
if (!data)
return NULL;

for (i = 0; i < pages; i++) {
buf = env_allocator_new(ocf_data_allocator);

if (buf == NULL) {
vbdev_ocf_ctx_data_free(data);
return NULL;
}

vbdev_ocf_iovs_add(data, buf, PAGE_SIZE);
}

data->size = pages * PAGE_SIZE;

return data;
}

static int
vbdev_ocf_ctx_data_mlock(ctx_data_t *ctx_data)
{
Expand Down Expand Up @@ -557,6 +562,11 @@ vbdev_ocf_ctx_init(void)
return ret;
}

ocf_data_allocator = env_allocator_create(PAGE_SIZE, "ocf_data");
if (!ocf_data_allocator) {
return -1;
}

return 0;
}

Expand All @@ -565,4 +575,7 @@ vbdev_ocf_ctx_cleanup(void)
{
ocf_ctx_put(vbdev_ocf_ctx);
vbdev_ocf_ctx = NULL;

env_allocator_destroy(ocf_data_allocator);
ocf_data_allocator = NULL;
}