diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index 706277553..145d5c79c 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/nvme/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c +C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c bdev_ocssd.c C_SRCS-$(CONFIG_NVME_CUSE) += bdev_nvme_cuse_rpc.c ifeq ($(OS),Linux) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index fcb14a0dc..5d236c702 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -34,6 +34,7 @@ #include "spdk/stdinc.h" #include "bdev_nvme.h" +#include "bdev_ocssd.h" #include "spdk/config.h" #include "spdk/conf.h" @@ -154,23 +155,20 @@ typedef void (*populate_namespace_fn)(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx); static void nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx); -static void nvme_ctrlr_populate_ocssd_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, - struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx); static populate_namespace_fn g_populate_namespace_fn[] = { NULL, nvme_ctrlr_populate_standard_namespace, - nvme_ctrlr_populate_ocssd_namespace, + bdev_ocssd_populate_namespace, }; typedef void (*depopulate_namespace_fn)(struct nvme_bdev_ns *ns); static void nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *ns); -static void nvme_ctrlr_depopulate_ocssd_namespace(struct nvme_bdev_ns *ns); static depopulate_namespace_fn g_depopulate_namespace_fn[] = { NULL, nvme_ctrlr_depopulate_standard_namespace, - nvme_ctrlr_depopulate_ocssd_namespace, + bdev_ocssd_depopulate_namespace, }; struct spdk_nvme_qpair * @@ -874,13 +872,6 @@ nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, nvme_ctrlr_populate_namespace_done(ctx, nvme_ns, 0); } -static void -nvme_ctrlr_populate_ocssd_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, - struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx) -{ - nvme_ctrlr_populate_namespace_done(ctx, nvme_ns, 0); -} - static bool hotplug_probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, struct spdk_nvme_ctrlr_opts *opts) @@ -1018,11 +1009,6 @@ nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *ns) ns->populated = false; } -static void -nvme_ctrlr_depopulate_ocssd_namespace(struct nvme_bdev_ns *ns) -{ -} - static void nvme_ctrlr_populate_namespace(struct nvme_bdev_ctrlr *ctrlr, struct nvme_bdev_ns *ns, struct nvme_async_probe_ctx *ctx) { diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c new file mode 100644 index 000000000..d82b7cc37 --- /dev/null +++ b/module/bdev/nvme/bdev_ocssd.c @@ -0,0 +1,152 @@ +/*- + * BSD LICENSE + * + * Copyright (c) Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "spdk/stdinc.h" +#include "spdk/bdev_module.h" +#include "spdk/likely.h" +#include "spdk/log.h" +#include "spdk/string.h" +#include "spdk/nvme_ocssd.h" +#include "spdk/nvme_ocssd_spec.h" +#include "spdk_internal/log.h" +#include "common.h" +#include "bdev_ocssd.h" + +struct bdev_ocssd_ns { + struct spdk_ocssd_geometry_data geometry; +}; + +static int +bdev_ocssd_library_init(void) +{ + return 0; +} + +static void +bdev_ocssd_library_fini(void) +{ +} + +static int +bdev_ocssd_config_json(struct spdk_json_write_ctx *w) +{ + return 0; +} + +static int +bdev_ocssd_get_ctx_size(void) +{ + return 0; +} + +static struct spdk_bdev_module ocssd_if = { + .name = "ocssd", + .module_init = bdev_ocssd_library_init, + .module_fini = bdev_ocssd_library_fini, + .config_json = bdev_ocssd_config_json, + .get_ctx_size = bdev_ocssd_get_ctx_size, +}; + +SPDK_BDEV_MODULE_REGISTER(ocssd, &ocssd_if); + +struct bdev_ocssd_populate_ns_ctx { + struct nvme_async_probe_ctx *nvme_ctx; + struct nvme_bdev_ns *nvme_ns; +}; + +static void +bdev_ocssd_geometry_cb(void *_ctx, const struct spdk_nvme_cpl *cpl) +{ + struct bdev_ocssd_populate_ns_ctx *ctx = _ctx; + struct nvme_bdev_ns *nvme_ns = ctx->nvme_ns; + int rc = 0; + + if (spdk_unlikely(spdk_nvme_cpl_is_error(cpl))) { + SPDK_ERRLOG("Failed to retrieve geometry for namespace %"PRIu32"\n", nvme_ns->id); + free(nvme_ns->type_ctx); + nvme_ns->type_ctx = NULL; + rc = -EIO; + } + + nvme_ctrlr_populate_namespace_done(ctx->nvme_ctx, nvme_ns, rc); + free(ctx); +} + +void +bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, + struct nvme_bdev_ns *nvme_ns, + struct nvme_async_probe_ctx *nvme_ctx) +{ + struct bdev_ocssd_ns *ocssd_ns; + struct bdev_ocssd_populate_ns_ctx *ctx; + int rc; + + ctx = calloc(1, sizeof(*ctx)); + if (ctx == NULL) { + nvme_ctrlr_populate_namespace_done(nvme_ctx, nvme_ns, -ENOMEM); + return; + } + + ocssd_ns = calloc(1, sizeof(*ocssd_ns)); + if (ocssd_ns == NULL) { + nvme_ctrlr_populate_namespace_done(nvme_ctx, nvme_ns, -ENOMEM); + free(ctx); + return; + } + + nvme_ns->type_ctx = ocssd_ns; + ctx->nvme_ctx = nvme_ctx; + ctx->nvme_ns = nvme_ns; + + rc = spdk_nvme_ocssd_ctrlr_cmd_geometry(nvme_bdev_ctrlr->ctrlr, nvme_ns->id, + &ocssd_ns->geometry, + sizeof(ocssd_ns->geometry), + bdev_ocssd_geometry_cb, ctx); + if (spdk_unlikely(rc != 0)) { + SPDK_ERRLOG("Failed to retrieve OC geometry: %s\n", spdk_strerror(-rc)); + nvme_ns->type_ctx = NULL; + nvme_ctrlr_populate_namespace_done(nvme_ctx, nvme_ns, rc); + free(ocssd_ns); + free(ctx); + } +} + +void +bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns) +{ + free(ns->type_ctx); + ns->populated = false; + ns->type_ctx = NULL; +} + +SPDK_LOG_REGISTER_COMPONENT("bdev_ocssd", SPDK_LOG_BDEV_OCSSD) diff --git a/module/bdev/nvme/bdev_ocssd.h b/module/bdev/nvme/bdev_ocssd.h new file mode 100644 index 000000000..fdfb507b8 --- /dev/null +++ b/module/bdev/nvme/bdev_ocssd.h @@ -0,0 +1,45 @@ +/*- + * BSD LICENSE + * + * Copyright (c) Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SPDK_BDEV_OCSSD_H +#define SPDK_BDEV_OCSSD_H + +#include "spdk/stdinc.h" +#include "common.h" + +void bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, + struct nvme_bdev_ns *nvme_ns, + struct nvme_async_probe_ctx *ctx); +void bdev_ocssd_depopulate_namespace(struct nvme_bdev_ns *ns); + +#endif /* SPDK_BDEV_OCSSD_H */