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

nvme_perf: Fix the issue that PRCHK cannot be set by command line

Browse Source 
If user want to set PRCHK, current Perf tool requires user to
add ',' as a prefix to PRCHK.

This patch removes the limitation by referring /lib/nvme/nvme.c

Change-Id: I327810b38c02116b9580873b6046bdca55b5162a
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/437913
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-12-20 16:32:35 +09:00 committed by Jim Harris
parent ed45352564
commit fa0129c0e2
1 changed files with 75 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
examples/nvme/perf/perf.c
View File

@ -1245,29 +1245,90 @@ add_trid(const char *trid_str)
return 0; return 0;
} }
static int static size_t
parse_metadata(const char *metacfg_str) parse_next_key(const char **str, char *key, char *val, size_t key_buf_size,
size_t val_buf_size)
{ {
const char *sep; const char *sep;
const char *separator = ", \t\n";
size_t key_len, val_len;
if (strstr(metacfg_str, "PRACT=1") != NULL) { *str += strspn(*str, separator);
g_metacfg_pract_flag = SPDK_NVME_IO_FLAGS_PRACT;
}
sep = strchr(metacfg_str, ','); sep = strchr(*str, '=');
if (!sep) { if (!sep) {
fprintf(stderr, "Key without '=' separator\n");
return 0; return 0;
} }
if (strstr(sep, "PRCHK=") != NULL) { key_len = sep - *str;
if (strstr(sep, "GUARD") != NULL) { if (key_len >= key_buf_size) {
g_metacfg_prchk_flags = SPDK_NVME_IO_FLAGS_PRCHK_GUARD; fprintf(stderr, "Key length %zu is greater than maximum allowed %zu\n",
key_len, key_buf_size - 1);
return 0;
}
memcpy(key, *str, key_len);
key[key_len] = '\0';
*str += key_len + 1; /* Skip key */
val_len = strcspn(*str, separator);
if (val_len == 0) {
fprintf(stderr, "Key without value\n");
return 0;
}
if (val_len >= val_buf_size) {
fprintf(stderr, "Value length %zu is greater than maximum allowed %zu\n",
val_len, val_buf_size - 1);
return 0;
}
memcpy(val, *str, val_len);
val[val_len] = '\0';
*str += val_len;
return val_len;
}
static int
parse_metadata(const char *metacfg_str)
{
const char *str;
size_t val_len;
char key[32];
char val[1024];
if (metacfg_str == NULL) {
return -EINVAL;
}
str = metacfg_str;
while (*str != '\0') {
val_len = parse_next_key(&str, key, val, sizeof(key), sizeof(val));
if (val_len == 0) {
fprintf(stderr, "Failed to parse metadata\n");
return -EINVAL;
} }
if (strstr(sep, "REFTAG") != NULL) {
g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_REFTAG; if (strcmp(key, "PRACT") == 0) {
} if (*val == '1') {
if (strstr(sep, "APPTAG") != NULL) { g_metacfg_prchk_flags = SPDK_NVME_IO_FLAGS_PRACT;
g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_APPTAG; }
} else if (strcmp(key, "PRCHK") == 0) {
if (strstr(val, "GUARD") != NULL) {
g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_GUARD;
}
if (strstr(val, "REFTAG") != NULL) {
g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_REFTAG;
}
if (strstr(val, "APPTAG") != NULL) {
g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_APPTAG;
}
} else {
fprintf(stderr, "Unknown key '%s'\n", key);
} }
} }