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

bdev/nvme: Get nvme_bdev from standard ns via helper function for configuration

Browse Source 
When multipath is supported, nvme_bdev will be got via bdev_subsystem.
To make such change transparent, add a helper function
nvme_bdev_ns_to_bdev() and use it for some cases.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ia5ad0b87178bc739ba0a75789f9f26b860241a04
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5801
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: <dongx.yi@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2021-02-18 03:23:45 +09:00 committed by Tomasz Zawadzki
parent eacea084f8
commit 847d0a4ec0
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,7 +1345,7 @@ nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev *bdev; struct nvme_bdev *bdev;
bdev = nvme_ns->bdev; bdev = nvme_bdev_ns_to_bdev(nvme_ns);
if (bdev != NULL) { if (bdev != NULL) {
spdk_bdev_unregister(&bdev->disk, NULL, NULL); spdk_bdev_unregister(&bdev->disk, NULL, NULL);
} }
@ -1419,7 +1419,7 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,
/* NS is still there but attributes may have changed */ /* NS is still there but attributes may have changed */
ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid); ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);
num_sectors = spdk_nvme_ns_get_num_sectors(ns); num_sectors = spdk_nvme_ns_get_num_sectors(ns);
bdev = nvme_ns->bdev; bdev = nvme_bdev_ns_to_bdev(nvme_ns);
assert(bdev != NULL); assert(bdev != NULL);
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",
@ -1831,7 +1831,7 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_async_probe_ctx *ctx)
continue; continue;
} }
assert(nvme_ns->id == nsid); assert(nvme_ns->id == nsid);
nvme_bdev = nvme_ns->bdev; nvme_bdev = nvme_bdev_ns_to_bdev(nvme_ns);
if (nvme_bdev == NULL) { if (nvme_bdev == NULL) {
assert(nvme_ns->type == NVME_BDEV_NS_OCSSD); assert(nvme_ns->type == NVME_BDEV_NS_OCSSD);
continue; continue;

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

@ -124,14 +124,17 @@ 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 *nvme_ns) bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme_bdev_ns *nvme_ns)
{ {
assert(nvme_ns->bdev != NULL); struct nvme_bdev *nvme_bdev;
nvme_bdev = nvme_bdev_ns_to_bdev(nvme_ns);
assert(nvme_bdev != NULL);
spdk_json_write_object_begin(w); spdk_json_write_object_begin(w);
spdk_json_write_named_string(w, "method", "bdev_ocssd_create"); spdk_json_write_named_string(w, "method", "bdev_ocssd_create");
spdk_json_write_named_object_begin(w, "params"); spdk_json_write_named_object_begin(w, "params");
spdk_json_write_named_string(w, "ctrlr_name", nvme_ns->ctrlr->name); spdk_json_write_named_string(w, "ctrlr_name", nvme_ns->ctrlr->name);
spdk_json_write_named_string(w, "bdev_name", nvme_ns->bdev->disk.name); spdk_json_write_named_string(w, "bdev_name", nvme_bdev->disk.name);
spdk_json_write_named_uint32(w, "nsid", nvme_ns->id); spdk_json_write_named_uint32(w, "nsid", nvme_ns->id);
spdk_json_write_object_end(w); spdk_json_write_object_end(w);
@ -871,7 +874,7 @@ bdev_ocssd_free_namespace(struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev *bdev; struct nvme_bdev *bdev;
bdev = nvme_ns->bdev; bdev = nvme_bdev_ns_to_bdev(nvme_ns);
if (bdev != NULL) { if (bdev != NULL) {
spdk_bdev_unregister(&bdev->disk, NULL, NULL); spdk_bdev_unregister(&bdev->disk, NULL, NULL);
} }
@ -904,7 +907,7 @@ bdev_ocssd_push_media_events(struct nvme_bdev_ns *nvme_ns,
return; return;
} }
nvme_bdev = nvme_ns->bdev; nvme_bdev = nvme_bdev_ns_to_bdev(nvme_ns);
if (nvme_bdev == NULL) { if (nvme_bdev == NULL) {
SPDK_INFOLOG(bdev_ocssd, "Dropping media management event\n"); SPDK_INFOLOG(bdev_ocssd, "Dropping media management event\n");
return; return;
@ -933,7 +936,7 @@ bdev_ocssd_notify_media_management(struct nvme_bdev_ns *nvme_ns)
{ {
struct nvme_bdev *nvme_bdev; struct nvme_bdev *nvme_bdev;
nvme_bdev = nvme_ns->bdev; nvme_bdev = nvme_bdev_ns_to_bdev(nvme_ns);
if (nvme_bdev != NULL) { if (nvme_bdev != NULL) {
spdk_bdev_notify_media_management(&nvme_bdev->disk); spdk_bdev_notify_media_management(&nvme_bdev->disk);
} }

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

@ -193,4 +193,10 @@ nvme_bdev_to_bdev_ns(struct nvme_bdev *nbdev)
return nbdev->nvme_ns; return nbdev->nvme_ns;
} }
static inline struct nvme_bdev *
nvme_bdev_ns_to_bdev(struct nvme_bdev_ns *nvme_ns)
{
return nvme_ns->bdev;
}
#endif /* SPDK_COMMON_BDEV_NVME_H */ #endif /* SPDK_COMMON_BDEV_NVME_H */

2
module/bdev/nvme/vbdev_opal.c
View File

@ -356,7 +356,7 @@ vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_ra
opal_bdev->nvme_ctrlr = nvme_ctrlr; opal_bdev->nvme_ctrlr = nvme_ctrlr;
opal_bdev->opal_dev = nvme_ctrlr->opal_dev; opal_bdev->opal_dev = nvme_ctrlr->opal_dev;
nvme_bdev = nvme_ctrlr->namespaces[nsid - 1]->bdev; nvme_bdev = nvme_bdev_ns_to_bdev(nvme_ctrlr->namespaces[nsid - 1]);
assert(nvme_bdev != NULL); assert(nvme_bdev != NULL);
base_bdev_name = nvme_bdev->disk.name; base_bdev_name = nvme_bdev->disk.name;

4
test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
View File

@ -1475,7 +1475,7 @@ test_aer_cb(void)
CU_ASSERT(nvme_bdev_ctrlr->namespaces[2]->populated == true); CU_ASSERT(nvme_bdev_ctrlr->namespaces[2]->populated == true);
CU_ASSERT(nvme_bdev_ctrlr->namespaces[3]->populated == true); CU_ASSERT(nvme_bdev_ctrlr->namespaces[3]->populated == true);
bdev = nvme_bdev_ctrlr->namespaces[3]->bdev; bdev = nvme_bdev_ns_to_bdev(nvme_bdev_ctrlr->namespaces[3]);
SPDK_CU_ASSERT_FATAL(bdev != NULL); SPDK_CU_ASSERT_FATAL(bdev != NULL);
CU_ASSERT(bdev->disk.blockcnt == 1024); CU_ASSERT(bdev->disk.blockcnt == 1024);
@ -1607,7 +1607,7 @@ test_submit_nvme_cmd(void)
nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name("nvme0"); nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name("nvme0");
SPDK_CU_ASSERT_FATAL(nvme_bdev_ctrlr != NULL); SPDK_CU_ASSERT_FATAL(nvme_bdev_ctrlr != NULL);
bdev = nvme_bdev_ctrlr->namespaces[0]->bdev; bdev = nvme_bdev_ns_to_bdev(nvme_bdev_ctrlr->namespaces[0]);
SPDK_CU_ASSERT_FATAL(bdev != NULL); SPDK_CU_ASSERT_FATAL(bdev != NULL);
ch = spdk_get_io_channel(nvme_bdev_ctrlr); ch = spdk_get_io_channel(nvme_bdev_ctrlr);