Commit 8dfefec5 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Improve error reporting when adding additional paths to a 


controller

Change-Id: I53ac0c6f8879bf80bc1345ef620a215d434f536f
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9340


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent bf9e3156

module/bdev/nvme/bdev_nvme_rpc.c

+19 −6
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 
{

	struct rpc_bdev_nvme_attach_controller_ctx *ctx;

	struct spdk_nvme_transport_id trid = {};

	const struct spdk_nvme_ctrlr_opts *opts;

	uint32_t prchk_flags = 0;

	struct nvme_ctrlr *ctrlr = NULL;

	size_t len, maxlen;
@@ -385,9 +386,24 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 


	ctrlr = nvme_ctrlr_get_by_name(ctx->req.name);



	if (ctrlr && (ctx->req.hostaddr || ctx->req.hostnqn || ctx->req.hostsvcid || ctx->req.prchk_guard ||

		      ctx->req.prchk_reftag)) {

		goto conflicting_arguments;

	if (ctrlr) {

		/* This controller already exists. Verify the parameters match sufficiently. */

		opts = spdk_nvme_ctrlr_get_opts(ctrlr->ctrlr);



		if (strncmp(ctx->req.opts.hostnqn, opts->hostnqn, SPDK_NVMF_NQN_MAX_LEN) != 0) {

			/* Different HOSTNQN is not allowed when specifying the same controller name. */

			spdk_jsonrpc_send_error_response_fmt(request, -EINVAL,

							     "A controller named %s already exists, but uses a different hostnqn (%s)\n",

							     ctx->req.name, opts->hostnqn);

			goto cleanup;

		}



		if (ctx->req.prchk_guard || ctx->req.prchk_reftag) {

			spdk_jsonrpc_send_error_response_fmt(request, -EINVAL,

							     "A controller named %s already exists. To add a path, do not specify PI options.\n",

							     ctx->req.name);

			goto cleanup;

		}

	}



	if (ctx->req.prchk_reftag) {
@@ -410,9 +426,6 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 


	return;



conflicting_arguments:

	spdk_jsonrpc_send_error_response_fmt(request, -EINVAL,

					     "Invalid agrgument list. Existing controller name cannot be combined with host information or PI options.\n");

cleanup:

	free_rpc_bdev_nvme_attach_controller(&ctx->req);

	free(ctx);

test/nvmf/host/multicontroller.sh

+5 −4
Original line number Diff line number Diff line
@@ -46,9 +46,10 @@ while ! $rpc_py -s $bdevperf_rpc_sock bdev_nvme_get_controllers | grep -c NVMe; 
	sleep 1s

done



# try to attach to the second port with a different hostsvcid (this should fail).

# try to attach with same controller name but different hostnqn. Should fail.

NOT $rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \

	-s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 -i $NVMF_FIRST_TARGET_IP -c $NVMF_HOST_SECOND_PORT

	-s $NVMF_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 -i $NVMF_FIRST_TARGET_IP -c $NVMF_HOST_FIRST_PORT \

	-q nqn.2021-09-7.io.spdk:00001



# Add a second path without specifying the host information. Should pass.

$rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \
@@ -58,9 +59,9 @@ $rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe0 -t $TEST_TRAN 
$rpc_py -s $bdevperf_rpc_sock bdev_nvme_detach_controller NVMe0 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \

	-s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1



# Add a second controller by attaching to the same subsystem from a different hostid.

# Add a second controller by attaching to the same subsystem with a different controller name

$rpc_py -s $bdevperf_rpc_sock bdev_nvme_attach_controller -b NVMe1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP \

	-s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 -i $NVMF_FIRST_TARGET_IP -c $NVMF_HOST_SECOND_PORT

	-s $NVMF_SECOND_PORT -f ipv4 -n nqn.2016-06.io.spdk:cnode1 -i $NVMF_FIRST_TARGET_IP -c $NVMF_HOST_FIRST_PORT



if [ "$($rpc_py -s $bdevperf_rpc_sock bdev_nvme_get_controllers | grep -c NVMe)" != "2" ]; then

	echo "actual number of controllers is not equal to expected count."