Commit a817ccf5 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Ben Walker
Browse files

Revert "env: remove default pre-reserved memory size" 



Apparently this patch revealed an issue somewhere in SGL
handling in NVMf initiator which is causing our CI to fail.
Let's revert it while we work on a proper fix.

This reverts commit 6f5840d2.
This is not a full revert, some app.c changes to the usage text
were kept unchanged.

Change-Id: Iddea5c2b9df50bd12ef8f6226165883f6622ab33
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/432576


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarBen Walker <benjamin.walker@intel.com>
parent d912dba2

app/vhost/vhost.c

+12 −2
Original line number Diff line number Diff line
@@ -38,8 +38,19 @@ 


#include "spdk/vhost.h"





#define SPDK_VHOST_DEFAULT_MEM_SIZE 1024



static const char *g_pid_path = NULL;



static void

vhost_app_opts_init(struct spdk_app_opts *opts)

{

	spdk_app_opts_init(opts);

	opts->name = "vhost";

	opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;

}



static void

vhost_usage(void)

{
@@ -86,8 +97,7 @@ main(int argc, char *argv[]) 
	struct spdk_app_opts opts = {};

	int rc;



	spdk_app_opts_init(&opts);

	opts.name = "vhost";

	vhost_app_opts_init(&opts);



	if ((rc = spdk_app_parse_args(argc, argv, &opts, "f:S:", NULL,

				      vhost_parse_arg, vhost_usage)) !=

examples/nvme/fio_plugin/fio_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static struct fio_option options[] = { 
		.lname		= "Memory size in MB",

		.type		= FIO_OPT_INT,

		.off1		= offsetof(struct spdk_fio_options, mem_size),

		.def		= "0",

		.def		= "512",

		.help		= "Memory Size for SPDK (MB)",

		.category	= FIO_OPT_C_ENGINE,

		.group		= FIO_OPT_G_INVALID,

examples/nvme/identify/identify.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static bool g_hex_dump = false; 


static int g_shm_id = -1;



static int g_dpdk_mem = 0;

static int g_dpdk_mem = 64;



static int g_master_core = 0;

lib/rocksdb/env_spdk.cc

+1 −0
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ SpdkEnv::SpdkEnv(Env *base_env, const std::string &dir, const std::string &conf, 
	spdk_app_opts_init(opts);

	opts->name = "rocksdb";

	opts->config_file = mConfig.c_str();

	opts->mem_size = 1024 + cache_size_in_mb;

	opts->shutdown_cb = spdk_rocksdb_shutdown;



	spdk_fs_set_cache_size(cache_size_in_mb);

test/bdev/bdevperf/bdevperf.c

+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ main(int argc, char **argv) 
	opts.name = "bdevperf";

	opts.rpc_addr = NULL;

	opts.reactor_mask = NULL;

	opts.mem_size = 1024;

	opts.shutdown_cb = spdk_bdevperf_shutdown_cb;



	/* default value */