For deletion RPCs, a boolean false response had been sent rather than a error response when they failed. However, boolean false resonse had caused false negative, that is, test code had regarded as success by mistake. For example, the following test code regards as success if JSON RPC returns a boolean false response. if $rpc_py bdev_pmem_delete $pmem_bdev_name; then error "bdev_pmem_delete deleted pmem bdev for second time!" fi This patch fixes such false negative issue by explicitly returning a error response if deletion RPCs fail. Only the bdev_virtio_detach_controller RPC has implemented this. Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Change-Id: I5409a070cbd2364dbb63b42421b032534c6f9a0b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12077 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com>
241 lines
7.3 KiB
C
241 lines
7.3 KiB
C
/*-
|
|
* 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/string.h"
|
|
#include "spdk/rpc.h"
|
|
#include "spdk/util.h"
|
|
#include "spdk/string.h"
|
|
#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)
|
|
{
|
|
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;
|
|
}
|
|
return ERROR_BDEV_IO_TYPE_INVALID;
|
|
}
|
|
|
|
static uint32_t
|
|
rpc_error_bdev_error_type_parse(char *name)
|
|
{
|
|
if (strcmp(name, "failure") == 0) {
|
|
return VBDEV_IO_FAILURE;
|
|
} else if (strcmp(name, "pending") == 0) {
|
|
return VBDEV_IO_PENDING;
|
|
}
|
|
return ERROR_BDEV_ERROR_TYPE_INVALID;
|
|
}
|
|
|
|
struct rpc_bdev_error_create {
|
|
char *base_name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_bdev_error_create(struct rpc_bdev_error_create *req)
|
|
{
|
|
free(req->base_name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_bdev_error_create_decoders[] = {
|
|
{"base_name", offsetof(struct rpc_bdev_error_create, base_name), spdk_json_decode_string},
|
|
};
|
|
|
|
static void
|
|
rpc_bdev_error_create(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_bdev_error_create req = {};
|
|
int rc = 0;
|
|
|
|
if (spdk_json_decode_object(params, rpc_bdev_error_create_decoders,
|
|
SPDK_COUNTOF(rpc_bdev_error_create_decoders),
|
|
&req)) {
|
|
SPDK_ERRLOG("spdk_json_decode_object failed\n");
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
|
"spdk_json_decode_object failed");
|
|
goto cleanup;
|
|
}
|
|
|
|
rc = vbdev_error_create(req.base_name);
|
|
if (rc) {
|
|
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
|
goto cleanup;
|
|
}
|
|
|
|
spdk_jsonrpc_send_bool_response(request, true);
|
|
|
|
cleanup:
|
|
free_rpc_bdev_error_create(&req);
|
|
}
|
|
SPDK_RPC_REGISTER("bdev_error_create", rpc_bdev_error_create, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_create, construct_error_bdev)
|
|
|
|
struct rpc_delete_error {
|
|
char *name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_delete_error(struct rpc_delete_error *r)
|
|
{
|
|
free(r->name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_delete_error_decoders[] = {
|
|
{"name", offsetof(struct rpc_delete_error, name), spdk_json_decode_string},
|
|
};
|
|
|
|
static void
|
|
rpc_bdev_error_delete_cb(void *cb_arg, int bdeverrno)
|
|
{
|
|
struct spdk_jsonrpc_request *request = cb_arg;
|
|
|
|
if (bdeverrno == 0) {
|
|
spdk_jsonrpc_send_bool_response(request, true);
|
|
} else {
|
|
spdk_jsonrpc_send_error_response(request, bdeverrno, spdk_strerror(-bdeverrno));
|
|
}
|
|
}
|
|
|
|
static void
|
|
rpc_bdev_error_delete(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_delete_error req = {NULL};
|
|
struct spdk_bdev *vbdev;
|
|
|
|
if (spdk_json_decode_object(params, rpc_delete_error_decoders,
|
|
SPDK_COUNTOF(rpc_delete_error_decoders),
|
|
&req)) {
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
|
"spdk_json_decode_object failed");
|
|
goto cleanup;
|
|
}
|
|
|
|
vbdev = spdk_bdev_get_by_name(req.name);
|
|
if (vbdev == NULL) {
|
|
spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
|
|
goto cleanup;
|
|
}
|
|
|
|
vbdev_error_delete(vbdev, rpc_bdev_error_delete_cb, request);
|
|
|
|
cleanup:
|
|
free_rpc_delete_error(&req);
|
|
}
|
|
SPDK_RPC_REGISTER("bdev_error_delete", rpc_bdev_error_delete, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_delete, delete_error_bdev)
|
|
|
|
struct rpc_error_information {
|
|
char *name;
|
|
char *io_type;
|
|
char *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},
|
|
{"num", offsetof(struct rpc_error_information, num), spdk_json_decode_uint32, true},
|
|
};
|
|
|
|
static void
|
|
free_rpc_error_information(struct rpc_error_information *p)
|
|
{
|
|
free(p->name);
|
|
free(p->io_type);
|
|
free(p->error_type);
|
|
}
|
|
|
|
static void
|
|
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,
|
|
SPDK_COUNTOF(rpc_error_information_decoders),
|
|
&req)) {
|
|
SPDK_ERRLOG("spdk_json_decode_object failed\n");
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
|
"spdk_json_decode_object failed");
|
|
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);
|
|
if (rc) {
|
|
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
|
goto cleanup;
|
|
}
|
|
|
|
spdk_jsonrpc_send_bool_response(request, true);
|
|
|
|
cleanup:
|
|
free_rpc_error_information(&req);
|
|
}
|
|
SPDK_RPC_REGISTER("bdev_error_inject_error", rpc_bdev_error_inject_error, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_error_inject_error, bdev_inject_error)
|