From 20c69bbc302cc302aa5a00e9b5d7c1d40d1343c8 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 7 Dec 2018 13:23:02 -0700 Subject: [PATCH] env: remove default pre-reserved memory size Much of this was originally applied by Darek in 6f5840d22 but then had to be reverted due to NVMe-oF MR issues in a817ccf5. Now that the NVMe-oF MR issues have been resolved, we can reapply these changes. Signed-off-by: Jim Harris Signed-off-by: Darek Stojaczyk Change-Id: I58d603523901c78dbc81279078a09b2a24c091e6 Reviewed-on: https://review.gerrithub.io/436547 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- app/vhost/vhost.c | 14 ++------------ examples/nvme/fio_plugin/fio_plugin.c | 2 +- examples/nvme/identify/identify.c | 2 +- lib/rocksdb/env_spdk.cc | 1 - test/bdev/bdevperf/bdevperf.c | 1 - test/blobfs/fuse/fuse.c | 1 - test/blobfs/mkfs/mkfs.c | 1 - test/env/vtophys/vtophys.c | 1 - test/event/event_perf/event_perf.c | 1 - test/nvme/aer/aer.c | 1 - test/nvme/err_injection/err_injection.c | 1 - 11 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c index da58e34bc..838211b08 100644 --- a/app/vhost/vhost.c +++ b/app/vhost/vhost.c @@ -38,19 +38,8 @@ #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) { @@ -97,7 +86,8 @@ main(int argc, char *argv[]) struct spdk_app_opts opts = {}; int rc; - vhost_app_opts_init(&opts); + spdk_app_opts_init(&opts); + opts.name = "vhost"; if ((rc = spdk_app_parse_args(argc, argv, &opts, "f:S:", NULL, vhost_parse_arg, vhost_usage)) != diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c index e0e1cad8f..042531cba 100644 --- a/examples/nvme/fio_plugin/fio_plugin.c +++ b/examples/nvme/fio_plugin/fio_plugin.c @@ -873,7 +873,7 @@ static struct fio_option options[] = { .lname = "Memory size in MB", .type = FIO_OPT_INT, .off1 = offsetof(struct spdk_fio_options, mem_size), - .def = "512", + .def = "0", .help = "Memory Size for SPDK (MB)", .category = FIO_OPT_C_ENGINE, .group = FIO_OPT_G_INVALID, diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c index 45e2e00e2..c147a1f19 100644 --- a/examples/nvme/identify/identify.c +++ b/examples/nvme/identify/identify.c @@ -84,7 +84,7 @@ static bool g_hex_dump = false; static int g_shm_id = -1; -static int g_dpdk_mem = 64; +static int g_dpdk_mem = 0; static int g_master_core = 0; diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc index 63c979eb9..8179fc495 100644 --- a/lib/rocksdb/env_spdk.cc +++ b/lib/rocksdb/env_spdk.cc @@ -700,7 +700,6 @@ 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); diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 1416ea278..f6523afa4 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -865,7 +865,6 @@ 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 */ diff --git a/test/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c index 9d11dfa07..ad1bcf26e 100644 --- a/test/blobfs/fuse/fuse.c +++ b/test/blobfs/fuse/fuse.c @@ -333,7 +333,6 @@ int main(int argc, char **argv) opts.name = "spdk_fuse"; opts.config_file = argv[1]; opts.reactor_mask = "0x3"; - opts.mem_size = 6144; opts.shutdown_cb = spdk_fuse_shutdown; g_bdev_name = argv[2]; diff --git a/test/blobfs/mkfs/mkfs.c b/test/blobfs/mkfs/mkfs.c index 0bedd84a4..e618ef0d3 100644 --- a/test/blobfs/mkfs/mkfs.c +++ b/test/blobfs/mkfs/mkfs.c @@ -132,7 +132,6 @@ int main(int argc, char **argv) opts.name = "spdk_mkfs"; opts.config_file = argv[1]; opts.reactor_mask = "0x3"; - opts.mem_size = 1024; opts.shutdown_cb = NULL; spdk_fs_set_cache_size(512); diff --git a/test/env/vtophys/vtophys.c b/test/env/vtophys/vtophys.c index d672b1aef..bb4975db1 100644 --- a/test/env/vtophys/vtophys.c +++ b/test/env/vtophys/vtophys.c @@ -119,7 +119,6 @@ main(int argc, char **argv) spdk_env_opts_init(&opts); opts.name = "vtophys"; opts.core_mask = "0x1"; - opts.mem_size = 256; if (spdk_env_init(&opts) < 0) { printf("Err: Unable to initialize SPDK env\n"); return 1; diff --git a/test/event/event_perf/event_perf.c b/test/event/event_perf/event_perf.c index 917ea9504..2a4f8a2b0 100644 --- a/test/event/event_perf/event_perf.c +++ b/test/event/event_perf/event_perf.c @@ -144,7 +144,6 @@ main(int argc, char **argv) int rc = 0; opts.name = "event_perf"; - opts.mem_size = 256; g_time_in_sec = 0; diff --git a/test/nvme/aer/aer.c b/test/nvme/aer/aer.c index 22dfe4a53..90ec32bd1 100644 --- a/test/nvme/aer/aer.c +++ b/test/nvme/aer/aer.c @@ -523,7 +523,6 @@ int main(int argc, char **argv) spdk_env_opts_init(&opts); opts.name = "aer"; opts.core_mask = "0x1"; - opts.mem_size = 64; if (spdk_env_init(&opts) < 0) { fprintf(stderr, "Unable to initialize SPDK env\n"); return 1; diff --git a/test/nvme/err_injection/err_injection.c b/test/nvme/err_injection/err_injection.c index 50d67092c..0ae45d697 100644 --- a/test/nvme/err_injection/err_injection.c +++ b/test/nvme/err_injection/err_injection.c @@ -219,7 +219,6 @@ int main(int argc, char **argv) spdk_env_opts_init(&opts); opts.name = "err_injection"; opts.core_mask = "0x1"; - opts.mem_size = 64; opts.shm_id = 0; if (spdk_env_init(&opts) < 0) { fprintf(stderr, "Unable to initialize SPDK env\n");