From ec2abc81a259d534f919612e2df262e9a2e41205 Mon Sep 17 00:00:00 2001 From: Amir Haroush Date: Tue, 2 May 2023 00:19:30 +0300 Subject: [PATCH] bdev/ocf: add bdev_ocf_reset_stats RPC Signed-off-by: Amir Haroush Signed-off-by: Shai Fultheim Change-Id: Ife91df62099e14d328a767b1bbb3ddd3ded57264 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17916 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 39 ++++++++++++++++++++ module/bdev/ocf/stats.c | 16 ++++++++ module/bdev/ocf/stats.h | 1 + module/bdev/ocf/vbdev_ocf_rpc.c | 65 +++++++++++++++++++++++++++++++++ python/spdk/rpc/bdev.py | 14 +++++++ scripts/rpc.py | 7 ++++ 6 files changed, 142 insertions(+) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 874b61bea..309e68ea1 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -3235,6 +3235,45 @@ Example response: } ~~~ +### bdev_ocf_reset_stats {#rpc_bdev_ocf_reset_stats} + +Reset statistics of chosen OCF block device. + +#### Parameters + +Name | Optional | Type | Description +----------------------- | -------- | ----------- | ----------- +name | Required | string | Block device name + +#### Response + +Completion status of reset statistics operation returned as a boolean. + +#### Example + +Example request: + +~~~json +{ + "params": { + "name": "ocf0" + }, + "jsonrpc": "2.0", + "method": "bdev_ocf_reset_stats", + "id": 1 +} +~~~ + +Example response: + +~~~json +{ + "jsonrpc": "2.0", + "id": 1, + "result": true +} +~~~ + ### bdev_ocf_get_bdevs {#rpc_bdev_ocf_get_bdevs} Get list of OCF devices including unregistered ones. diff --git a/module/bdev/ocf/stats.c b/module/bdev/ocf/stats.c index bbc91f596..f27036c26 100644 --- a/module/bdev/ocf/stats.c +++ b/module/bdev/ocf/stats.c @@ -20,6 +20,22 @@ vbdev_ocf_stats_get(ocf_cache_t cache, char *core_name, struct vbdev_ocf_stats * return ocf_stats_collect_core(core, &stats->usage, &stats->reqs, &stats->blocks, &stats->errors); } +int +vbdev_ocf_stats_reset(ocf_cache_t cache, char *core_name) +{ + int status; + ocf_core_t core; + + status = ocf_core_get_by_name(cache, core_name, strlen(core_name), &core); + if (status) { + return status; + } + + ocf_core_stats_initialize(core); + + return 0; +} + #define WJSON_STAT(w, stats, group, field, units) \ spdk_json_write_named_object_begin(w, #field); \ spdk_json_write_named_uint64(w, "count", stats->group.field.value); \ diff --git a/module/bdev/ocf/stats.h b/module/bdev/ocf/stats.h index 9bfcc36da..b48a30c01 100644 --- a/module/bdev/ocf/stats.h +++ b/module/bdev/ocf/stats.h @@ -17,6 +17,7 @@ struct vbdev_ocf_stats { }; int vbdev_ocf_stats_get(ocf_cache_t cache, char *core_name, struct vbdev_ocf_stats *stats); +int vbdev_ocf_stats_reset(ocf_cache_t cache, char *core_name); void vbdev_ocf_stats_write_json(struct spdk_json_write_ctx *w, struct vbdev_ocf_stats *stats); diff --git a/module/bdev/ocf/vbdev_ocf_rpc.c b/module/bdev/ocf/vbdev_ocf_rpc.c index b31cb2424..1396bb0ea 100644 --- a/module/bdev/ocf/vbdev_ocf_rpc.c +++ b/module/bdev/ocf/vbdev_ocf_rpc.c @@ -224,6 +224,71 @@ end: } SPDK_RPC_REGISTER("bdev_ocf_get_stats", rpc_bdev_ocf_get_stats, SPDK_RPC_RUNTIME) +static void +rpc_bdev_ocf_reset_stats_cmpl(ocf_cache_t cache, void *priv, int error) +{ + struct get_ocf_stats_ctx *ctx = (struct get_ocf_stats_ctx *) priv; + + if (error) { + goto end; + } + + error = vbdev_ocf_stats_reset(cache, ctx->core_name); + + ocf_mngt_cache_read_unlock(cache); + +end: + if (error) { + spdk_jsonrpc_send_error_response_fmt(ctx->request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, + "Could not reset stats: %s", + spdk_strerror(-error)); + } else { + spdk_jsonrpc_send_bool_response(ctx->request, true); + } + free(ctx); +} + +static void +rpc_bdev_ocf_reset_stats(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct rpc_bdev_ocf_name req = {NULL}; + struct vbdev_ocf *vbdev; + struct get_ocf_stats_ctx *ctx; + + ctx = calloc(1, sizeof(*ctx)); + if (!ctx) { + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + "Not enough memory to process request"); + goto end; + } + + if (spdk_json_decode_object(params, rpc_bdev_ocf_name_decoders, + SPDK_COUNTOF(rpc_bdev_ocf_name_decoders), + &req)) { + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + "Invalid parameters"); + free(ctx); + goto end; + } + + vbdev = vbdev_ocf_get_by_name(req.name); + if (vbdev == NULL) { + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + spdk_strerror(ENODEV)); + free(ctx); + goto end; + } + + ctx->core_name = vbdev->core.name; + ctx->request = request; + ocf_mngt_cache_read_lock(vbdev->ocf_cache, rpc_bdev_ocf_reset_stats_cmpl, ctx); + +end: + free_rpc_bdev_ocf_name(&req); +} +SPDK_RPC_REGISTER("bdev_ocf_reset_stats", rpc_bdev_ocf_reset_stats, SPDK_RPC_RUNTIME) + /* Structure to decode the input parameters for this RPC method. */ static const struct spdk_json_object_decoder rpc_bdev_ocf_get_bdevs_decoders[] = { {"name", offsetof(struct rpc_bdev_ocf_name, name), spdk_json_decode_string, true}, diff --git a/python/spdk/rpc/bdev.py b/python/spdk/rpc/bdev.py index 8149f7776..5486f0975 100644 --- a/python/spdk/rpc/bdev.py +++ b/python/spdk/rpc/bdev.py @@ -185,6 +185,20 @@ def bdev_ocf_get_stats(client, name): return client.call('bdev_ocf_get_stats', params) +def bdev_ocf_reset_stats(client, name): + """Reset statistics of chosen OCF block device + + Args: + name: name of OCF bdev + + Returns: + None + """ + params = {'name': name} + + return client.call('bdev_ocf_reset_stats', params) + + def bdev_ocf_get_bdevs(client, name=None): """Get list of OCF devices including unregistered ones diff --git a/scripts/rpc.py b/scripts/rpc.py index 09afd3999..741fd37a6 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -327,6 +327,13 @@ if __name__ == "__main__": p.add_argument('name', help='Name of OCF bdev') p.set_defaults(func=bdev_ocf_get_stats) + def bdev_ocf_reset_stats(args): + print_dict(rpc.bdev.bdev_ocf_reset_stats(args.client, + name=args.name)) + p = subparsers.add_parser('bdev_ocf_reset_stats', help='Reset statistics of chosen OCF block device') + p.add_argument('name', help='Name of OCF bdev') + p.set_defaults(func=bdev_ocf_reset_stats) + def bdev_ocf_get_bdevs(args): print_dict(rpc.bdev.bdev_ocf_get_bdevs(args.client, name=args.name))