ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env_dpdk: start using allow/block command line option

Browse Source 
pci-whitelist and pci-blacklist are deprecated, so
use 'allow' and 'block' instead for DPDK versions that
support it.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I430f73fc402ca9fc07d004e719435e5b3dc963f9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5278
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2020-11-25 21:05:09 +00:00 committed by Tomasz Zawadzki
parent 54a4e32eb3
commit ddd71f939d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/env_dpdk/init.c
View File

@ -52,6 +52,14 @@
#define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1" #define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1"
#define SPDK_ENV_DPDK_DEFAULT_BASE_VIRTADDR 0x200000000000 #define SPDK_ENV_DPDK_DEFAULT_BASE_VIRTADDR 0x200000000000
#if RTE_VERSION < RTE_VERSION_NUM(20, 11, 0, 0)
#define DPDK_ALLOW_PARAM "--allow"
#define DPDK_BLOCK_PARAM "--block"
#else
#define DPDK_ALLOW_PARAM "--pci-whitelist"
#define DPDK_BLOCK_PARAM "--pci-blacklist"
#endif
static char **g_eal_cmdline; static char **g_eal_cmdline;
static int g_eal_cmdline_argcount; static int g_eal_cmdline_argcount;
static bool g_external_init = true; static bool g_external_init = true;
@ -345,7 +353,7 @@ build_eal_cmdline(const struct spdk_env_opts *opts)
for (i = 0; i < opts->num_pci_addr; i++) { for (i = 0; i < opts->num_pci_addr; i++) {
spdk_pci_addr_fmt(bdf, 32, &pci_addr[i]); spdk_pci_addr_fmt(bdf, 32, &pci_addr[i]);
args = push_arg(args, &argcount, _sprintf_alloc("%s=%s", args = push_arg(args, &argcount, _sprintf_alloc("%s=%s",
(opts->pci_blacklist ? "--pci-blacklist" : "--pci-whitelist"), (opts->pci_blacklist ? DPDK_BLOCK_PARAM : DPDK_ALLOW_PARAM),
bdf)); bdf));
if (args == NULL) { if (args == NULL) {
return -1; return -1;