Commit 01bbc271 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: add nvme_parse_addr() 



nvme_tcp_parse_addr() and nvme_rdma_parse_addr()
were exact duplicates, so break this out into a
common helper function.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I5dcf3c218992c41f51a883f020847de36f1652e3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20564


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 3ad3bb5e

lib/nvme/nvme.c

+29 −0
Original line number Diff line number Diff line
@@ -1554,4 +1554,33 @@ spdk_nvme_connect_async(const struct spdk_nvme_transport_id *trid, 
	return probe_ctx;

}



int

nvme_parse_addr(struct sockaddr_storage *sa, int family, const char *addr, const char *service)

{

	struct addrinfo *res;

	struct addrinfo hints;

	int ret;



	memset(&hints, 0, sizeof(hints));

	hints.ai_family = family;

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_protocol = 0;



	ret = getaddrinfo(addr, service, &hints, &res);

	if (ret) {

		SPDK_ERRLOG("getaddrinfo failed: %s (%d)\n", gai_strerror(ret), ret);

		return -(abs(ret));

	}



	if (res->ai_addrlen > sizeof(*sa)) {

		SPDK_ERRLOG("getaddrinfo() ai_addrlen %zu too large\n", (size_t)res->ai_addrlen);

		ret = -EINVAL;

	} else {

		memcpy(sa, res->ai_addr, res->ai_addrlen);

	}



	freeaddrinfo(res);

	return ret;

}



SPDK_LOG_REGISTER_COMPONENT(nvme)

lib/nvme/nvme_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,9 @@ void nvme_ctrlr_proc_get_ref(struct spdk_nvme_ctrlr *ctrlr); 
void	nvme_ctrlr_proc_put_ref(struct spdk_nvme_ctrlr *ctrlr);

int	nvme_ctrlr_get_ref_count(struct spdk_nvme_ctrlr *ctrlr);



int	nvme_parse_addr(struct sockaddr_storage *sa, int family,

			const char *addr, const char *service);



static inline bool

_is_page_aligned(uint64_t address, uint64_t page_size)

{

lib/nvme/nvme_rdma.c

+4 −33
Original line number Diff line number Diff line
@@ -1241,35 +1241,6 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair) 
					     nvme_rdma_connect_established);

}



static int

nvme_rdma_parse_addr(struct sockaddr_storage *sa, int family, const char *addr, const char *service)

{

	struct addrinfo *res;

	struct addrinfo hints;

	int ret;



	memset(&hints, 0, sizeof(hints));

	hints.ai_family = family;

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_protocol = 0;



	ret = getaddrinfo(addr, service, &hints, &res);

	if (ret) {

		SPDK_ERRLOG("getaddrinfo failed: %s (%d)\n", gai_strerror(ret), ret);

		return -(abs(ret));

	}



	if (res->ai_addrlen > sizeof(*sa)) {

		SPDK_ERRLOG("getaddrinfo() ai_addrlen %zu too large\n", (size_t)res->ai_addrlen);

		ret = -EINVAL;

	} else {

		memcpy(sa, res->ai_addr, res->ai_addrlen);

	}



	freeaddrinfo(res);

	return ret;

}



static int

nvme_rdma_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{
@@ -1302,17 +1273,17 @@ nvme_rdma_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qp 
	memset(&dst_addr, 0, sizeof(dst_addr));



	SPDK_DEBUGLOG(nvme, "trsvcid is %s\n", ctrlr->trid.trsvcid);

	rc = nvme_rdma_parse_addr(&dst_addr, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);

	rc = nvme_parse_addr(&dst_addr, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);

	if (rc != 0) {

		SPDK_ERRLOG("dst_addr nvme_rdma_parse_addr() failed\n");

		SPDK_ERRLOG("dst_addr nvme_parse_addr() failed\n");

		return -1;

	}



	if (ctrlr->opts.src_addr[0] || ctrlr->opts.src_svcid[0]) {

		memset(&src_addr, 0, sizeof(src_addr));

		rc = nvme_rdma_parse_addr(&src_addr, family, ctrlr->opts.src_addr, ctrlr->opts.src_svcid);

		rc = nvme_parse_addr(&src_addr, family, ctrlr->opts.src_addr, ctrlr->opts.src_svcid);

		if (rc != 0) {

			SPDK_ERRLOG("src_addr nvme_rdma_parse_addr() failed\n");

			SPDK_ERRLOG("src_addr nvme_parse_addr() failed\n");

			return -1;

		}

		src_addr_specified = true;

lib/nvme/nvme_tcp.c

+4 −33
Original line number Diff line number Diff line
@@ -262,35 +262,6 @@ nvme_tcp_accel_append_crc32c(struct nvme_tcp_poll_group *tgroup, void **seq, uin 
						seed, cb_fn, cb_arg);

}



static int

nvme_tcp_parse_addr(struct sockaddr_storage *sa, int family, const char *addr, const char *service)

{

	struct addrinfo *res;

	struct addrinfo hints;

	int ret;



	memset(&hints, 0, sizeof(hints));

	hints.ai_family = family;

	hints.ai_socktype = SOCK_STREAM;

	hints.ai_protocol = 0;



	ret = getaddrinfo(addr, service, &hints, &res);

	if (ret) {

		SPDK_ERRLOG("getaddrinfo failed: %s (%d)\n", gai_strerror(ret), ret);

		return -(abs(ret));

	}



	if (res->ai_addrlen > sizeof(*sa)) {

		SPDK_ERRLOG("getaddrinfo() ai_addrlen %zu too large\n", (size_t)res->ai_addrlen);

		ret = -EINVAL;

	} else {

		memcpy(sa, res->ai_addr, res->ai_addrlen);

	}



	freeaddrinfo(res);

	return ret;

}



static void

nvme_tcp_free_reqs(struct nvme_tcp_qpair *tqpair)

{
@@ -2285,17 +2256,17 @@ nvme_tcp_qpair_connect_sock(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpai 
	}



	SPDK_DEBUGLOG(nvme, "trsvcid is %s\n", ctrlr->trid.trsvcid);

	rc = nvme_tcp_parse_addr(&dst_addr, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);

	rc = nvme_parse_addr(&dst_addr, family, ctrlr->trid.traddr, ctrlr->trid.trsvcid);

	if (rc != 0) {

		SPDK_ERRLOG("dst_addr nvme_tcp_parse_addr() failed\n");

		SPDK_ERRLOG("dst_addr nvme_parse_addr() failed\n");

		return rc;

	}



	if (ctrlr->opts.src_addr[0] || ctrlr->opts.src_svcid[0]) {

		memset(&src_addr, 0, sizeof(src_addr));

		rc = nvme_tcp_parse_addr(&src_addr, family, ctrlr->opts.src_addr, ctrlr->opts.src_svcid);

		rc = nvme_parse_addr(&src_addr, family, ctrlr->opts.src_addr, ctrlr->opts.src_svcid);

		if (rc != 0) {

			SPDK_ERRLOG("src_addr nvme_tcp_parse_addr() failed\n");

			SPDK_ERRLOG("src_addr nvme_parse_addr() failed\n");

			return rc;

		}

	}

test/common/lib/nvme/common_stubs.h

+18 −0
Original line number Diff line number Diff line
@@ -112,3 +112,21 @@ nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id, 


	return 0;

}



int

nvme_parse_addr(struct sockaddr_storage *sa, int family, const char *addr, const char *service)

{

	struct addrinfo *res;

	struct addrinfo hints;

	int rc;



	memset(&hints, 0, sizeof(hints));

	hints.ai_family = family;

	hints.ai_socktype = SOCK_STREAM;



	rc = getaddrinfo(addr, service, &hints, &res);

	if (rc == 0) {

		freeaddrinfo(res);

	}

	return rc;

}