ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/ctrlr: Add ANA log page allocation helper function

Browse Source 
This will simplify subsequent patches.

Signed-off-by: Evgeniy Kochetov <evgeniik@nvidia.com>
Change-Id: I2fc78c8bfec7270d6036f2c9ea9e0cf715fc9c7d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9178
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Evgeniy Kochetov 2021-08-13 11:26:55 +03:00 committed by Tomasz Zawadzki
parent 49e433f8ed
commit a8ee010e13
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/nvme/nvme_ctrlr.c
View File

@ -672,6 +672,32 @@ static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr)
return 0; return 0;
} }
static int
nvme_ctrlr_alloc_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
{
uint32_t ana_log_page_size;
ana_log_page_size = sizeof(struct spdk_nvme_ana_page) + ctrlr->cdata.nanagrpid *
sizeof(struct spdk_nvme_ana_group_descriptor) + ctrlr->cdata.nn *
sizeof(uint32_t);
ctrlr->ana_log_page = calloc(1, ana_log_page_size);
if (ctrlr->ana_log_page == NULL) {
NVME_CTRLR_ERRLOG(ctrlr, "could not allocate ANA log page buffer\n");
return -ENXIO;
}
ctrlr->copied_ana_desc = calloc(1, ana_log_page_size);
if (ctrlr->copied_ana_desc == NULL) {
NVME_CTRLR_ERRLOG(ctrlr, "could not allocate a buffer to parse ANA descriptor\n");
return -ENOMEM;
}
ctrlr->ana_log_page_size = ana_log_page_size;
return 0;
}
static int static int
nvme_ctrlr_update_ana_log_page(struct spdk_nvme_ctrlr *ctrlr) nvme_ctrlr_update_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
{ {
@ -708,24 +734,12 @@ nvme_ctrlr_update_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
static int static int
nvme_ctrlr_init_ana_log_page(struct spdk_nvme_ctrlr *ctrlr) nvme_ctrlr_init_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
{ {
uint32_t ana_log_page_size; int rc;
ana_log_page_size = sizeof(struct spdk_nvme_ana_page) + ctrlr->cdata.nanagrpid * rc = nvme_ctrlr_alloc_ana_log_page(ctrlr);
sizeof(struct spdk_nvme_ana_group_descriptor) + ctrlr->cdata.nn * if (rc) {
sizeof(uint32_t); return rc;
ctrlr->ana_log_page = calloc(1, ana_log_page_size);
if (ctrlr->ana_log_page == NULL) {
NVME_CTRLR_ERRLOG(ctrlr, "could not allocate ANA log page buffer\n");
return -ENXIO;
} }
ctrlr->copied_ana_desc = calloc(1, ana_log_page_size);
if (ctrlr->copied_ana_desc == NULL) {
NVME_CTRLR_ERRLOG(ctrlr, "could not allocate a buffer to parse ANA descriptor\n");
return -ENOMEM;
}
ctrlr->ana_log_page_size = ana_log_page_size;
return nvme_ctrlr_update_ana_log_page(ctrlr); return nvme_ctrlr_update_ana_log_page(ctrlr);
} }