Commit c833729b authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

sock/uring: Fix the nvmf_shutdown_tc3 failure issue. 

If the socks parameter(passed in uring_sock_group_impl_poll) is NULL,
we do not need to handle the sock_flush and prep the pollin task,
otherwise it will cause the assert issue when we reap the task when
we handle the nvmf_shutdown_tc3 issue.

Because in uring_sock_group_impl_remove_sock, we finally
set sock->group = NULL. Without this patch,
when we call uring_sock_group_impl_poll in this function,
pollin_task or write_task are prepared, then in the next round,
we will reap those tasks again.

PS: Error info can be found in
https://ci.spdk.io/results/autotest-per-patch/builds/19186/archive/nvmf-tcp-vg-autotest/build.log



Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: I7e6deaa05e958b52e71e0bbf0ccdd20e35583685
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3031


Community-CI: Broadcom CI
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 avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 74050eac

module/sock/uring/uring.c

+8 −6
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ uring_sock_group_impl_poll(struct spdk_sock_group_impl *_group, int max_events, 
	struct spdk_sock *_sock, *tmp;

	struct spdk_uring_sock *sock;



	if (spdk_likely(socks)) {

		TAILQ_FOREACH_SAFE(_sock, &group->base.socks, link, tmp) {

			sock = __uring_sock(_sock);

			if (spdk_unlikely(sock->connection_status)) {
@@ -1207,6 +1208,7 @@ uring_sock_group_impl_poll(struct spdk_sock_group_impl *_group, int max_events, 
			_sock_flush(_sock);

			_sock_prep_pollin(_sock);

		}

	}



	to_submit = group->io_queued;