Commit 5ecfb221 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

thread: In interrupt mode, remove pollers by sending a message 



Move away from relying on spdk_thread_poll() to do clean up in interrupt
mode. In the future, we don't want to have spdk_thread_poll() called at
all.

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


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarJohn Levon <levon@movementarian.org>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f3c1b59a

lib/thread/thread.c

+30 −26
Original line number Diff line number Diff line
@@ -1098,6 +1098,30 @@ thread_poll(struct spdk_thread *thread, uint32_t max_msgs, uint64_t now) 
	return rc;

}



static void

_thread_remove_pollers(void *ctx)

{

	struct spdk_thread *thread = ctx;

	struct spdk_poller *poller, *tmp;



	TAILQ_FOREACH_REVERSE_SAFE(poller, &thread->active_pollers,

				   active_pollers_head, tailq, tmp) {

		if (poller->state == SPDK_POLLER_STATE_UNREGISTERED) {

			TAILQ_REMOVE(&thread->active_pollers, poller, tailq);

			free(poller);

		}

	}



	RB_FOREACH_SAFE(poller, timed_pollers_tree, &thread->timed_pollers, tmp) {

		if (poller->state == SPDK_POLLER_STATE_UNREGISTERED) {

			poller_remove_timer(thread, poller);

			free(poller);

		}

	}



	thread->poller_unregistered = false;

}



int

spdk_thread_poll(struct spdk_thread *thread, uint32_t max_msgs, uint64_t now)

{
@@ -1123,28 +1147,6 @@ spdk_thread_poll(struct spdk_thread *thread, uint32_t max_msgs, uint64_t now) 
	} else {

		/* Non-block wait on thread's fd_group */

		rc = spdk_fd_group_wait(thread->fgrp, 0);



		/* Reap unregistered pollers out of poller execution in intr mode */

		if (spdk_unlikely(thread->poller_unregistered)) {

			struct spdk_poller *poller, *tmp;



			TAILQ_FOREACH_REVERSE_SAFE(poller, &thread->active_pollers,

						   active_pollers_head, tailq, tmp) {

				if (poller->state == SPDK_POLLER_STATE_UNREGISTERED) {

					TAILQ_REMOVE(&thread->active_pollers, poller, tailq);

					free(poller);

				}

			}



			RB_FOREACH_SAFE(poller, timed_pollers_tree, &thread->timed_pollers, tmp) {

				if (poller->state == SPDK_POLLER_STATE_UNREGISTERED) {

					poller_remove_timer(thread, poller);

					free(poller);

				}

			}



			thread->poller_unregistered = false;

		}

	}
@@ -1751,10 +1753,12 @@ spdk_poller_unregister(struct spdk_poller **ppoller) 
			poller_interrupt_fini(poller);

		}



		/* Mark there is poller unregistered. Then unregistered pollers will

		 * get reaped by spdk_thread_poll also in intr mode.

		 */

		/* If there is not already a pending poller removal, generate

		 * a message to go process removals. */

		if (!thread->poller_unregistered) {

			thread->poller_unregistered = true;

			spdk_thread_send_msg(thread, _thread_remove_pollers, thread);

		}

	}



	/* If the poller was paused, put it on the active_pollers list so that