Commit d3bbbfee authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Benjamin Walker
Browse files

nvmf: move private #defines to nvmf_internal.h 



SPDK_NVMF_BUILD_ETC will be cleaned up in another commit; it is
currently used both in the lib and in nvmf_tgt.

Change-Id: Ibc5f15cc4341f9d52b29c84defcd332bec4a4d09
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent c78d4d0b

lib/nvmf/conf.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


#include "conf.h"

#include "init_grp.h"

#include "nvmf.h"

#include "nvmf_internal.h"

#include "port.h"

#include "spdk/conf.h"

#include "spdk/log.h"

lib/nvmf/nvmf.h

+0 −31
Original line number Diff line number Diff line
@@ -42,45 +42,14 @@ 
 *

 */



#define SMALL_BB_MAX_SIZE 4096

#define LARGE_BB_MAX_SIZE (128 * 1024)



/*

 * NVMf target supports a maximum transfer size that is equal to

 * a single allocated bounce buffer per request.

 */

#define SPDK_NVMF_MAX_RECV_DATA_TRANSFER_SIZE  LARGE_BB_MAX_SIZE





#define SPDK_NVMF_BUILD_ETC "/usr/local/etc/nvmf"

#define SPDK_NVMF_DEFAULT_NUM_SESSIONS_PER_LCORE 1

#define SPDK_NVMF_DEFAULT_AUTHFILE SPDK_NVMF_BUILD_ETC "/auth.conf"

#define SPDK_NVMF_DEFAULT_NODEBASE "iqn.2013-10.com.intel.spdk"

#define SPDK_NVMF_DEFAULT_IN_CAPSULE_DATA_SIZE 1024

#define SPDK_NVMF_DEFAULT_MAX_SESSIONS_PER_SUBSYSTEM 1

#define SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH 128

#define SPDK_NVMF_DEFAULT_MAX_CONNECTIONS_PER_SESSION 4

#define SPDK_NVMF_DEFAULT_SIN_PORT ((uint16_t)7174)



#define OBJECT_NVMF_IO				0x30



#define TRACE_GROUP_NVMF			0x3

#define TRACE_NVMF_IO_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x0)

#define TRACE_RDMA_READ_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x1)

#define TRACE_RDMA_WRITE_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x2)

#define TRACE_RDMA_READ_COMPLETE      		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x3)

#define TRACE_RDMA_WRITE_COMPLETE		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x4)

#define TRACE_NVMF_LIB_READ_START		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x5)

#define TRACE_NVMF_LIB_WRITE_START		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x6)

#define TRACE_NVMF_LIB_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x7)

#define TRACE_NVMF_IO_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x8)



int

nvmf_tgt_init(char *authfile, char *nodebase, int max_in_capsule_data, int max_sessions,

	      int max_queue_depth, int max_conn_per_sess, int max_recv_seg_len, int listen_port);



struct nvmf_request;



int

spdk_nvmf_check_pools(void);

lib/nvmf/nvmf_internal.h

+33 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#ifndef __NVMF_INTERNAL_H__

#define __NVMF_INTERNAL_H__



#include "nvmf.h"



#include <stdbool.h>

#include <stdlib.h>

#include <string.h>
@@ -46,6 +48,37 @@ 


#define nvmf_min(a,b) (((a)<(b))?(a):(b))



#define SMALL_BB_MAX_SIZE 4096

#define LARGE_BB_MAX_SIZE (128 * 1024)



/*

 * NVMf target supports a maximum transfer size that is equal to

 * a single allocated bounce buffer per request.

 */

#define SPDK_NVMF_MAX_RECV_DATA_TRANSFER_SIZE  LARGE_BB_MAX_SIZE



#define SPDK_NVMF_DEFAULT_NUM_SESSIONS_PER_LCORE 1

#define SPDK_NVMF_DEFAULT_AUTHFILE SPDK_NVMF_BUILD_ETC "/auth.conf"

#define SPDK_NVMF_DEFAULT_NODEBASE "iqn.2013-10.com.intel.spdk"

#define SPDK_NVMF_DEFAULT_IN_CAPSULE_DATA_SIZE 1024

#define SPDK_NVMF_DEFAULT_MAX_SESSIONS_PER_SUBSYSTEM 1

#define SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH 128

#define SPDK_NVMF_DEFAULT_MAX_CONNECTIONS_PER_SESSION 4

#define SPDK_NVMF_DEFAULT_SIN_PORT ((uint16_t)7174)



#define OBJECT_NVMF_IO				0x30



#define TRACE_GROUP_NVMF			0x3

#define TRACE_NVMF_IO_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x0)

#define TRACE_RDMA_READ_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x1)

#define TRACE_RDMA_WRITE_START			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x2)

#define TRACE_RDMA_READ_COMPLETE      		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x3)

#define TRACE_RDMA_WRITE_COMPLETE		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x4)

#define TRACE_NVMF_LIB_READ_START		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x5)

#define TRACE_NVMF_LIB_WRITE_START		SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x6)

#define TRACE_NVMF_LIB_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x7)

#define TRACE_NVMF_IO_COMPLETE			SPDK_TPOINT_ID(TRACE_GROUP_NVMF, 0x8)



struct nvmf_request;



typedef void (*nvmf_cb_fn_t)(struct nvmf_request *);