If the default config file does not exist, keep the app's config_file options field as NULL, so that the app code will not fail when trying to open a non-existent file. Also leverage the recent iSCSI and NVMe-oF refactoring, to just skip trying to read config file parameters if no config file exists (or the requisite section in the config file is not present). vhost already handled this so it did not need to be modified. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Ic32f0a7a8ce85322a8effd537b62d14732d7b82e Reviewed-on: https://review.gerrithub.io/385497 Reviewed-by: <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
194 lines
5.5 KiB
C
194 lines
5.5 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "spdk/stdinc.h"
|
|
|
|
#include "spdk/log.h"
|
|
#include "spdk/conf.h"
|
|
#include "spdk/event.h"
|
|
|
|
#include "spdk/vhost.h"
|
|
|
|
|
|
#define SPDK_VHOST_DEFAULT_CONFIG "/usr/local/etc/spdk/vhost.conf"
|
|
#define SPDK_VHOST_DEFAULT_ENABLE_COREDUMP true
|
|
#define SPDK_VHOST_DEFAULT_MEM_SIZE 1024
|
|
|
|
static void
|
|
vhost_app_opts_init(struct spdk_app_opts *opts)
|
|
{
|
|
spdk_app_opts_init(opts);
|
|
opts->name = "vhost";
|
|
if (access(SPDK_VHOST_DEFAULT_CONFIG, F_OK) == 0) {
|
|
opts->config_file = SPDK_VHOST_DEFAULT_CONFIG;
|
|
}
|
|
opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;
|
|
}
|
|
|
|
static void
|
|
usage(char *executable_name)
|
|
{
|
|
struct spdk_app_opts defaults;
|
|
|
|
vhost_app_opts_init(&defaults);
|
|
|
|
printf("%s [options]\n", executable_name);
|
|
printf("options:\n");
|
|
printf(" -c config config file (default: %s)\n", defaults.config_file);
|
|
printf(" -e mask tracepoint group mask for spdk trace buffers (default: 0x0)\n");
|
|
printf(" -f pidfile save pid to file under given path\n");
|
|
printf(" -i shm_id shared memory ID (optional)\n");
|
|
printf(" -m mask reactor core mask (default: 0x1)\n");
|
|
printf(" -N pass --no-pci to DPDK\n");
|
|
printf(" -p core master (primary) core for DPDK\n");
|
|
printf(" -s size memory size in MB for DPDK (default: %dMB)\n", defaults.mem_size);
|
|
printf(" -S dir directory where to create vhost sockets (default: pwd)\n");
|
|
spdk_tracelog_usage(stdout, "-t");
|
|
printf(" -h show this usage\n");
|
|
printf(" -d disable coredump file enabling\n");
|
|
printf(" -q disable notice level logging to stderr\n");
|
|
}
|
|
|
|
static void
|
|
save_pid(const char *pid_path)
|
|
{
|
|
FILE *pid_file;
|
|
|
|
pid_file = fopen(pid_path, "w");
|
|
if (pid_file == NULL) {
|
|
fprintf(stderr, "Couldn't create pid file '%s': %s\n", pid_path, strerror(errno));
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
fprintf(pid_file, "%d\n", getpid());
|
|
fclose(pid_file);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
struct spdk_app_opts opts = {};
|
|
char ch;
|
|
int rc;
|
|
const char *socket_path = NULL;
|
|
enum spdk_log_level print_level = SPDK_LOG_NOTICE;
|
|
const char *pid_path = NULL;
|
|
|
|
vhost_app_opts_init(&opts);
|
|
|
|
while ((ch = getopt(argc, argv, "c:de:f:i:m:Np:qs:S:t:h")) != -1) {
|
|
switch (ch) {
|
|
case 'c':
|
|
opts.config_file = optarg;
|
|
break;
|
|
case 'd':
|
|
opts.enable_coredump = false;
|
|
break;
|
|
case 'e':
|
|
opts.tpoint_group_mask = optarg;
|
|
break;
|
|
case 'f':
|
|
pid_path = optarg;
|
|
break;
|
|
case 'h':
|
|
usage(argv[0]);
|
|
exit(EXIT_SUCCESS);
|
|
case 'i':
|
|
opts.shm_id = strtoul(optarg, NULL, 10);
|
|
break;
|
|
case 'm':
|
|
opts.reactor_mask = optarg;
|
|
break;
|
|
case 'N':
|
|
opts.no_pci = true;
|
|
break;
|
|
case 'p':
|
|
opts.master_core = strtoul(optarg, NULL, 10);
|
|
break;
|
|
case 'q':
|
|
print_level = SPDK_LOG_WARN;
|
|
break;
|
|
case 's':
|
|
opts.mem_size = strtoul(optarg, NULL, 10);
|
|
break;
|
|
case 'S':
|
|
socket_path = optarg;
|
|
break;
|
|
case 't':
|
|
rc = spdk_log_set_trace_flag(optarg);
|
|
if (rc < 0) {
|
|
fprintf(stderr, "unknown flag\n");
|
|
usage(argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
print_level = SPDK_LOG_DEBUG;
|
|
#ifndef DEBUG
|
|
fprintf(stderr, "%s must be rebuilt with CONFIG_DEBUG=y for -t flag.\n",
|
|
argv[0]);
|
|
usage(argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
#endif
|
|
break;
|
|
default:
|
|
fprintf(stderr, "%s Unknown option '-%c'.\n", argv[0], ch);
|
|
usage(argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
if (pid_path) {
|
|
save_pid(pid_path);
|
|
}
|
|
|
|
if (print_level > SPDK_LOG_WARN &&
|
|
isatty(STDERR_FILENO) &&
|
|
!strncmp(ttyname(STDERR_FILENO), "/dev/tty", strlen("/dev/tty"))) {
|
|
printf("Warning: printing stderr to console terminal without -q option specified.\n");
|
|
printf("Suggest using -q to disable logging to stderr and monitor syslog, or\n");
|
|
printf("redirect stderr to a file.\n");
|
|
printf("(Delaying for 10 seconds...)\n");
|
|
sleep(10);
|
|
}
|
|
|
|
spdk_log_set_print_level(print_level);
|
|
|
|
opts.shutdown_cb = spdk_vhost_shutdown_cb;
|
|
|
|
/* Blocks until the application is exiting */
|
|
rc = spdk_app_start(&opts, spdk_vhost_startup, (void *)socket_path, NULL);
|
|
|
|
spdk_app_fini();
|
|
|
|
return rc;
|
|
}
|