Commit d9afeb15 authored by Michael Haeuptle's avatar Michael Haeuptle Committed by Tomasz Zawadzki
Browse files

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: default avatarMichael Haeuptle <michael.haeuptle@hpe.com>
Change-Id: Iec15c1f3d9cba5db267f6e43f3d929cf382ca8f4
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476800


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 2a2b7296

include/spdk_internal/nvmf.h

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*-

 *   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_ */

lib/nvmf/ctrlr.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/ctrlr_bdev.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "spdk/string.h"

#include "spdk/util.h"



#include "spdk_internal/nvmf.h"

#include "spdk_internal/log.h"



static bool

lib/nvmf/nvmf_internal.h

+0 −5
Original line number Diff line number Diff line
@@ -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;