Currently each controller is associated with one of the poll groups. For each controller, all sessions are associated with the poll groups with which the corresponding controller is associated. Vhost poll group does not have any polling loop but its usage was very complex. Association of controller with poll group is done based on the specified cpumask, and poll group is created per CPU core. This is as same as association of thread with CPU core. So in this patch, replace poll group per session by thread per controller. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ifa1e136caae11959f7b097b06a22910bc2169b30 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1146 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
650 lines
18 KiB
C
650 lines
18 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright(c) Intel Corporation. All rights reserved.
|
|
* 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_internal/log.h"
|
|
#include "spdk/rpc.h"
|
|
#include "spdk/util.h"
|
|
#include "spdk/string.h"
|
|
#include "spdk/env.h"
|
|
|
|
#include "spdk/scsi.h"
|
|
#include "spdk/vhost.h"
|
|
#include "vhost_internal.h"
|
|
#include "spdk/bdev.h"
|
|
|
|
struct rpc_vhost_scsi_ctrlr {
|
|
char *ctrlr;
|
|
char *cpumask;
|
|
};
|
|
|
|
static void
|
|
free_rpc_vhost_scsi_ctrlr(struct rpc_vhost_scsi_ctrlr *req)
|
|
{
|
|
free(req->ctrlr);
|
|
free(req->cpumask);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_vhost_create_scsi_ctrlr[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_scsi_ctrlr, ctrlr), spdk_json_decode_string },
|
|
{"cpumask", offsetof(struct rpc_vhost_scsi_ctrlr, cpumask), spdk_json_decode_string, true},
|
|
};
|
|
|
|
static void
|
|
spdk_rpc_vhost_create_scsi_controller(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_scsi_ctrlr req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_vhost_create_scsi_ctrlr,
|
|
SPDK_COUNTOF(rpc_vhost_create_scsi_ctrlr),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_scsi_dev_construct(req.ctrlr, req.cpumask);
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_vhost_scsi_ctrlr(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_vhost_scsi_ctrlr(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_create_scsi_controller", spdk_rpc_vhost_create_scsi_controller,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_scsi_controller, construct_vhost_scsi_controller)
|
|
|
|
struct rpc_vhost_scsi_ctrlr_add_target {
|
|
char *ctrlr;
|
|
int32_t scsi_target_num;
|
|
char *bdev_name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_vhost_scsi_ctrlr_add_target(struct rpc_vhost_scsi_ctrlr_add_target *req)
|
|
{
|
|
free(req->ctrlr);
|
|
free(req->bdev_name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_vhost_scsi_ctrlr_add_target[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, ctrlr), spdk_json_decode_string },
|
|
{"scsi_target_num", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, scsi_target_num), spdk_json_decode_int32},
|
|
{"bdev_name", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, bdev_name), spdk_json_decode_string },
|
|
};
|
|
|
|
static void
|
|
spdk_rpc_vhost_scsi_controller_add_target(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_scsi_ctrlr_add_target req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_vhost_scsi_ctrlr_add_target,
|
|
SPDK_COUNTOF(rpc_vhost_scsi_ctrlr_add_target),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
vdev = spdk_vhost_dev_find(req.ctrlr);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_scsi_dev_add_tgt(vdev, req.scsi_target_num, req.bdev_name);
|
|
spdk_vhost_unlock();
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_vhost_scsi_ctrlr_add_target(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_int32(w, rc);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_vhost_scsi_ctrlr_add_target(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_scsi_controller_add_target", spdk_rpc_vhost_scsi_controller_add_target,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_scsi_controller_add_target, add_vhost_scsi_lun)
|
|
|
|
struct rpc_remove_vhost_scsi_ctrlr_target {
|
|
char *ctrlr;
|
|
uint32_t scsi_target_num;
|
|
};
|
|
|
|
static void
|
|
free_rpc_remove_vhost_scsi_ctrlr_target(struct rpc_remove_vhost_scsi_ctrlr_target *req)
|
|
{
|
|
free(req->ctrlr);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_vhost_remove_target[] = {
|
|
{"ctrlr", offsetof(struct rpc_remove_vhost_scsi_ctrlr_target, ctrlr), spdk_json_decode_string },
|
|
{"scsi_target_num", offsetof(struct rpc_remove_vhost_scsi_ctrlr_target, scsi_target_num), spdk_json_decode_uint32},
|
|
};
|
|
|
|
static int
|
|
spdk_rpc_vhost_scsi_controller_remove_target_finish_cb(struct spdk_vhost_dev *vdev, void *arg)
|
|
{
|
|
struct spdk_jsonrpc_request *request = arg;
|
|
struct spdk_json_write_ctx *w;
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_scsi_controller_remove_target(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_remove_vhost_scsi_ctrlr_target req = {0};
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_vhost_remove_target,
|
|
SPDK_COUNTOF(rpc_vhost_remove_target),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
vdev = spdk_vhost_dev_find(req.ctrlr);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_scsi_dev_remove_tgt(vdev, req.scsi_target_num,
|
|
spdk_rpc_vhost_scsi_controller_remove_target_finish_cb,
|
|
request);
|
|
spdk_vhost_unlock();
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_remove_vhost_scsi_ctrlr_target(&req);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_remove_vhost_scsi_ctrlr_target(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
}
|
|
|
|
SPDK_RPC_REGISTER("vhost_scsi_controller_remove_target",
|
|
spdk_rpc_vhost_scsi_controller_remove_target, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_scsi_controller_remove_target, remove_vhost_scsi_target)
|
|
|
|
struct rpc_vhost_blk_ctrlr {
|
|
char *ctrlr;
|
|
char *dev_name;
|
|
char *cpumask;
|
|
bool readonly;
|
|
};
|
|
|
|
static const struct spdk_json_object_decoder rpc_construct_vhost_blk_ctrlr[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_blk_ctrlr, ctrlr), spdk_json_decode_string },
|
|
{"dev_name", offsetof(struct rpc_vhost_blk_ctrlr, dev_name), spdk_json_decode_string },
|
|
{"cpumask", offsetof(struct rpc_vhost_blk_ctrlr, cpumask), spdk_json_decode_string, true},
|
|
{"readonly", offsetof(struct rpc_vhost_blk_ctrlr, readonly), spdk_json_decode_bool, true},
|
|
};
|
|
|
|
static void
|
|
free_rpc_vhost_blk_ctrlr(struct rpc_vhost_blk_ctrlr *req)
|
|
{
|
|
free(req->ctrlr);
|
|
free(req->dev_name);
|
|
free(req->cpumask);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_create_blk_controller(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_blk_ctrlr req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_construct_vhost_blk_ctrlr,
|
|
SPDK_COUNTOF(rpc_construct_vhost_blk_ctrlr),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_blk_construct(req.ctrlr, req.cpumask, req.dev_name, req.readonly);
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_vhost_blk_ctrlr(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_vhost_blk_ctrlr(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_create_blk_controller", spdk_rpc_vhost_create_blk_controller,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_blk_controller, construct_vhost_blk_controller)
|
|
|
|
struct rpc_delete_vhost_ctrlr {
|
|
char *ctrlr;
|
|
};
|
|
|
|
static const struct spdk_json_object_decoder rpc_delete_vhost_ctrlr_decoder[] = {
|
|
{"ctrlr", offsetof(struct rpc_delete_vhost_ctrlr, ctrlr), spdk_json_decode_string },
|
|
};
|
|
|
|
static void
|
|
free_rpc_delete_vhost_ctrlr(struct rpc_delete_vhost_ctrlr *req)
|
|
{
|
|
free(req->ctrlr);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_delete_controller(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_delete_vhost_ctrlr req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_delete_vhost_ctrlr_decoder,
|
|
SPDK_COUNTOF(rpc_delete_vhost_ctrlr_decoder), &req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
vdev = spdk_vhost_dev_find(req.ctrlr);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_dev_remove(vdev);
|
|
spdk_vhost_unlock();
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_delete_vhost_ctrlr(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_delete_vhost_ctrlr(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_delete_controller", spdk_rpc_vhost_delete_controller, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_delete_controller, remove_vhost_controller)
|
|
|
|
struct rpc_get_vhost_ctrlrs {
|
|
char *name;
|
|
};
|
|
|
|
static void
|
|
_spdk_rpc_get_vhost_controller(struct spdk_json_write_ctx *w, struct spdk_vhost_dev *vdev)
|
|
{
|
|
uint32_t delay_base_us, iops_threshold;
|
|
|
|
spdk_vhost_get_coalescing(vdev, &delay_base_us, &iops_threshold);
|
|
|
|
spdk_json_write_object_begin(w);
|
|
|
|
spdk_json_write_named_string(w, "ctrlr", spdk_vhost_dev_get_name(vdev));
|
|
spdk_json_write_named_string_fmt(w, "cpumask", "0x%s",
|
|
spdk_cpuset_fmt(spdk_thread_get_cpumask(vdev->thread)));
|
|
spdk_json_write_named_uint32(w, "delay_base_us", delay_base_us);
|
|
spdk_json_write_named_uint32(w, "iops_threshold", iops_threshold);
|
|
spdk_json_write_named_string(w, "socket", vdev->path);
|
|
|
|
spdk_json_write_named_object_begin(w, "backend_specific");
|
|
vhost_dump_info_json(vdev, w);
|
|
spdk_json_write_object_end(w);
|
|
|
|
spdk_json_write_object_end(w);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_get_vhost_ctrlrs_decoders[] = {
|
|
{"name", offsetof(struct rpc_get_vhost_ctrlrs, name), spdk_json_decode_string, true},
|
|
};
|
|
|
|
static void
|
|
free_rpc_get_vhost_ctrlrs(struct rpc_get_vhost_ctrlrs *req)
|
|
{
|
|
free(req->name);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_get_controllers(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_get_vhost_ctrlrs req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (params && spdk_json_decode_object(params, rpc_get_vhost_ctrlrs_decoders,
|
|
SPDK_COUNTOF(rpc_get_vhost_ctrlrs_decoders), &req)) {
|
|
SPDK_ERRLOG("spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
if (req.name != NULL) {
|
|
vdev = spdk_vhost_dev_find(req.name);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_get_vhost_ctrlrs(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_array_begin(w);
|
|
|
|
_spdk_rpc_get_vhost_controller(w, vdev);
|
|
spdk_vhost_unlock();
|
|
|
|
spdk_json_write_array_end(w);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
}
|
|
|
|
free_rpc_get_vhost_ctrlrs(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_array_begin(w);
|
|
|
|
vdev = spdk_vhost_dev_next(NULL);
|
|
while (vdev != NULL) {
|
|
_spdk_rpc_get_vhost_controller(w, vdev);
|
|
vdev = spdk_vhost_dev_next(vdev);
|
|
}
|
|
spdk_vhost_unlock();
|
|
|
|
spdk_json_write_array_end(w);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_get_vhost_ctrlrs(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
|
spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_get_controllers", spdk_rpc_vhost_get_controllers, SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_get_controllers, get_vhost_controllers)
|
|
|
|
|
|
struct rpc_vhost_ctrlr_coalescing {
|
|
char *ctrlr;
|
|
uint32_t delay_base_us;
|
|
uint32_t iops_threshold;
|
|
};
|
|
|
|
static const struct spdk_json_object_decoder rpc_set_vhost_ctrlr_coalescing[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_ctrlr_coalescing, ctrlr), spdk_json_decode_string },
|
|
{"delay_base_us", offsetof(struct rpc_vhost_ctrlr_coalescing, delay_base_us), spdk_json_decode_uint32},
|
|
{"iops_threshold", offsetof(struct rpc_vhost_ctrlr_coalescing, iops_threshold), spdk_json_decode_uint32},
|
|
};
|
|
|
|
static void
|
|
free_rpc_set_vhost_controllers_event_coalescing(struct rpc_vhost_ctrlr_coalescing *req)
|
|
{
|
|
free(req->ctrlr);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_controller_set_coalescing(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_ctrlr_coalescing req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_set_vhost_ctrlr_coalescing,
|
|
SPDK_COUNTOF(rpc_set_vhost_ctrlr_coalescing), &req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
vdev = spdk_vhost_dev_find(req.ctrlr);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = spdk_vhost_set_coalescing(vdev, req.delay_base_us, req.iops_threshold);
|
|
spdk_vhost_unlock();
|
|
if (rc) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_set_vhost_controllers_event_coalescing(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_set_vhost_controllers_event_coalescing(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_controller_set_coalescing", spdk_rpc_vhost_controller_set_coalescing,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_controller_set_coalescing, set_vhost_controller_coalescing)
|
|
|
|
#ifdef SPDK_CONFIG_VHOST_INTERNAL_LIB
|
|
|
|
struct rpc_vhost_nvme_ctrlr {
|
|
char *ctrlr;
|
|
uint32_t io_queues;
|
|
char *cpumask;
|
|
};
|
|
|
|
static const struct spdk_json_object_decoder rpc_construct_vhost_nvme_ctrlr[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_nvme_ctrlr, ctrlr), spdk_json_decode_string },
|
|
{"io_queues", offsetof(struct rpc_vhost_nvme_ctrlr, io_queues), spdk_json_decode_uint32},
|
|
{"cpumask", offsetof(struct rpc_vhost_nvme_ctrlr, cpumask), spdk_json_decode_string, true},
|
|
};
|
|
|
|
static void
|
|
free_rpc_vhost_nvme_ctrlr(struct rpc_vhost_nvme_ctrlr *req)
|
|
{
|
|
free(req->ctrlr);
|
|
free(req->cpumask);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_vhost_create_nvme_controller(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_nvme_ctrlr req = {};
|
|
struct spdk_json_write_ctx *w;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_construct_vhost_nvme_ctrlr,
|
|
SPDK_COUNTOF(rpc_construct_vhost_nvme_ctrlr),
|
|
&req)) {
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = vhost_nvme_dev_construct(req.ctrlr, req.cpumask, req.io_queues);
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_vhost_nvme_ctrlr(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_vhost_nvme_ctrlr(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_create_nvme_controller", spdk_rpc_vhost_create_nvme_controller,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_nvme_controller, construct_vhost_nvme_controller)
|
|
|
|
struct rpc_vhost_nvme_ctrlr_add_ns {
|
|
char *ctrlr;
|
|
char *bdev_name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_vhost_nvme_ctrlr_add_ns(struct rpc_vhost_nvme_ctrlr_add_ns *req)
|
|
{
|
|
free(req->ctrlr);
|
|
free(req->bdev_name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_vhost_nvme_add_ns[] = {
|
|
{"ctrlr", offsetof(struct rpc_vhost_nvme_ctrlr_add_ns, ctrlr), spdk_json_decode_string },
|
|
{"bdev_name", offsetof(struct rpc_vhost_nvme_ctrlr_add_ns, bdev_name), spdk_json_decode_string },
|
|
};
|
|
|
|
static void
|
|
spdk_rpc_vhost_nvme_controller_add_ns(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_vhost_nvme_ctrlr_add_ns req = {0};
|
|
struct spdk_json_write_ctx *w;
|
|
struct spdk_vhost_dev *vdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_vhost_nvme_add_ns,
|
|
SPDK_COUNTOF(rpc_vhost_nvme_add_ns),
|
|
&req)) {
|
|
SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
spdk_vhost_lock();
|
|
vdev = spdk_vhost_dev_find(req.ctrlr);
|
|
if (vdev == NULL) {
|
|
spdk_vhost_unlock();
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = vhost_nvme_dev_add_ns(vdev, req.bdev_name);
|
|
spdk_vhost_unlock();
|
|
if (rc < 0) {
|
|
goto invalid;
|
|
}
|
|
free_rpc_vhost_nvme_ctrlr_add_ns(&req);
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
spdk_json_write_bool(w, true);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_vhost_nvme_ctrlr_add_ns(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("vhost_nvme_controller_add_ns", spdk_rpc_vhost_nvme_controller_add_ns,
|
|
SPDK_RPC_RUNTIME)
|
|
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_nvme_controller_add_ns, add_vhost_nvme_ns)
|
|
|
|
#endif /* SPDK_CONFIG_VHOST_INTERNAL_LIB */
|
|
|
|
SPDK_LOG_REGISTER_COMPONENT("vhost_rpc", SPDK_LOG_VHOST_RPC)
|