Commit 11595300 authored by Jim Harris's avatar Jim Harris
Browse files

nvmf/tcp: add nvmf_tcp_qpair_process() helper function 



Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I25e6a0c57ae07510e6ad036e8689f15adbdf82af
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25174


Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ea7fd2a5

lib/nvmf/tcp.c

+11 −9
Original line number Diff line number Diff line
@@ -3392,9 +3392,8 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
}



static void

tcp_sock_cb(void *arg)

nvmf_tcp_qpair_process(struct spdk_nvmf_tcp_qpair *tqpair)

{

	struct spdk_nvmf_tcp_qpair *tqpair = arg;

	int rc;



	assert(tqpair != NULL);
@@ -3406,6 +3405,14 @@ tcp_sock_cb(void *arg) 
	}

}



static void

tcp_sock_cb(void *arg)

{

	struct spdk_nvmf_tcp_qpair *tqpair = arg;



	nvmf_tcp_qpair_process(tqpair);

}



static void

nvmf_tcp_sock_cb(void *arg, struct spdk_sock_group *group, struct spdk_sock *sock)

{
@@ -3554,7 +3561,7 @@ static int 
nvmf_tcp_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)

{

	struct spdk_nvmf_tcp_poll_group *tgroup;

	int num_events, rc;

	int num_events;

	struct spdk_nvmf_tcp_qpair *tqpair, *tqpair_tmp;



	tgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_tcp_poll_group, group);
@@ -3570,12 +3577,7 @@ nvmf_tcp_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) 


	TAILQ_FOREACH_SAFE(tqpair, &tgroup->await_req, link, tqpair_tmp) {

		num_events++;

		rc = nvmf_tcp_sock_process(tqpair);



		/* If there was a new socket error, disconnect */

		if (spdk_unlikely(rc < 0)) {

			nvmf_tcp_qpair_disconnect(tqpair);

		}

		nvmf_tcp_qpair_process(tqpair);

	}



	return num_events;