Commit f600ca4c authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: Repack spdk_nvmf_tcp_qpair structure 



Move data used in IO path to the beginning of the structure,
eliminate several holes

Change-Id: I45202f31c888fba32307a8b8ae2b62e7e601a32f
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4760


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent a85057ea

lib/nvmf/tcp.c

+14 −13
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ struct spdk_nvmf_tcp_req { 
struct spdk_nvmf_tcp_qpair {

	struct spdk_nvmf_qpair			qpair;

	struct spdk_nvmf_tcp_poll_group		*group;

	struct spdk_nvmf_tcp_port		*port;

	struct spdk_sock			*sock;



	enum nvme_tcp_pdu_recv_state		recv_state;
@@ -211,31 +210,33 @@ struct spdk_nvmf_tcp_qpair { 


	/* PDU being actively received */

	struct nvme_tcp_pdu			pdu_in_progress;

	uint32_t				recv_buf_size;



	/* Queues to track the requests in all states */

	TAILQ_HEAD(, spdk_nvmf_tcp_req)		state_queue[TCP_REQUEST_NUM_STATES];

	/* Number of requests in each state */

	uint32_t				state_cntr[TCP_REQUEST_NUM_STATES];



	uint8_t					cpda;



	bool					host_hdgst_enable;

	bool					host_ddgst_enable;



	TAILQ_HEAD(, nvme_tcp_pdu)		send_queue;



	/* This is a spare PDU used for sending special management

	 * operations. Primarily, this is used for the initial

	 * connection response and c2h termination request. */

	struct nvme_tcp_pdu			*mgmt_pdu;



	TAILQ_HEAD(, nvme_tcp_pdu)		send_queue;



	/* Arrays of in-capsule buffers, requests, and pdus.

	 * Each array is 'resource_count' number of elements */

	void					*bufs;

	struct spdk_nvmf_tcp_req		*reqs;

	struct nvme_tcp_pdu			*pdus;

	uint32_t				resource_count;

	uint32_t				recv_buf_size;



	/* Queues to track the requests in all states */

	TAILQ_HEAD(, spdk_nvmf_tcp_req)		state_queue[TCP_REQUEST_NUM_STATES];

	/* Number of requests in each state */

	uint32_t				state_cntr[TCP_REQUEST_NUM_STATES];



	uint8_t					cpda;



	bool					host_hdgst_enable;

	bool					host_ddgst_enable;

	struct spdk_nvmf_tcp_port		*port;



	/* IP address */

	char					initiator_addr[SPDK_NVMF_TRADDR_MAX_LEN];