Commit 75169d0d authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: update pdu_in_use flag in write functions 



This makes the flag indicate whether there's an outstanding PDU write
for a given request.  Additionally, it reduces the number of places we
need to update this flag.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Id7e587f84955b096c46bfbf88d4dd222214d4a6a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12254


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent c676c081

lib/nvmf/tcp.c

+8 −14
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static inline struct nvme_tcp_pdu * 
nvmf_tcp_req_pdu_init(struct spdk_nvmf_tcp_req *tcp_req)

{

	assert(tcp_req->pdu_in_use == false);

	tcp_req->pdu_in_use = true;



	memset(tcp_req->pdu, 0, sizeof(*tcp_req->pdu));

	tcp_req->pdu->qpair = SPDK_CONTAINEROF(tcp_req->req.qpair, struct spdk_nvmf_tcp_qpair, qpair);
@@ -413,12 +412,6 @@ nvmf_tcp_req_pdu_init(struct spdk_nvmf_tcp_req *tcp_req) 
	return tcp_req->pdu;

}



static inline void

nvmf_tcp_req_pdu_fini(struct spdk_nvmf_tcp_req *tcp_req)

{

	tcp_req->pdu_in_use = false;

}



static struct spdk_nvmf_tcp_req *

nvmf_tcp_req_get(struct spdk_nvmf_tcp_qpair *tqpair)

{
@@ -444,6 +437,8 @@ nvmf_tcp_req_get(struct spdk_nvmf_tcp_qpair *tqpair) 
static inline void

nvmf_tcp_req_put(struct spdk_nvmf_tcp_qpair *tqpair, struct spdk_nvmf_tcp_req *tcp_req)

{

	assert(!tcp_req->pdu_in_use);



	TAILQ_REMOVE(&tqpair->tcp_req_working_queue, tcp_req, state_link);

	TAILQ_INSERT_TAIL(&tqpair->tcp_req_free_queue, tcp_req, state_link);

	nvmf_tcp_req_set_state(tcp_req, TCP_REQUEST_STATE_FREE);
@@ -904,6 +899,9 @@ _req_pdu_write_done(void *req, int err) 
	struct nvme_tcp_pdu *pdu = tcp_req->pdu;

	struct spdk_nvmf_tcp_qpair *tqpair = pdu->qpair;



	assert(tcp_req->pdu_in_use);

	tcp_req->pdu_in_use = false;



	if (spdk_unlikely(err != 0)) {

		nvmf_tcp_qpair_disconnect(tqpair);

		return;
@@ -1035,6 +1033,9 @@ nvmf_tcp_qpair_write_req_pdu(struct spdk_nvmf_tcp_qpair *tqpair, 
	pdu->sock_req.cb_fn = _req_pdu_write_done;

	pdu->sock_req.cb_arg = tcp_req;



	assert(!tcp_req->pdu_in_use);

	tcp_req->pdu_in_use = true;



	nvmf_tcp_qpair_write_pdu(tqpair, pdu, cb_fn, cb_arg);

}
@@ -1722,7 +1723,6 @@ nvmf_tcp_pdu_c2h_data_complete(void *cb_arg) 
	if (tcp_req->pdu->hdr.c2h_data.common.flags & SPDK_NVME_TCP_C2H_DATA_FLAGS_SUCCESS) {

		nvmf_tcp_request_free(tcp_req);

	} else {

		nvmf_tcp_req_pdu_fini(tcp_req);

		nvmf_tcp_send_capsule_resp_pdu(tcp_req, tqpair);

	}

}
@@ -1733,8 +1733,6 @@ nvmf_tcp_r2t_complete(void *cb_arg) 
	struct spdk_nvmf_tcp_req *tcp_req = cb_arg;

	struct spdk_nvmf_tcp_transport *ttransport;



	nvmf_tcp_req_pdu_fini(tcp_req);



	ttransport = SPDK_CONTAINEROF(tcp_req->req.qpair->transport,

				      struct spdk_nvmf_tcp_transport, transport);
@@ -2447,7 +2445,6 @@ _nvmf_tcp_send_c2h_data(struct spdk_nvmf_tcp_qpair *tqpair, 


	rsp_pdu = tcp_req->pdu;

	assert(rsp_pdu != NULL);

	assert(tcp_req->pdu_in_use);



	c2h_data = &rsp_pdu->hdr.c2h_data;

	c2h_data->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_C2H_DATA;
@@ -2544,7 +2541,6 @@ _nvmf_tcp_send_c2h_data(struct spdk_nvmf_tcp_qpair *tqpair, 
				    err_blk.err_type, err_blk.err_offset);

			rsp->status.sct = SPDK_NVME_SCT_MEDIA_ERROR;

			rsp->status.sc = nvmf_tcp_dif_error_to_compl_status(err_blk.err_type);

			nvmf_tcp_req_pdu_fini(tcp_req);

			nvmf_tcp_send_capsule_resp_pdu(tcp_req, tqpair);

			return;

		}
@@ -2997,8 +2993,6 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
				tcp_req->fused_pair = NULL;

			}



			nvmf_tcp_req_pdu_fini(tcp_req);



			nvmf_tcp_req_put(tqpair, tcp_req);

			break;

		case TCP_REQUEST_NUM_STATES: