Commit 696cad6d authored by Jaylyn-Ren's avatar Jaylyn-Ren Committed by Tomasz Zawadzki
Browse files

event/app: Add a parameter to set app to interrupt mode 



Add "-J" parameter to set app into interrupt mode

Signed-off-by: default avatarJaylyn-Ren <jaylyn.ren@arm.com>
Change-Id: I7c71c72989afb06b92e35759c1c56a211cea92f8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18578


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJohn Levon <levon@movementarian.org>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c4f5c298

include/spdk/event.h

+5 −3
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ struct spdk_app_opts { 
	 */

	bool disable_signal_handlers;



	/* Hole at bytes 185-191. */

	uint8_t reserved185[7];

	bool interrupt_mode;



	/* Hole at bytes 186-191. */

	uint8_t reserved186[6];



	/**

	 * The allocated size for the message pool used by the threading library.
@@ -271,7 +273,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask); 
 */

const struct spdk_cpuset *spdk_app_get_core_mask(void);



#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:L:RW:"

#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:JL:RW:"



enum spdk_app_parse_args_rvals {

	SPDK_APP_PARSE_ARGS_HELP = 0,

lib/event/app.c

+12 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ static const struct option g_cmdline_options[] = { 
	{"pci-allowed",			required_argument,	NULL, PCI_ALLOWED_OPT_IDX},

#define PCI_WHITELIST_OPT_IDX	'W'

	{"pci-whitelist",		required_argument,	NULL, PCI_WHITELIST_OPT_IDX}, /* deprecated */

#define INTERRUPT_MODE_OPT_IDX	'J'

	{"interrupt-mode",		no_argument,		NULL, INTERRUPT_MODE_OPT_IDX},

#define SILENCE_NOTICELOG_OPT_IDX 257

	{"silence-noticelog",		no_argument,		NULL, SILENCE_NOTICELOG_OPT_IDX},

#define WAIT_FOR_RPC_OPT_IDX	258
@@ -238,6 +240,7 @@ spdk_app_opts_init(struct spdk_app_opts *opts, size_t opts_size) 
	SET_FIELD(num_entries, SPDK_APP_DEFAULT_NUM_TRACE_ENTRIES);

	SET_FIELD(delay_subsystem_init, false);

	SET_FIELD(disable_signal_handlers, false);

	SET_FIELD(interrupt_mode, false);

	/* Don't set msg_mempool_size here, it is set or calculated later */

	SET_FIELD(rpc_allowlist, NULL);

	SET_FIELD(rpc_log_file, NULL);
@@ -562,6 +565,7 @@ app_copy_opts(struct spdk_app_opts *opts, struct spdk_app_opts *opts_user, size_ 
	SET_FIELD(log);

	SET_FIELD(base_virtaddr);

	SET_FIELD(disable_signal_handlers);

	SET_FIELD(interrupt_mode);

	SET_FIELD(msg_mempool_size);

	SET_FIELD(rpc_allowlist);

	SET_FIELD(vf_token);
@@ -742,6 +746,10 @@ spdk_app_start(struct spdk_app_opts *opts_user, spdk_msg_fn start_fn, 
	}

#endif



	if (opts->interrupt_mode) {

		spdk_interrupt_mode_enable();

	}



	memset(&g_spdk_app, 0, sizeof(g_spdk_app));

	g_spdk_app.json_config_file = opts->json_config_file;

	g_spdk_app.json_config_ignore_errors = opts->json_config_ignore_errors;
@@ -963,6 +971,7 @@ usage(void (*app_usage)(void)) 
	printf("     --vfio-vf-token       VF token (UUID) shared between SR-IOV PF and VFs for vfio_pci driver\n");

	spdk_log_usage(stdout, "-L");

	spdk_trace_mask_usage(stdout, "-e");

	printf(" -J, --interrupt-mode      set app to interrupt mode (Warning: CPU usage will be reduced only if all pollers in the app support interrupt mode)\n");

	if (app_usage) {

		app_usage();

	}
@@ -1247,6 +1256,9 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts, 
		case ENV_VF_TOKEN_OPT_IDX:

			opts->vf_token = optarg;

			break;

		case INTERRUPT_MODE_OPT_IDX:

			opts->interrupt_mode = true;

			break;

		case VERSION_OPT_IDX:

			printf(SPDK_VERSION_STRING"\n");

			retval = SPDK_APP_PARSE_ARGS_HELP;