From 959cfa0fd57971cfbdf496d7fd895e44874544ff Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 18 Dec 2020 06:05:37 -0700 Subject: [PATCH] event: add "A" to SPDK_APP_GETOPT_STRING -A is equivalent to --pci-allowed, which recently replaced -W/--pci-whitelist. But we missed adding "A" to SPDK_APP_GETOPT_STRING, so -A was not actually working. Note that bdevperf was using -A to specify that timed out I/O should be aborted. This patch changes it to -X to avoid a conflict. It appears that something broke with this option earlier this year though, setting it has no actual effect. This should be investigated separately from this patch. Signed-off-by: Jim Harris Change-Id: I2f1aaf0af4e82ba3d08e91e6f9046d485cf04549 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5645 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Changpeng Liu --- include/spdk/event.h | 2 +- test/bdev/bdevperf/bdevperf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/spdk/event.h b/include/spdk/event.h index fac5a0b8f..f757b337c 100644 --- a/include/spdk/event.h +++ b/include/spdk/event.h @@ -249,7 +249,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask); */ const struct spdk_cpuset *spdk_app_get_core_mask(void); -#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvB:L:RW:" +#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:L:RW:" enum spdk_app_parse_args_rvals { SPDK_APP_PARSE_ARGS_HELP = 0, diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index f270b7609..d0f294667 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -1930,7 +1930,7 @@ bdevperf_parse_arg(int ch, char *arg) g_wait_for_tests = true; } else if (ch == 'Z') { g_zcopy = true; - } else if (ch == 'A') { + } else if (ch == 'X') { g_abort = true; } else if (ch == 'C') { g_multithread_mode = true; @@ -1997,7 +1997,7 @@ bdevperf_usage(void) printf(" -f continue processing I/O even after failures\n"); printf(" -Z enable using zcopy bdev API for read or write I/O\n"); printf(" -z start bdevperf, but wait for RPC to start tests\n"); - printf(" -A abort the timeout I/O\n"); + printf(" -X abort timed out I/O\n"); printf(" -C enable every core to send I/Os to each bdev\n"); printf(" -j use job config file\n"); } @@ -2105,7 +2105,7 @@ main(int argc, char **argv) opts.rpc_addr = NULL; opts.shutdown_cb = spdk_bdevperf_shutdown_cb; - if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:ACM:P:S:T:j:", NULL, + if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:CM:P:S:T:Xj:", NULL, bdevperf_parse_arg, bdevperf_usage)) != SPDK_APP_PARSE_ARGS_SUCCESS) { return rc;