Commit b3767a23 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

env_dpdk: expose base virtaddr as an option 



This might be helpful if secondary processes cannot start due to
conflicts in address map.

Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I180dc09b4cad3b0064f009b0f553f5929de6566c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2776


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 37051fa6

include/spdk/env.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct spdk_env_opts { 
	const char		*hugedir;

	struct spdk_pci_addr	*pci_blacklist;

	struct spdk_pci_addr	*pci_whitelist;

	uint64_t		base_virtaddr;



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

	void			*env_context;

lib/env_dpdk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



SO_VER := 3

SO_VER := 4

SO_MINOR := 0



CFLAGS += $(ENV_CFLAGS)

lib/env_dpdk/init.c

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define SPDK_ENV_DPDK_DEFAULT_MASTER_CORE	-1

#define SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL	-1

#define SPDK_ENV_DPDK_DEFAULT_CORE_MASK		"0x1"

#define SPDK_ENV_DPDK_DEFAULT_BASE_VIRTADDR	0x200000000000



static char **g_eal_cmdline;

static int g_eal_cmdline_argcount;
@@ -136,6 +137,7 @@ spdk_env_opts_init(struct spdk_env_opts *opts) 
	opts->mem_size = SPDK_ENV_DPDK_DEFAULT_MEM_SIZE;

	opts->master_core = SPDK_ENV_DPDK_DEFAULT_MASTER_CORE;

	opts->mem_channel = SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL;

	opts->base_virtaddr = SPDK_ENV_DPDK_DEFAULT_BASE_VIRTADDR;

}



static void
@@ -449,7 +451,7 @@ build_eal_cmdline(const struct spdk_env_opts *opts) 
	 *

	 * Ref: https://github.com/google/sanitizers/wiki/AddressSanitizerAlgorithm

	 */

	args = push_arg(args, &argcount, _sprintf_alloc("--base-virtaddr=0x200000000000"));

	args = push_arg(args, &argcount, _sprintf_alloc("--base-virtaddr=0x%" PRIx64, opts->base_virtaddr));

	if (args == NULL) {

		return -1;

	}