Commit 972013e2 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/error: Use custom JSON decoders for bdev_error_injection_error 



This is a small clean up.

Use custom JSON decoders for the io_type and error_type parameters
in the bdev_error_injection_error RPC.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I528fe4a31fac7eddb8ec33594b90e107d71693be
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15024


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
parent 95e4ddce

module/bdev/error/vbdev_error_rpc.c

+39 −48
Original line number Diff line number Diff line
@@ -11,37 +11,46 @@ 
#include "spdk/log.h"

#include "vbdev_error.h"



#define ERROR_BDEV_IO_TYPE_INVALID (SPDK_BDEV_IO_TYPE_RESET + 1)

#define ERROR_BDEV_ERROR_TYPE_INVALID (VBDEV_IO_PENDING + 1)



static uint32_t

rpc_error_bdev_io_type_parse(char *name)

static int

rpc_error_bdev_decode_io_type(const struct spdk_json_val *val, void *out)

{

	if (strcmp(name, "read") == 0) {

		return SPDK_BDEV_IO_TYPE_READ;

	} else if (strcmp(name, "write") == 0) {

		return SPDK_BDEV_IO_TYPE_WRITE;

	} else if (strcmp(name, "flush") == 0) {

		return SPDK_BDEV_IO_TYPE_FLUSH;

	} else if (strcmp(name, "unmap") == 0) {

		return SPDK_BDEV_IO_TYPE_UNMAP;

	} else if (strcmp(name, "all") == 0) {

		return 0xffffffff;

	} else if (strcmp(name, "clear") == 0) {

		return 0;

	uint32_t *io_type = out;



	if (spdk_json_strequal(val, "read") == true) {

		*io_type = SPDK_BDEV_IO_TYPE_READ;

	} else if (spdk_json_strequal(val, "write") == true) {

		*io_type = SPDK_BDEV_IO_TYPE_WRITE;

	} else if (spdk_json_strequal(val, "flush") == true) {

		*io_type = SPDK_BDEV_IO_TYPE_FLUSH;

	} else if (spdk_json_strequal(val, "unmap") == true) {

		*io_type = SPDK_BDEV_IO_TYPE_UNMAP;

	} else if (spdk_json_strequal(val, "all") == true) {

		*io_type = 0xffffffff;

	} else if (spdk_json_strequal(val, "clear") == true) {

		*io_type = 0;

	} else {

		SPDK_NOTICELOG("Invalid parameter value: io_type\n");

		return -EINVAL;

	}

	return ERROR_BDEV_IO_TYPE_INVALID;



	return 0;

}



static uint32_t

rpc_error_bdev_error_type_parse(char *name)

static int

rpc_error_bdev_decode_error_type(const struct spdk_json_val *val, void *out)

{

	if (strcmp(name, "failure") == 0) {

		return VBDEV_IO_FAILURE;

	} else if (strcmp(name, "pending") == 0) {

		return VBDEV_IO_PENDING;

	uint32_t *error_type = out;



	if (spdk_json_strequal(val, "failure") == true) {

		*error_type = VBDEV_IO_FAILURE;

	} else if (spdk_json_strequal(val, "pending") == true) {

		*error_type = VBDEV_IO_PENDING;

	} else {

		SPDK_NOTICELOG("Invalid parameter value: error_type\n");

		return -EINVAL;

	}

	return ERROR_BDEV_ERROR_TYPE_INVALID;



	return 0;

}



struct rpc_bdev_error_create {
@@ -136,15 +145,15 @@ SPDK_RPC_REGISTER("bdev_error_delete", rpc_bdev_error_delete, SPDK_RPC_RUNTIME) 


struct rpc_error_information {

	char *name;

	char *io_type;

	char *error_type;

	uint32_t io_type;

	uint32_t error_type;

	uint32_t num;

};



static const struct spdk_json_object_decoder rpc_error_information_decoders[] = {

	{"name", offsetof(struct rpc_error_information, name), spdk_json_decode_string},

	{"io_type", offsetof(struct rpc_error_information, io_type), spdk_json_decode_string},

	{"error_type", offsetof(struct rpc_error_information, error_type), spdk_json_decode_string},

	{"io_type", offsetof(struct rpc_error_information, io_type), rpc_error_bdev_decode_io_type},

	{"error_type", offsetof(struct rpc_error_information, error_type), rpc_error_bdev_decode_error_type},

	{"num", offsetof(struct rpc_error_information, num), spdk_json_decode_uint32, true},

};
@@ -152,8 +161,6 @@ static void 
free_rpc_error_information(struct rpc_error_information *p)

{

	free(p->name);

	free(p->io_type);

	free(p->error_type);

}



static void
@@ -161,8 +168,6 @@ rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, 
			    const struct spdk_json_val *params)

{

	struct rpc_error_information req = {.num = 1};

	uint32_t io_type;

	uint32_t error_type;

	int rc = 0;



	if (spdk_json_decode_object(params, rpc_error_information_decoders,
@@ -174,21 +179,7 @@ rpc_bdev_error_inject_error(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	io_type = rpc_error_bdev_io_type_parse(req.io_type);

	if (io_type == ERROR_BDEV_IO_TYPE_INVALID) {

		spdk_jsonrpc_send_error_response(request, -EINVAL,

						 "Unexpected io_type value");

		goto cleanup;

	}



	error_type = rpc_error_bdev_error_type_parse(req.error_type);

	if (error_type == ERROR_BDEV_ERROR_TYPE_INVALID) {

		spdk_jsonrpc_send_error_response(request, -EINVAL,

						 "Unexpected error_type value");

		goto cleanup;

	}



	rc = vbdev_error_inject_error(req.name, io_type, error_type, req.num);

	rc = vbdev_error_inject_error(req.name, req.io_type, req.error_type, req.num);

	if (rc) {

		spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));

		goto cleanup;