From d9afeb150e714ea5c9c361d9093934c5a327b4b0 Mon Sep 17 00:00:00 2001 From: Michael Haeuptle Date: Thu, 2 Jan 2020 20:40:56 +0000 Subject: [PATCH] lib/nvmf: preparation for custom admin cmd handler This commit exposes some internal functions and enums in preparation for the custom admin cmd handler functionality. Signed-off-by: Michael Haeuptle Change-Id: Iec15c1f3d9cba5db267f6e43f3d929cf382ca8f4 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476800 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- include/spdk_internal/nvmf.h | 53 ++++++++++++++++++++++++++++++++++++ lib/nvmf/ctrlr.c | 5 ++-- lib/nvmf/ctrlr_bdev.c | 1 + lib/nvmf/nvmf_internal.h | 5 ---- 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 include/spdk_internal/nvmf.h diff --git a/include/spdk_internal/nvmf.h b/include/spdk_internal/nvmf.h new file mode 100644 index 000000000..83c87de07 --- /dev/null +++ b/include/spdk_internal/nvmf.h @@ -0,0 +1,53 @@ +/*- + * 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_NVMF_INTERNAL_H_ +#define SPDK_NVMF_INTERNAL_H_ + +#include "spdk/stdinc.h" +#include "spdk/nvmf.h" + +typedef enum _spdk_nvmf_request_exec_status { + SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE, + SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS, +} spdk_nvmf_request_exec_status; + +int spdk_nvmf_ctrlr_identify_ctrlr(struct spdk_nvmf_ctrlr *ctrlr, + struct spdk_nvme_ctrlr_data *cdata); + +int spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, + struct spdk_nvme_cmd *cmd, + struct spdk_nvme_cpl *rsp, + struct spdk_nvme_ns_data *nsdata); + +#endif /* SPDK_NVMF_INTERNAL_H_ */ diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 9e2227db4..b8ba9bc47 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -45,6 +45,7 @@ #include "spdk/util.h" #include "spdk/version.h" +#include "spdk_internal/nvmf.h" #include "spdk_internal/log.h" #define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000 @@ -1510,7 +1511,7 @@ invalid_log_page: return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; } -static int +int spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd, struct spdk_nvme_cpl *rsp, @@ -1552,7 +1553,7 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; } -static int +int spdk_nvmf_ctrlr_identify_ctrlr(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_ctrlr_data *cdata) { struct spdk_nvmf_subsystem *subsystem = ctrlr->subsys; diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c index 327db1666..c1b23acd2 100644 --- a/lib/nvmf/ctrlr_bdev.c +++ b/lib/nvmf/ctrlr_bdev.c @@ -46,6 +46,7 @@ #include "spdk/string.h" #include "spdk/util.h" +#include "spdk_internal/nvmf.h" #include "spdk_internal/log.h" static bool diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index ee7111fd5..9adcceee8 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -185,11 +185,6 @@ struct spdk_nvmf_poll_group { struct spdk_nvmf_poll_group_stat stat; }; -typedef enum _spdk_nvmf_request_exec_status { - SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE, - SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS, -} spdk_nvmf_request_exec_status; - union nvmf_h2c_msg { struct spdk_nvmf_capsule_cmd nvmf_cmd; struct spdk_nvme_cmd nvme_cmd;