Commit fa0129c0 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

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



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: default avatarShuhei 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ed453525

examples/nvme/perf/perf.c

+75 −14
Original line number Diff line number Diff line
@@ -1245,30 +1245,91 @@ add_trid(const char *trid_str) 
	return 0;

}



static int

parse_metadata(const char *metacfg_str)

static size_t

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 *separator = ", \t\n";

	size_t key_len, val_len;



	if (strstr(metacfg_str, "PRACT=1") != NULL) {

		g_metacfg_pract_flag = SPDK_NVME_IO_FLAGS_PRACT;

	}

	*str += strspn(*str, separator);



	sep = strchr(metacfg_str, ',');

	sep = strchr(*str, '=');

	if (!sep) {

		fprintf(stderr, "Key without '=' separator\n");

		return 0;

	}



	key_len = sep - *str;

	if (key_len >= key_buf_size) {

		fprintf(stderr, "Key length %zu is greater than maximum allowed %zu\n",

			key_len, key_buf_size - 1);

		return 0;

	}



	if (strstr(sep, "PRCHK=") != NULL) {

		if (strstr(sep, "GUARD") != NULL) {

			g_metacfg_prchk_flags = SPDK_NVME_IO_FLAGS_PRCHK_GUARD;

	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;

}

		if (strstr(sep, "REFTAG") != NULL) {



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 (strcmp(key, "PRACT") == 0) {

			if (*val == '1') {

				g_metacfg_prchk_flags = SPDK_NVME_IO_FLAGS_PRACT;

			}

		} 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(sep, "APPTAG") != NULL) {

			if (strstr(val, "APPTAG") != NULL) {

				g_metacfg_prchk_flags |= SPDK_NVME_IO_FLAGS_PRCHK_APPTAG;

			}

		} else {

			fprintf(stderr, "Unknown key '%s'\n", key);

		}

	}



	return 0;