Commit 78a24106 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvme/tcp: add the function nvme_tcp_readv_data 



Change-Id: I0a1ad0a4dc265ced10b0ce761d38a679fa06bacf
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447579


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 626ceb20

include/spdk_internal/nvme_tcp.h

+18 −6
Original line number Diff line number Diff line
@@ -283,17 +283,16 @@ end: 
}



static int

nvme_tcp_read_data(struct spdk_sock *sock, int bytes,

		   void *buf)

nvme_tcp_readv_data(struct spdk_sock *sock, struct iovec *iov, int iovcnt)

{

	int ret;



	assert(sock != NULL);

	if (bytes == 0) {

	if (iov == NULL || iovcnt == 0) {

		return 0;

	}



	ret = spdk_sock_recv(sock, buf, bytes);

	ret = spdk_sock_readv(sock, iov, iovcnt);



	if (ret > 0) {

		return ret;
@@ -306,15 +305,28 @@ nvme_tcp_read_data(struct spdk_sock *sock, int bytes, 


		/* For connect reset issue, do not output error log */

		if (errno == ECONNRESET) {

			SPDK_DEBUGLOG(SPDK_LOG_NVME, "spdk_sock_recv() failed, errno %d: %s\n",

			SPDK_DEBUGLOG(SPDK_LOG_NVME, "spdk_sock_readv() failed, errno %d: %s\n",

				      errno, spdk_strerror(errno));

		} else {

			SPDK_ERRLOG("spdk_sock_recv() failed, errno %d: %s\n",

			SPDK_ERRLOG("spdk_sock_readv() failed, errno %d: %s\n",

				    errno, spdk_strerror(errno));

		}

	}



	/* connection closed */

	return NVME_TCP_CONNECTION_FATAL;

}



static int

nvme_tcp_read_data(struct spdk_sock *sock, int bytes,

		   void *buf)

{

	struct iovec iov;



	iov.iov_base = buf;

	iov.iov_len = bytes;



	return nvme_tcp_readv_data(sock, &iov, 1);

}



#endif /* SPDK_INTERNAL_NVME_TCP_H */