Commit d546e3d9 authored by Young Tack Jin's avatar Young Tack Jin Committed by Ben Walker
Browse files

app: pci_black/whitelist on global config and command line option 



Ioat config's Whitelist is late for DPDK EAL and single application
occupies all IOAT copy engines.

Change-Id: I8749f740ff1bec5bb022b39fc2256880369b467a
Signed-off-by: default avatarYoung Tack Jin <youngtack.jin@circuitblvd.com>
Reviewed-on: https://review.gerrithub.io/405911


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent f7b58aea

etc/spdk/nvmf.conf.in

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
  # Set to 0xFFFFFFFFFFFFFFFF to enable all tracepoint groups.

  #TpointGroupMask 0x0



  # PciBlacklist and PciWhitelist cannot be used at the same time

  #PciBlacklist 0000:01:00.0

  #PciBlacklist 0000:02:00.0

  #PciWhitelist 0000:03:00.0

  #PciWhitelist 0000:04:00.0



# Users may change this section to create a different number or size of

#  malloc LUNs.

# This will generate 8 LUNs with a malloc-allocated backend.

include/spdk/env.h

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ struct spdk_env_opts { 
	int			mem_size;

	bool			no_pci;

	bool			hugepage_single_segments;

	size_t			num_pci_addr;

	struct spdk_pci_addr	*pci_blacklist;

	struct spdk_pci_addr	*pci_whitelist;



	/** Opaque context for use of the env implementation. */

	void			*env_context;

include/spdk/event.h

+4 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ struct spdk_app_opts { 
	bool			no_pci;

	bool			hugepage_single_segments;

	enum spdk_log_level	print_level;

	size_t			num_pci_addr;

	struct spdk_pci_addr	*pci_blacklist;

	struct spdk_pci_addr	*pci_whitelist;



	/* The maximum latency allowed when passing an event

	 * from one core to another. A value of 0
@@ -186,7 +189,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask); 
 */

struct spdk_cpuset *spdk_app_get_core_mask(void);



#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:qr:s:t:u"

#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:qr:s:t:uB:W:"



enum spdk_app_parse_args_rvals {

	SPDK_APP_PARSE_ARGS_HELP = 0,

lib/env_dpdk/init.c

+16 −0
Original line number Diff line number Diff line
@@ -250,6 +250,22 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts) 
		}

	}



	if (opts->num_pci_addr) {

		size_t i;

		char bdf[32];

		struct spdk_pci_addr *pci_addr =

				opts->pci_blacklist ? opts->pci_blacklist : opts->pci_whitelist;



		for (i = 0; i < opts->num_pci_addr; i++) {

			spdk_pci_addr_fmt(bdf, 32, &pci_addr[i]);

			args = spdk_push_arg(args, &argcount, _sprintf_alloc("%s %s",

					     (opts->pci_blacklist ? "-b" : "-w"), bdf));

			if (args == NULL) {

				return -1;

			}

		}

	}



#ifdef __linux__

	if (opts->shm_id < 0) {

		args = spdk_push_arg(args, &argcount, _sprintf_alloc("--file-prefix=spdk_pid%d",

lib/event/app.c

+105 −2
Original line number Diff line number Diff line
@@ -301,10 +301,34 @@ error: 
	return NULL;

}



static void

static int

spdk_app_opts_add_pci_addr(struct spdk_app_opts *opts, struct spdk_pci_addr **list, char *bdf)

{

	struct spdk_pci_addr *tmp = *list;

	size_t i = opts->num_pci_addr;



	tmp = realloc(tmp, sizeof(*tmp) * (i + 1));

	if (tmp == NULL) {

		SPDK_ERRLOG("realloc error\n");

		return -ENOMEM;

	}



	*list = tmp;

	if (spdk_pci_addr_parse(*list + i, bdf) < 0) {

		SPDK_ERRLOG("Invalid address %s\n", bdf);

		return -EINVAL;

	}



	opts->num_pci_addr++;

	return 0;

}



static int

spdk_app_read_config_file_global_params(struct spdk_app_opts *opts)

{

	struct spdk_conf_section *sp;

	char *bdf;

	int i, rc = 0;



	sp = spdk_conf_find_section(NULL, "Global");
@@ -331,6 +355,43 @@ spdk_app_read_config_file_global_params(struct spdk_app_opts *opts) 
			opts->tpoint_group_mask = spdk_conf_section_get_val(sp, "TpointGroupMask");

		}

	}



	if (sp == NULL) {

		return 0;

	}



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

		bdf = spdk_conf_section_get_nmval(sp, "PciBlacklist", i, 0);

		if (!bdf) {

			break;

		}



		rc = spdk_app_opts_add_pci_addr(opts, &opts->pci_blacklist, bdf);

		if (rc != 0) {

			free(opts->pci_blacklist);

			return rc;

		}

	}



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

		bdf = spdk_conf_section_get_nmval(sp, "PciWhitelist", i, 0);

		if (!bdf) {

			break;

		}



		if (opts->pci_blacklist != NULL) {

			SPDK_ERRLOG("PciBlacklist and PciWhitelist cannot be used at the same time\n");

			free(opts->pci_blacklist);

			return -EINVAL;

		}



		rc = spdk_app_opts_add_pci_addr(opts, &opts->pci_whitelist, bdf);

		if (rc != 0) {

			free(opts->pci_whitelist);

			return rc;

		}

	}

	return 0;

}



static int
@@ -348,8 +409,14 @@ spdk_app_setup_env(struct spdk_app_opts *opts) 
	env_opts.master_core = opts->master_core;

	env_opts.mem_size = opts->mem_size;

	env_opts.no_pci = opts->no_pci;

	env_opts.num_pci_addr = opts->num_pci_addr;

	env_opts.pci_blacklist = opts->pci_blacklist;

	env_opts.pci_whitelist = opts->pci_whitelist;



	rc = spdk_env_init(&env_opts);

	free(env_opts.pci_blacklist);

	free(env_opts.pci_whitelist);



	if (rc < 0) {

		SPDK_ERRLOG("Unable to initialize SPDK env\n");

	}
@@ -431,7 +498,9 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
		goto app_start_setup_conf_err;

	}



	spdk_app_read_config_file_global_params(opts);

	if (spdk_app_read_config_file_global_params(opts) < 0) {

		goto app_start_setup_conf_err;

	}



	spdk_log_set_level(SPDK_APP_DEFAULT_LOG_LEVEL);

	spdk_log_open();
@@ -552,6 +621,8 @@ usage(char *executable_name, struct spdk_app_opts *default_opts, void (*app_usag 
		printf("all hugepage memory)\n");

	}

	printf(" -u         disable PCI access.\n");

	printf(" -B addr    pci addr to blacklist\n");

	printf(" -W addr    pci addr to whitelist (-B and -W cannot be used at the same time)\n");

	spdk_tracelog_usage(stdout, "-t");

	app_usage();

}
@@ -677,6 +748,38 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts, 
		case 'u':

			opts->no_pci = true;

			break;

		case 'B':

			if (opts->pci_whitelist) {

				free(opts->pci_whitelist);

				fprintf(stderr, "-B and -W cannot be used at the same time\n");

				usage(argv[0], &default_opts, app_usage);

				rval = SPDK_APP_PARSE_ARGS_FAIL;

				goto parse_done;

			}



			rc = spdk_app_opts_add_pci_addr(opts, &opts->pci_blacklist, optarg);

			if (rc != 0) {

				free(opts->pci_blacklist);

				rval = SPDK_APP_PARSE_ARGS_FAIL;

				goto parse_done;

			}

			break;

		case 'W':

			if (opts->pci_blacklist) {

				free(opts->pci_blacklist);

				fprintf(stderr, "-B and -W cannot be used at the same time\n");

				usage(argv[0], &default_opts, app_usage);

				rval = SPDK_APP_PARSE_ARGS_FAIL;

				goto parse_done;

			}



			rc = spdk_app_opts_add_pci_addr(opts, &opts->pci_whitelist, optarg);

			if (rc != 0) {

				free(opts->pci_whitelist);

				rval = SPDK_APP_PARSE_ARGS_FAIL;

				goto parse_done;

			}

			break;

		case '?':

			/*

			 * In the event getopt() above detects an option