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

bdev/nvme: Use nvme_ns for nvme_bdev_ns and ns for spdk_nvme_ns

Browse Source 
Clarify local variable names to avoid misunderstanding and do the
upcoming changes easier.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I9a7185b5f7c62a9e537a626be83912895303e5ba
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5319
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-11-25 23:52:16 +09:00 committed by Tomasz Zawadzki
parent 0119b36be5
commit e5b2304448
4 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
module/bdev/nvme/bdev_nvme.c
View File

@ -180,8 +180,8 @@ static populate_namespace_fn g_populate_namespace_fn[] = {
bdev_ocssd_populate_namespace, bdev_ocssd_populate_namespace,
}; };
typedef void (*depopulate_namespace_fn)(struct nvme_bdev_ns *ns); typedef void (*depopulate_namespace_fn)(struct nvme_bdev_ns *nvme_ns);
static void nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *ns); static void nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *nvme_ns);
static depopulate_namespace_fn g_depopulate_namespace_fn[] = { static depopulate_namespace_fn g_depopulate_namespace_fn[] = {
NULL, NULL,
@ -189,9 +189,10 @@ static depopulate_namespace_fn g_depopulate_namespace_fn[] = {
bdev_ocssd_depopulate_namespace, bdev_ocssd_depopulate_namespace,
}; };
typedef void (*config_json_namespace_fn)(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *ns); typedef void (*config_json_namespace_fn)(struct spdk_json_write_ctx *w,
struct nvme_bdev_ns *nvme_ns);
static void nvme_ctrlr_config_json_standard_namespace(struct spdk_json_write_ctx *w, static void nvme_ctrlr_config_json_standard_namespace(struct spdk_json_write_ctx *w,
struct nvme_bdev_ns *ns); struct nvme_bdev_ns *nvme_ns);
static config_json_namespace_fn g_config_json_namespace_fn[] = { static config_json_namespace_fn g_config_json_namespace_fn[] = {
NULL, NULL,
@ -1277,43 +1278,43 @@ nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
} }
static void static void
nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *ns) nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev *bdev, *tmp; struct nvme_bdev *bdev, *tmp;
TAILQ_FOREACH_SAFE(bdev, &ns->bdevs, tailq, tmp) { TAILQ_FOREACH_SAFE(bdev, &nvme_ns->bdevs, tailq, tmp) {
spdk_bdev_unregister(&bdev->disk, NULL, NULL); spdk_bdev_unregister(&bdev->disk, NULL, NULL);
} }
ns->populated = false; nvme_ns->populated = false;
nvme_ctrlr_depopulate_namespace_done(ns->ctrlr); nvme_ctrlr_depopulate_namespace_done(nvme_ns->ctrlr);
} }
static void static void
nvme_ctrlr_populate_namespace(struct nvme_bdev_ctrlr *ctrlr, struct nvme_bdev_ns *ns, nvme_ctrlr_populate_namespace(struct nvme_bdev_ctrlr *ctrlr, struct nvme_bdev_ns *nvme_ns,
struct nvme_async_probe_ctx *ctx) struct nvme_async_probe_ctx *ctx)
{ {
g_populate_namespace_fn[ns->type](ctrlr, ns, ctx); g_populate_namespace_fn[nvme_ns->type](ctrlr, nvme_ns, ctx);
} }
static void static void
nvme_ctrlr_depopulate_namespace(struct nvme_bdev_ctrlr *ctrlr, struct nvme_bdev_ns *ns) nvme_ctrlr_depopulate_namespace(struct nvme_bdev_ctrlr *ctrlr, struct nvme_bdev_ns *nvme_ns)
{ {
g_depopulate_namespace_fn[ns->type](ns); g_depopulate_namespace_fn[nvme_ns->type](nvme_ns);
} }
void void
nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx, nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx,
struct nvme_bdev_ns *ns, int rc) struct nvme_bdev_ns *nvme_ns, int rc)
{ {
if (rc == 0) { if (rc == 0) {
ns->populated = true; nvme_ns->populated = true;
pthread_mutex_lock(&g_bdev_nvme_mutex); pthread_mutex_lock(&g_bdev_nvme_mutex);
ns->ctrlr->ref++; nvme_ns->ctrlr->ref++;
pthread_mutex_unlock(&g_bdev_nvme_mutex); pthread_mutex_unlock(&g_bdev_nvme_mutex);
} else { } else {
memset(ns, 0, sizeof(*ns)); memset(nvme_ns, 0, sizeof(*nvme_ns));
} }
if (ctx) { if (ctx) {
@ -1329,8 +1330,8 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
struct nvme_async_probe_ctx *ctx) struct nvme_async_probe_ctx *ctx)
{ {
struct spdk_nvme_ctrlr *ctrlr = nvme_bdev_ctrlr->ctrlr; struct spdk_nvme_ctrlr *ctrlr = nvme_bdev_ctrlr->ctrlr;
struct nvme_bdev_ns *ns; struct nvme_bdev_ns *nvme_ns;
struct spdk_nvme_ns *nvme_ns; struct spdk_nvme_ns *ns;
struct nvme_bdev *bdev; struct nvme_bdev *bdev;
uint32_t i; uint32_t i;
int rc; int rc;
@ -1347,14 +1348,14 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) { for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) {
uint32_t nsid = i + 1; uint32_t nsid = i + 1;
ns = nvme_bdev_ctrlr->namespaces[i]; nvme_ns = nvme_bdev_ctrlr->namespaces[i];
ns_is_active = spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid); ns_is_active = spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid);
if (ns->populated && ns_is_active && ns->type == NVME_BDEV_NS_STANDARD) { if (nvme_ns->populated && ns_is_active && nvme_ns->type == NVME_BDEV_NS_STANDARD) {
/* NS is still there but attributes may have changed */ /* NS is still there but attributes may have changed */
nvme_ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid); ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
num_sectors = spdk_nvme_ns_get_num_sectors(nvme_ns); num_sectors = spdk_nvme_ns_get_num_sectors(ns);
bdev = TAILQ_FIRST(&ns->bdevs); bdev = TAILQ_FIRST(&nvme_ns->bdevs);
if (bdev->disk.blockcnt != num_sectors) { if (bdev->disk.blockcnt != num_sectors) {
SPDK_NOTICELOG("NSID %u is resized: bdev name %s, old size %" PRIu64 ", new size %" PRIu64 "\n", SPDK_NOTICELOG("NSID %u is resized: bdev name %s, old size %" PRIu64 ", new size %" PRIu64 "\n",
nsid, nsid,
@ -1369,25 +1370,25 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
} }
} }
if (!ns->populated && ns_is_active) { if (!nvme_ns->populated && ns_is_active) {
ns->id = nsid; nvme_ns->id = nsid;
ns->ctrlr = nvme_bdev_ctrlr; nvme_ns->ctrlr = nvme_bdev_ctrlr;
if (spdk_nvme_ctrlr_is_ocssd_supported(ctrlr)) { if (spdk_nvme_ctrlr_is_ocssd_supported(ctrlr)) {
ns->type = NVME_BDEV_NS_OCSSD; nvme_ns->type = NVME_BDEV_NS_OCSSD;
} else { } else {
ns->type = NVME_BDEV_NS_STANDARD; nvme_ns->type = NVME_BDEV_NS_STANDARD;
} }
TAILQ_INIT(&ns->bdevs); TAILQ_INIT(&nvme_ns->bdevs);
if (ctx) { if (ctx) {
ctx->populates_in_progress++; ctx->populates_in_progress++;
} }
nvme_ctrlr_populate_namespace(nvme_bdev_ctrlr, ns, ctx); nvme_ctrlr_populate_namespace(nvme_bdev_ctrlr, nvme_ns, ctx);
} }
if (ns->populated && !ns_is_active) { if (nvme_ns->populated && !ns_is_active) {
nvme_ctrlr_depopulate_namespace(nvme_bdev_ctrlr, ns); nvme_ctrlr_depopulate_namespace(nvme_bdev_ctrlr, nvme_ns);
} }
} }
@ -1409,15 +1410,15 @@ static void
nvme_ctrlr_depopulate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) nvme_ctrlr_depopulate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
{ {
uint32_t i; uint32_t i;
struct nvme_bdev_ns *ns; struct nvme_bdev_ns *nvme_ns;
for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) { for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) {
uint32_t nsid = i + 1; uint32_t nsid = i + 1;
ns = nvme_bdev_ctrlr->namespaces[nsid - 1]; nvme_ns = nvme_bdev_ctrlr->namespaces[nsid - 1];
if (ns->populated) { if (nvme_ns->populated) {
assert(ns->id == nsid); assert(nvme_ns->id == nsid);
nvme_ctrlr_depopulate_namespace(nvme_bdev_ctrlr, ns); nvme_ctrlr_depopulate_namespace(nvme_bdev_ctrlr, nvme_ns);
} }
} }
} }
@ -1736,7 +1737,7 @@ static void
nvme_ctrlr_populate_namespaces_done(struct nvme_async_probe_ctx *ctx) nvme_ctrlr_populate_namespaces_done(struct nvme_async_probe_ctx *ctx)
{ {
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr; struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;
struct nvme_bdev_ns *ns; struct nvme_bdev_ns *nvme_ns;
struct nvme_bdev *nvme_bdev, *tmp; struct nvme_bdev *nvme_bdev, *tmp;
uint32_t i, nsid; uint32_t i, nsid;
size_t j; size_t j;
@ -1751,12 +1752,12 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_async_probe_ctx *ctx)
j = 0; j = 0;
for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) { for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) {
nsid = i + 1; nsid = i + 1;
ns = nvme_bdev_ctrlr->namespaces[nsid - 1]; nvme_ns = nvme_bdev_ctrlr->namespaces[nsid - 1];
if (!ns->populated) { if (!nvme_ns->populated) {
continue; continue;
} }
assert(ns->id == nsid); assert(nvme_ns->id == nsid);
TAILQ_FOREACH_SAFE(nvme_bdev, &ns->bdevs, tailq, tmp) { TAILQ_FOREACH_SAFE(nvme_bdev, &nvme_ns->bdevs, tailq, tmp) {
if (j < ctx->count) { if (j < ctx->count) {
ctx->names[j] = nvme_bdev->disk.name; ctx->names[j] = nvme_bdev->disk.name;
j++; j++;
@ -2769,15 +2770,16 @@ bdev_nvme_abort(struct nvme_io_channel *nvme_ch, struct nvme_bdev_io *bio,
} }
static void static void
nvme_ctrlr_config_json_standard_namespace(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *ns) nvme_ctrlr_config_json_standard_namespace(struct spdk_json_write_ctx *w,
struct nvme_bdev_ns *nvme_ns)
{ {
/* nop */ /* nop */
} }
static void static void
nvme_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *ns) nvme_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *nvme_ns)
{ {
g_config_json_namespace_fn[ns->type](w, ns); g_config_json_namespace_fn[nvme_ns->type](w, nvme_ns);
} }
static int static int

12
module/bdev/nvme/bdev_ocssd.c
View File

@ -130,7 +130,7 @@ bdev_ocssd_config_json(struct spdk_json_write_ctx *w)
} }
void void
bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *ns) bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr; struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;
struct nvme_bdev *nvme_bdev; struct nvme_bdev *nvme_bdev;
@ -138,7 +138,7 @@ bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev
char range_buf[128]; char range_buf[128];
int rc; int rc;
TAILQ_FOREACH(nvme_bdev, &ns->bdevs, tailq) { TAILQ_FOREACH(nvme_bdev, &nvme_ns->bdevs, tailq) {
nvme_bdev_ctrlr = nvme_bdev->nvme_ns->ctrlr; nvme_bdev_ctrlr = nvme_bdev->nvme_ns->ctrlr;
ocssd_bdev = SPDK_CONTAINEROF(nvme_bdev, struct ocssd_bdev, nvme_bdev); ocssd_bdev = SPDK_CONTAINEROF(nvme_bdev, struct ocssd_bdev, nvme_bdev);
@ -1511,11 +1511,11 @@ error:
} }
void void
bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns) bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *nvme_ns)
{ {
struct bdev_ocssd_ns *ocssd_ns; struct bdev_ocssd_ns *ocssd_ns;
ocssd_ns = bdev_ocssd_get_ns_from_nvme(ns); ocssd_ns = bdev_ocssd_get_ns_from_nvme(nvme_ns);
/* If there are outstanding admin requests, we cannot free the context /* If there are outstanding admin requests, we cannot free the context
* here, as they'd write over deallocated memory. Clear the populated * here, as they'd write over deallocated memory. Clear the populated
@ -1523,9 +1523,9 @@ bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns)
* being depopulated and finish its deallocation once all requests are * being depopulated and finish its deallocation once all requests are
* completed. * completed.
*/ */
ns->populated = false; nvme_ns->populated = false;
if (ocssd_ns->num_outstanding == 0) { if (ocssd_ns->num_outstanding == 0) {
bdev_ocssd_free_namespace(ns); bdev_ocssd_free_namespace(nvme_ns);
} }
} }

4
module/bdev/nvme/bdev_ocssd.h
View File

@ -53,8 +53,8 @@ void bdev_ocssd_delete_bdev(const char *bdev_name, bdev_ocssd_delete_cb cb_fn, v
void bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, void bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
struct nvme_bdev_ns *nvme_ns, struct nvme_bdev_ns *nvme_ns,
struct nvme_async_probe_ctx *ctx); struct nvme_async_probe_ctx *ctx);
void bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns); void bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *nvme_ns);
void bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *ns); void bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *nvme_ns);
int bdev_ocssd_create_io_channel(struct nvme_io_channel *ioch); int bdev_ocssd_create_io_channel(struct nvme_io_channel *ioch);
void bdev_ocssd_destroy_io_channel(struct nvme_io_channel *ioch); void bdev_ocssd_destroy_io_channel(struct nvme_io_channel *ioch);

2
module/bdev/nvme/common.h
View File

@ -153,7 +153,7 @@ struct nvme_io_channel {
}; };
void nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx, void nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx,
struct nvme_bdev_ns *ns, int rc); struct nvme_bdev_ns *nvme_ns, int rc);
void nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr); void nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr_get(const struct spdk_nvme_transport_id *trid); struct nvme_bdev_ctrlr *nvme_bdev_ctrlr_get(const struct spdk_nvme_transport_id *trid);