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

test: Add a bdev management service

Browse Source 
This allows us to query and configure the bdev
modules much more dynamically.

Change-Id: I11f757039892f4353721be422317b641d72bd2a9
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/370584
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2017-07-20 07:11:47 -07:00 committed by Jim Harris
parent 30b512c201
commit fd4cb17f81
7 changed files with 228 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/autotest_common.sh
View File

@ -352,5 +352,32 @@ function part_dev_by_gpt () {
return 0
}
function discover_bdevs()
{
local rootdir=$1
local config_file=$2
if [ ! -e $config_file ]; then
echo "Invalid Configuration File: $config_file"
return -1
fi
# Start the bdev service to query for the list of available
# bdevs.
$rootdir/test/app/bdev_svc/bdev_svc -i 0 -c $config_file &>/dev/null &
stubpid=$!
while ! [ -e /var/run/spdk_bdev0 ]; do
sleep 1
done
# Get all of the bdevs
$rootdir/scripts/rpc.py get_bdevs
# Shut down the bdev service
kill $stubpid
wait $stubpid
rm -f /var/run/spdk_bdev0
}
set -o errtrace
trap "trap - ERR; print_backtrace >&2" ERR

2
test/app/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y += stub
DIRS-y += stub bdev_svc
.PHONY: all clean $(DIRS-y)

1
test/app/bdev_svc/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
bdev_svc

61
test/app/bdev_svc/Makefile Normal file
View File

@ -0,0 +1,61 @@
#
# 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.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdev_svc
CFLAGS += $(ENV_CFLAGS)
C_SRCS := bdev_svc.c
SPDK_LIB_LIST = event_bdev event_copy event_rpc
SPDK_LIB_LIST += nvmf event log trace conf util bdev copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \
$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

131
test/app/bdev_svc/bdev_svc.c Normal file
View File

@ -0,0 +1,131 @@
/*-
* 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/env.h"
#include "spdk/event.h"
static char g_path[256];
static void
usage(char *executable_name)
{
printf("%s [options]\n", executable_name);
printf("options:\n");
printf(" -c config config file [required]\n");
printf(" -i shared memory ID\n");
printf(" -m mask core mask for DPDK\n");
printf(" -n channel number of memory channels used for DPDK\n");
printf(" -p core master (primary) core for DPDK\n");
printf(" -s size memory size in MB for DPDK\n");
printf(" -H show this usage\n");
}
static void
bdev_svc_start(void *arg1, void *arg2)
{
int fd;
int shm_id = (intptr_t)arg1;
spdk_unaffinitize_thread();
snprintf(g_path, sizeof(g_path), "/var/run/spdk_bdev%d", shm_id);
fd = open(g_path, O_CREAT | O_EXCL | O_RDWR, S_IFREG);
if (fd < 0) {
fprintf(stderr, "could not create sentinel file %s\n", g_path);
exit(1);
}
close(fd);
}
static void
bdev_svc_shutdown(void)
{
unlink(g_path);
spdk_app_stop(0);
}
int
main(int argc, char **argv)
{
int ch, rc;
struct spdk_app_opts opts = {};
/* default value in opts structure */
spdk_app_opts_init(&opts);
opts.name = "bdev_svc";
while ((ch = getopt(argc, argv, "c:i:m:n:p:s:H")) != -1) {
switch (ch) {
case 'c':
opts.config_file = optarg;
break;
case 'i':
opts.shm_id = atoi(optarg);
break;
case 'm':
opts.reactor_mask = optarg;
break;
case 'n':
opts.mem_channel = atoi(optarg);
break;
case 'p':
opts.master_core = atoi(optarg);
break;
case 's':
opts.mem_size = atoi(optarg);
break;
case 'H':
default:
usage(argv[0]);
exit(EXIT_SUCCESS);
}
}
if (!opts.config_file) {
fprintf(stderr, "Configuration file is required.\n");
usage(argv[0]);
exit(1);
}
opts.shutdown_cb = bdev_svc_shutdown;
opts.max_delay_us = 1000 * 1000;
spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL);
rc = spdk_app_fini();
return rc;
}

3
test/lib/bdev/bdev.conf.in
View File

@ -18,3 +18,6 @@
[Rpc]
Enable Yes
[Ioat]
Disable Yes

4
test/lib/bdev/blockdev.sh
View File

@ -21,6 +21,10 @@ if grep -q Nvme0 $testdir/bdev.conf; then
part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir
fi
timing_enter bdev_svc
bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.bdev_opened_for_write == false) | .name')
timing_exit bdev_svc
timing_enter verify
$testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 32 -s 4096 -w verify -t 1
timing_exit verify