ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf/tcp: Remove tcp qpair::send_queue

Browse Source 
This member is useless now, all tcp requests
are tracked using state_queue member.

Change-Id: I4771ec163e44202a5d98d356d8935b6e518575ff
Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5576
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Alexey Marchuk 2020-12-15 10:43:35 +03:00 committed by Tomasz Zawadzki
parent d3d077cc01
commit b5ba9f4d94
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nvmf/tcp.c
View File

@ -221,8 +221,6 @@ struct spdk_nvmf_tcp_qpair {
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. */
@ -409,8 +407,6 @@ nvmf_tcp_cleanup_all_states(struct spdk_nvmf_tcp_qpair *tqpair)
{
struct spdk_nvmf_tcp_req *tcp_req, *req_tmp;
assert(TAILQ_EMPTY(&tqpair->send_queue));
nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST);
nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_NEW);
@ -773,8 +769,6 @@ _pdu_write_done(void *_pdu, int err)
struct nvme_tcp_pdu *pdu = _pdu;
struct spdk_nvmf_tcp_qpair *tqpair = pdu->qpair;
TAILQ_REMOVE(&tqpair->send_queue, pdu, tailq);
if (err != 0) {
nvmf_tcp_qpair_disconnect(tqpair);
return;
@ -819,7 +813,6 @@ nvmf_tcp_qpair_write_pdu(struct spdk_nvmf_tcp_qpair *tqpair,
&mapped_length);
pdu->sock_req.cb_fn = _pdu_write_done;
pdu->sock_req.cb_arg = pdu;
TAILQ_INSERT_TAIL(&tqpair->send_queue, pdu, tailq);
if (pdu->hdr.common.pdu_type == SPDK_NVME_TCP_PDU_TYPE_IC_RESP ||
pdu->hdr.common.pdu_type == SPDK_NVME_TCP_PDU_TYPE_C2H_TERM_REQ) {
rc = spdk_sock_writev(tqpair->sock, pdu->iov, pdu->sock_req.iovcnt);
@ -916,8 +909,6 @@ nvmf_tcp_qpair_init(struct spdk_nvmf_qpair *qpair)
SPDK_DEBUGLOG(nvmf_tcp, "New TCP Connection: %p\n", qpair);
TAILQ_INIT(&tqpair->send_queue);
/* Initialise request state queues of the qpair */
for (i = TCP_REQUEST_STATE_FREE; i < TCP_REQUEST_NUM_STATES; i++) {
TAILQ_INIT(&tqpair->state_queue[i]);

6
test/unit/lib/nvmf/tcp.c/tcp_ut.c
View File

@ -527,7 +527,6 @@ test_nvmf_tcp_send_c2h_data(void)
tcp_req.req.length = 300;
tqpair.qpair.transport = &ttransport.transport;
TAILQ_INIT(&tqpair.send_queue);
/* Set qpair state to make unrelated operations NOP */
tqpair.state = NVME_TCP_QPAIR_STATE_RUNNING;
@ -546,9 +545,6 @@ test_nvmf_tcp_send_c2h_data(void)
nvmf_tcp_send_c2h_data(&tqpair, &tcp_req);
CU_ASSERT(TAILQ_FIRST(&tqpair.send_queue) == &pdu);
TAILQ_REMOVE(&tqpair.send_queue, &pdu, tailq);
c2h_data = &pdu.hdr.c2h_data;
CU_ASSERT(c2h_data->datao == 0);
CU_ASSERT(c2h_data->datal = 300);
@ -659,8 +655,6 @@ test_nvmf_tcp_incapsule_data_handle(void)
TAILQ_INIT(&tqpair.state_queue[i]);
}
TAILQ_INIT(&tqpair.send_queue);
TAILQ_INSERT_TAIL(&tqpair.state_queue[TCP_REQUEST_STATE_FREE], &tcp_req2, state_link);
tqpair.state_cntr[TCP_REQUEST_STATE_FREE]++;
tqpair.qpair.transport = &ttransport.transport;