Commit a7b15178 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

lib/event: do not set interrupt mode when eventfd is not supported 



spdk_reactor_set_interrupt_mode() writes/reads from fds created during
reactor_interrupt_init(). Since spdk_fd_group_create() depends
on eventfd, this will not work for systems that do not have it.

reactor_interrupt_init() handled lack of support for eventfd correctly,
while spdk_reactor_set_interrupt_mode() did not check for it.

Reported-by: default avatarNick Connolly <nick.connolly@mayadata.io>
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I5181d436636c55cca3a06b1947e944502a9204ce
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9131


Reviewed-by: default avatarNick Connolly <nick.connolly@mayadata.io>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 4f99de08

lib/event/reactor.c

+5 −0
Original line number Diff line number Diff line
@@ -429,6 +429,11 @@ spdk_reactor_set_interrupt_mode(uint32_t lcore, bool new_in_interrupt, 
		return -EINVAL;

	}



	/* Eventfd has to be supported in order to use interrupt functionality. */

	if (target->fgrp == NULL) {

		return -ENOTSUP;

	}



	if (spdk_get_thread() != _spdk_get_app_thread()) {

		SPDK_ERRLOG("It is only permitted within spdk application thread.\n");

		return -EPERM;

test/unit/lib/event/reactor.c/reactor_ut.c

+6 −2
Original line number Diff line number Diff line
@@ -883,7 +883,9 @@ test_governor(void) 
	MOCK_SET(spdk_env_get_current_core, 0);

	_reactors_scheduler_gather_metrics(NULL, NULL);



	CU_ASSERT(_run_events_till_completion(2) == 6);

	i = _run_events_till_completion(2);

	/* Six runs when interrupt mode is supported, two if not. */

	CU_ASSERT(i == 6 || i == 2);

	MOCK_SET(spdk_env_get_current_core, 0);



	/* Main core should be busy more than 50% time now - frequency should be raised */
@@ -906,7 +908,9 @@ test_governor(void) 
	MOCK_SET(spdk_env_get_current_core, 0);

	_reactors_scheduler_gather_metrics(NULL, NULL);



	CU_ASSERT(_run_events_till_completion(2) == 6);

	i = _run_events_till_completion(2);

	/* Six runs when interrupt mode is supported, two if not. */

	CU_ASSERT(i == 6 || i == 2);

	MOCK_SET(spdk_env_get_current_core, 0);



	for (i = 0; i < 2; i++) {