Commit 0573bf58 authored by Krzysztof Goreczny's avatar Krzysztof Goreczny Committed by Jim Harris
Browse files

nvmf/tcp: split out part of the nvmf_tcp_cleanup_all_states 



Move part of the nvmf_tcp_cleanup_all_states responsible for aborting
requests waiting for the iobuf into separate
nvmf_tcp_abort_await_buffer_reqs function.
There is no functional change, rearrange only.

Change-Id: I3b7e3867fa9fa6b47a86820dec6d3cfdd31ed81b
Signed-off-by: default avatarKrzysztof Goreczny <krzysztof.goreczny@dell.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25911


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent 3aac18b2

lib/nvmf/tcp.c

+8 −4
Original line number Diff line number Diff line
@@ -575,20 +575,24 @@ nvmf_tcp_request_get_buffers_abort(struct spdk_nvmf_tcp_req *tcp_req) 
}



static void

nvmf_tcp_cleanup_all_states(struct spdk_nvmf_tcp_qpair *tqpair)

nvmf_tcp_abort_await_buffer_reqs(struct spdk_nvmf_tcp_qpair *tqpair)

{

	struct spdk_nvmf_tcp_req *tcp_req, *req_tmp;



	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST);

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_NEW);



	/* Wipe the requests waiting for buffer from the waiting list */

	TAILQ_FOREACH_SAFE(tcp_req, &tqpair->tcp_req_working_queue, state_link, req_tmp) {

		if (tcp_req->state == TCP_REQUEST_STATE_NEED_BUFFER) {

			nvmf_tcp_request_get_buffers_abort(tcp_req);

		}

	}

}



static void

nvmf_tcp_cleanup_all_states(struct spdk_nvmf_tcp_qpair *tqpair)

{

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST);

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_NEW);

	nvmf_tcp_abort_await_buffer_reqs(tqpair);

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_NEED_BUFFER);

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_EXECUTING);

	nvmf_tcp_drain_state_queue(tqpair, TCP_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER);