Commit 4cc04a12 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/nvmf: Add nvmf_subsystem_get_controllers RPC 



Add an new RPC, nvmf_subsystem_get_controllers to retrieve the list
of NVMe-oF controllers of an NVMe-oF subsystem.

One of the main use cases will be to get identification information
of NVMe-oF controllers to configure their ANA states dynamically.

Pause and resume the subsystem to access the controllers safely.

One subtle issue remains. The JSON RPC returns success even if
resuming the subsystem fails. Write FIXME explicitly to address this.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ibf8d1cf56850a705e343b86022d101b4c7204199
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3848


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 78ba12ec

doc/jsonrpc.md

+41 −0
Original line number Diff line number Diff line
@@ -4646,6 +4646,47 @@ Example response: 
}

~~~



## nvmf_subsystem_get_controllers {#rpc_nvmf_subsystem_get_controllers}



### Parameters



Name                    | Optional | Type        | Description

----------------------- | -------- | ----------- | -----------

nqn                     | Required | string      | Subsystem NQN

tgt_name                | Optional | string      | Parent NVMe-oF target name.



### Example



Example request:



~~~

{

  "jsonrpc": "2.0",

  "id": 1,

  "method": "nvmf_subsystem_get_controllers",

  "params": {

    "nqn": "nqn.2016-06.io.spdk:cnode1"

  }

}

~~~



Example response:



~~~

{

  "jsonrpc": "2.0",

  "id": 1,

  "result": [

    {

      "cntlid": 1,

      "hostnqn": "nqn.2016-06.io.spdk:host1",

      "hostid": "27dad528-6368-41c3-82d3-0b956b49025d",

      "num_io_qpairs": 5

    }

  ]

}

~~~



## nvmf_set_max_subsystems {#rpc_nvmf_set_max_subsystems}



Set the maximum allowed subsystems for the NVMe-oF target.  This RPC may only be called

lib/nvmf/nvmf_rpc.c

+126 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "spdk/nvmf.h"

#include "spdk/string.h"

#include "spdk/util.h"

#include "spdk/bit_array.h"



#include "spdk_internal/log.h"

#include "spdk_internal/assert.h"
@@ -2041,3 +2042,128 @@ rpc_nvmf_get_stats(struct spdk_jsonrpc_request *request, 
}



SPDK_RPC_REGISTER("nvmf_get_stats", rpc_nvmf_get_stats, SPDK_RPC_RUNTIME)



static void

dump_nvmf_ctrlr(struct spdk_json_write_ctx *w, struct spdk_nvmf_ctrlr *ctrlr)

{

	char uuid_str[SPDK_UUID_STRING_LEN] = {};

	uint32_t count;



	spdk_json_write_object_begin(w);



	spdk_json_write_named_uint32(w, "cntlid", ctrlr->cntlid);



	spdk_json_write_named_string(w, "hostnqn", ctrlr->hostnqn);



	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &ctrlr->hostid);

	spdk_json_write_named_string(w, "hostid", uuid_str);



	count = spdk_bit_array_count_set(ctrlr->qpair_mask);

	spdk_json_write_named_uint32(w, "num_io_qpairs", count);



	spdk_json_write_object_end(w);

}



struct rpc_nvmf_get_ctrlr_ctx {

	char *nqn;

	char *tgt_name;

	struct spdk_nvmf_subsystem *subsystem;

	struct spdk_jsonrpc_request *request;

	struct spdk_json_write_ctx *w;

};



static const struct spdk_json_object_decoder rpc_nvmf_get_ctrlr_decoders[] = {

	{"nqn", offsetof(struct rpc_nvmf_get_ctrlr_ctx, nqn), spdk_json_decode_string},

	{"tgt_name", offsetof(struct rpc_nvmf_get_ctrlr_ctx, tgt_name), spdk_json_decode_string, true},

};



static void

free_rpc_nvmf_get_ctrlr_ctx(struct rpc_nvmf_get_ctrlr_ctx *ctx)

{

	free(ctx->nqn);

	free(ctx->tgt_name);

	free(ctx);

}



static void

rpc_nvmf_get_controllers_paused(struct spdk_nvmf_subsystem *subsystem,

				void *cb_arg, int status)

{

	struct rpc_nvmf_get_ctrlr_ctx *ctx = cb_arg;

	struct spdk_json_write_ctx *w;

	struct spdk_nvmf_ctrlr *ctrlr;



	w = spdk_jsonrpc_begin_result(ctx->request);



	spdk_json_write_array_begin(w);

	TAILQ_FOREACH(ctrlr, &ctx->subsystem->ctrlrs, link) {

		dump_nvmf_ctrlr(w, ctrlr);

	}

	spdk_json_write_array_end(w);



	spdk_jsonrpc_end_result(ctx->request, w);



	if (spdk_nvmf_subsystem_resume(ctx->subsystem, NULL, NULL)) {

		SPDK_ERRLOG("Resuming subsystem with NQN %s failed\n", ctx->nqn);

		/* FIXME: RPC should fail if resuming the subsystem failed. */

	}



	free_rpc_nvmf_get_ctrlr_ctx(ctx);

}



static void

rpc_nvmf_subsystem_get_controllers(struct spdk_jsonrpc_request *request,

				   const struct spdk_json_val *params)

{

	struct rpc_nvmf_get_ctrlr_ctx *ctx;

	struct spdk_nvmf_subsystem *subsystem;

	struct spdk_nvmf_tgt *tgt;



	ctx = calloc(1, sizeof(*ctx));

	if (!ctx) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "Out of memory");

		return;

	}



	ctx->request = request;



	if (spdk_json_decode_object(params, rpc_nvmf_get_ctrlr_decoders,

				    SPDK_COUNTOF(rpc_nvmf_get_ctrlr_decoders),

				    ctx)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "Invalid parameters");

		free_rpc_nvmf_get_ctrlr_ctx(ctx);

		return;

	}



	tgt = spdk_nvmf_get_tgt(ctx->tgt_name);

	if (!tgt) {

		SPDK_ERRLOG("Unable to find a target object.\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "Unable to find a target");

		free_rpc_nvmf_get_ctrlr_ctx(ctx);

		return;

	}



	subsystem = spdk_nvmf_tgt_find_subsystem(tgt, ctx->nqn);

	if (!subsystem) {

		SPDK_ERRLOG("Unable to find subsystem with NQN %s\n", ctx->nqn);

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "Invalid parameters");

		free_rpc_nvmf_get_ctrlr_ctx(ctx);

		return;

	}



	ctx->subsystem = subsystem;



	if (spdk_nvmf_subsystem_pause(subsystem, rpc_nvmf_get_controllers_paused, ctx)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "Internal error");

		free_rpc_nvmf_get_ctrlr_ctx(ctx);

		return;

	}

}

SPDK_RPC_REGISTER("nvmf_subsystem_get_controllers", rpc_nvmf_subsystem_get_controllers,

		  SPDK_RPC_RUNTIME);

scripts/rpc.py

+11 −0
Original line number Diff line number Diff line
@@ -1984,6 +1984,17 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-t', '--tgt_name', help='The name of the parent NVMe-oF target (optional)', type=str)

    p.set_defaults(func=nvmf_subsystem_allow_any_host)



    def nvmf_subsystem_get_controllers(args):

        print_dict(rpc.nvmf.nvmf_subsystem_get_controllers(args.client,

                                                           nqn=args.nqn,

                                                           tgt_name=args.tgt_name))



    p = subparsers.add_parser('nvmf_subsystem_get_controllers',

                              help='Display controllers of an NVMe-oF subsystem.')

    p.add_argument('nqn', help='NVMe-oF subsystem NQN')

    p.add_argument('-t', '--tgt-name', help='The name of the parent NVMe-oF target (optional)', type=str)

    p.set_defaults(func=nvmf_subsystem_get_controllers)



    def nvmf_get_stats(args):

        print_dict(rpc.nvmf.nvmf_get_stats(args.client, tgt_name=args.tgt_name))

scripts/rpc/nvmf.py

+18 −0
Original line number Diff line number Diff line
@@ -463,6 +463,24 @@ def nvmf_delete_subsystem(client, nqn, tgt_name=None): 
    return client.call('nvmf_delete_subsystem', params)





def nvmf_subsystem_get_controllers(client, nqn, tgt_name=None):

    """Get list of controllers of an NVMe-oF subsystem.



    Args:

        nqn: Subsystem NQN.

        tgt_name: name of the parent NVMe-oF target (optional).



    Returns:

        List of controller objects of an NVMe-oF subsystem.

    """

    params = {'nqn': nqn}



    if tgt_name:

        params['tgt_name'] = tgt_name



    return client.call('nvmf_subsystem_get_controllers', params)





def nvmf_get_stats(client, tgt_name=None):

    """Query NVMf statistics.