Commit 04a4aab2 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: Simplify handling of spdk_nvmf_tcp_pdu_get failures 



This function can't actually return NULL. It aborts if we get
our math wrong.

Change-Id: Iaf77112addc3c14c70755a56043c5dba3427890d
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478911


Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 75aaaa6b

lib/nvmf/tcp.c

+4 −20
Original line number Diff line number Diff line
@@ -1237,11 +1237,7 @@ spdk_nvmf_tcp_send_c2h_term_req(struct spdk_nvmf_tcp_qpair *tqpair, struct nvme_ 
	uint32_t copy_len;



	rsp_pdu = spdk_nvmf_tcp_pdu_get(tqpair);

	if (!rsp_pdu) {

		tqpair->state = NVME_TCP_QPAIR_STATE_EXITING;

		spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_ERROR);

		return;

	}

	assert(rsp_pdu != NULL);



	c2h_term_req = &rsp_pdu->hdr->term_req;

	c2h_term_req->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_C2H_TERM_REQ;
@@ -1416,11 +1412,7 @@ spdk_nvmf_tcp_send_capsule_resp_pdu(struct spdk_nvmf_tcp_req *tcp_req, 


	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "enter, tqpair=%p\n", tqpair);

	rsp_pdu = spdk_nvmf_tcp_pdu_get(tqpair);

	if (!rsp_pdu) {

		spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_ERROR);

		tqpair->state = NVME_TCP_QPAIR_STATE_EXITING;

		return;

	}

	assert(rsp_pdu != NULL);



	capsule_resp = &rsp_pdu->hdr->capsule_resp;

	capsule_resp->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_CAPSULE_RESP;
@@ -1464,11 +1456,7 @@ spdk_nvmf_tcp_send_r2t_pdu(struct spdk_nvmf_tcp_qpair *tqpair, 
	struct spdk_nvme_tcp_r2t_hdr *r2t;



	rsp_pdu = spdk_nvmf_tcp_pdu_get(tqpair);

	if (!rsp_pdu) {

		tqpair->state = NVME_TCP_QPAIR_STATE_EXITING;

		spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_ERROR);

		return;

	}

	assert(rsp_pdu != NULL);



	r2t = &rsp_pdu->hdr->r2t;

	r2t->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_R2T;
@@ -1653,11 +1641,7 @@ spdk_nvmf_tcp_icreq_handle(struct spdk_nvmf_tcp_transport *ttransport, 
	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "cpda of tqpair=(%p) is : %u\n", tqpair, tqpair->cpda);



	rsp_pdu = spdk_nvmf_tcp_pdu_get(tqpair);

	if (!rsp_pdu) {

		tqpair->state = NVME_TCP_QPAIR_STATE_EXITING;

		spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_ERROR);

		return;

	}

	assert(rsp_pdu != NULL);



	ic_resp = &rsp_pdu->hdr->ic_resp;

	ic_resp->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_IC_RESP;