Commit 94345a0a authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvme: Add the priority field in struct spdk_nvme_transport_id 



Purpose: To set the priority of the NVMe-oF connection especially
for TCP connection.

For example, the previous example can be:

trtype:TCP adrfam:IPv4 traddr:10.67.110.181 trsvcid:4420

With the change, it could be:

trtype:TCP adrfam:IPv4 traddr:10.67.110.181 trsvcid:4420 priority:2

The priority is optional. We try to change
spdk_nvme_transport_id but not in spdk_nvme_ctrlr_opts since
the opts in spdk_nvme_ctrlr_opts will reflect in every nvme ctrlr,
this is short of flexibility.

Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Signed-off-by: default avatarSudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Change-Id: I1ba364c714a95f2dbeab2b3fcc832b0222b48a15
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1875


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 avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent b9a7313e

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ New version of OCF comes with API changes and bug fixes 
Export internal nvme_ctrlr_cmd_security_receive/send() APIs as public APIs with "spdk_"

prefix.



Added `priority` field in `spdk_nvme_transport_id`, this field is used to specify the priority

of the NVMe-oF connection, and currently it is used for NVMe-oF tcp connection.



### copy



The copy engine library, modules and public APIs have been renamed. Use of the word `copy`

include/spdk/nvme.h

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ extern "C" { 
#define SPDK_NVME_TRANSPORT_NAME_RDMA	"RDMA"

#define SPDK_NVME_TRANSPORT_NAME_TCP	"TCP"



#define SPDK_NVMF_PRIORITY_MAX_LEN 4



/**

 * Opaque handle to a controller. Returned by spdk_nvme_probe()'s attach_cb.

 */
@@ -360,6 +362,13 @@ struct spdk_nvme_transport_id { 
	 * Subsystem NQN of the NVMe over Fabrics endpoint. May be a zero length string.

	 */

	char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1];



	/**

	 * The Transport connection priority of the NVMe-oF endpoint. Currently this is

	 * only supported by posix based sock implementation on Kernel TCP stack. More

	 * information of this field can be found from the socket(7) man page.

	 */

	int priority;

};



/**

lib/nvme/nvme.c

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */



#include "spdk/nvmf_spec.h"

#include "spdk/string.h"

#include "nvme_internal.h"

#include "nvme_io_msg.h"
@@ -975,6 +976,13 @@ spdk_nvme_transport_id_parse(struct spdk_nvme_transport_id *trid, const char *st 
				return -EINVAL;

			}

			memcpy(trid->trsvcid, val, val_len + 1);

		} else if (strcasecmp(key, "priority") == 0) {

			if (val_len > SPDK_NVMF_PRIORITY_MAX_LEN) {

				SPDK_ERRLOG("priority length %zu greater than maximum allowed %u\n",

					    val_len, SPDK_NVMF_PRIORITY_MAX_LEN);

				return -EINVAL;

			}

			trid->priority = spdk_strtol(val, 10);

		} else if (strcasecmp(key, "subnqn") == 0) {

			if (val_len > SPDK_NVMF_NQN_MAX_LEN) {

				SPDK_ERRLOG("subnqn length %zu greater than maximum allowed %u\n",
@@ -1046,6 +1054,8 @@ spdk_nvme_host_id_parse(struct spdk_nvme_host_id *hostid, const char *str) 
			continue;

		} else if (strcasecmp(key, "subnqn") == 0) {

			continue;

		} else if (strcasecmp(key, "priority") == 0) {

			continue;

		} else if (strcasecmp(key, "ns") == 0) {

			continue;

		} else if (strcasecmp(key, "hostaddr") == 0) {

lib/nvme/nvme_fabric.c

+6 −2
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ nvme_fabric_ctrlr_get_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint 


static void

nvme_fabric_discover_probe(struct spdk_nvmf_discovery_log_page_entry *entry,

			   struct spdk_nvme_probe_ctx *probe_ctx)

			   struct spdk_nvme_probe_ctx *probe_ctx,

			   int discover_priority)

{

	struct spdk_nvme_transport_id trid;

	uint8_t *end;
@@ -221,6 +222,9 @@ nvme_fabric_discover_probe(struct spdk_nvmf_discovery_log_page_entry *entry, 
		      trid.subnqn, trid.trtype,

		      trid.traddr, trid.trsvcid);



	/* Copy the priority from the discovery ctrlr */

	trid.priority = discover_priority;



	nvme_ctrlr_probe(&trid, probe_ctx, NULL);

}
@@ -378,7 +382,7 @@ nvme_fabric_ctrlr_discover(struct spdk_nvme_ctrlr *ctrlr, 
		}



		for (i = 0; i < numrec; i++) {

			nvme_fabric_discover_probe(log_page_entry++, probe_ctx);

			nvme_fabric_discover_probe(log_page_entry++, probe_ctx, ctrlr->trid.priority);

		}

		remaining_num_rec -= numrec;

		log_page_offset += numrec * sizeof(struct spdk_nvmf_discovery_log_page_entry);

lib/nvme/nvme_tcp.c

+5 −1
Original line number Diff line number Diff line
@@ -1487,6 +1487,7 @@ nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpa 
	struct nvme_tcp_qpair *tqpair;

	int family;

	long int port;

	struct spdk_sock_opts opts;



	tqpair = nvme_tcp_qpair(qpair);
@@ -1528,7 +1529,10 @@ nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpa 
		return -1;

	}



	tqpair->sock = spdk_sock_connect(ctrlr->trid.traddr, port, NULL);

	opts.opts_size = sizeof(opts);

	spdk_sock_get_default_opts(&opts);

	opts.priority = ctrlr->trid.priority;

	tqpair->sock = spdk_sock_connect_ext(ctrlr->trid.traddr, port, NULL, &opts);

	if (!tqpair->sock) {

		SPDK_ERRLOG("sock connection error of tqpair=%p with addr=%s, port=%ld\n",

			    tqpair, ctrlr->trid.traddr, port);