e6b2b9075a
Define a options structure, malloc_bdev_opts, and use it directly for the bdev_malloc_create RPC. To do this, bdev_malloc.h includes bdev_module.h instead of bdev.h to have the definition of the struct spdk_uuid, and the struct malloc_bdev_opts has a instance of struct spdk_uuid. Clean up file inclusion together. Furthermore, use spdk_uuid_copy() to copy uuid from the malloc_bdev_opts to the malloc disk rather than the = operator, and remove a duplicated size check. These are helpful to add more parameters for creation. Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Change-Id: Ief25f12586c21b1666180ce10cfc6256ede8eba9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14982 Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
124 lines
3.3 KiB
C
124 lines
3.3 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
* Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
*/
|
|
|
|
#include "bdev_malloc.h"
|
|
#include "spdk/rpc.h"
|
|
#include "spdk/string.h"
|
|
#include "spdk/log.h"
|
|
|
|
static void
|
|
free_rpc_construct_malloc(struct malloc_bdev_opts *r)
|
|
{
|
|
free(r->name);
|
|
}
|
|
|
|
static int
|
|
decode_mdisk_uuid(const struct spdk_json_val *val, void *out)
|
|
{
|
|
char *str = NULL;
|
|
int rc;
|
|
|
|
rc = spdk_json_decode_string(val, &str);
|
|
if (rc == 0) {
|
|
rc = spdk_uuid_parse(out, str);
|
|
}
|
|
|
|
free(str);
|
|
return rc;
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_construct_malloc_decoders[] = {
|
|
{"name", offsetof(struct malloc_bdev_opts, name), spdk_json_decode_string, true},
|
|
{"uuid", offsetof(struct malloc_bdev_opts, uuid), decode_mdisk_uuid, true},
|
|
{"num_blocks", offsetof(struct malloc_bdev_opts, num_blocks), spdk_json_decode_uint64},
|
|
{"block_size", offsetof(struct malloc_bdev_opts, block_size), spdk_json_decode_uint32},
|
|
{"optimal_io_boundary", offsetof(struct malloc_bdev_opts, optimal_io_boundary), spdk_json_decode_uint32, true},
|
|
};
|
|
|
|
static void
|
|
rpc_bdev_malloc_create(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct malloc_bdev_opts req = {NULL};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_bdev *bdev;
|
|
int rc = 0;
|
|
|
|
if (spdk_json_decode_object(params, rpc_construct_malloc_decoders,
|
|
SPDK_COUNTOF(rpc_construct_malloc_decoders),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(bdev_malloc, "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 = create_malloc_disk(&bdev, &req);
|
|
if (rc) {
|
|
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
|
goto cleanup;
|
|
}
|
|
|
|
free_rpc_construct_malloc(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_string(w, spdk_bdev_get_name(bdev));
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
cleanup:
|
|
free_rpc_construct_malloc(&req);
|
|
}
|
|
SPDK_RPC_REGISTER("bdev_malloc_create", rpc_bdev_malloc_create, SPDK_RPC_RUNTIME)
|
|
|
|
struct rpc_delete_malloc {
|
|
char *name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_delete_malloc(struct rpc_delete_malloc *r)
|
|
{
|
|
free(r->name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_delete_malloc_decoders[] = {
|
|
{"name", offsetof(struct rpc_delete_malloc, name), spdk_json_decode_string},
|
|
};
|
|
|
|
static void
|
|
rpc_bdev_malloc_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_malloc_delete(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_delete_malloc req = {NULL};
|
|
|
|
if (spdk_json_decode_object(params, rpc_delete_malloc_decoders,
|
|
SPDK_COUNTOF(rpc_delete_malloc_decoders),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(bdev_malloc, "spdk_json_decode_object failed\n");
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
|
"spdk_json_decode_object failed");
|
|
goto cleanup;
|
|
}
|
|
|
|
delete_malloc_disk(req.name, rpc_bdev_malloc_delete_cb, request);
|
|
|
|
cleanup:
|
|
free_rpc_delete_malloc(&req);
|
|
}
|
|
SPDK_RPC_REGISTER("bdev_malloc_delete", rpc_bdev_malloc_delete, SPDK_RPC_RUNTIME)
|