ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/iscsi: Rename _iov_ctx to _iscsi_sgl to match DIF library

Browse Source 
Recently DIF library refined _iov_ctx to support multiple iovecs
for DIF insert and strip operations. iSCSI library is the first
user of DIF insert and strip, and so rename _iov_ctx to _iscsi_sgl
to match DIF library. Names of related helper functions and
a member variable are changed together.

This change will be helpful to extract common part into a specific
helper library if necessary in future.

Change-Id: I3be3b6c3c476b0309ffafdecf3181fb2bb19abc6
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455620
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-05-24 09:11:31 +09:00 committed by Jim Harris
parent 5ef1a15c6f
commit f089b07af4
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/iscsi/iscsi.c
View File

@ -588,37 +588,37 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
return 1; return 1;
} }
struct _iov_ctx { struct _iscsi_sgl {
struct iovec *iov; struct iovec *iov;
int iovcnt; int iovcnt;
uint32_t iov_offset; uint32_t iov_offset;
uint32_t mapped_len; uint32_t total_size;
}; };
static inline void static inline void
_iov_ctx_init(struct _iov_ctx *ctx, struct iovec *iovs, int iovcnt, _iscsi_sgl_init(struct _iscsi_sgl *s, struct iovec *iovs, int iovcnt,
uint32_t iov_offset) uint32_t iov_offset)
{ {
ctx->iov = iovs; s->iov = iovs;
ctx->iovcnt = iovcnt; s->iovcnt = iovcnt;
ctx->iov_offset = iov_offset; s->iov_offset = iov_offset;
ctx->mapped_len = 0; s->total_size = 0;
} }
static inline bool static inline bool
_iov_ctx_set_iov(struct _iov_ctx *ctx, uint8_t *data, uint32_t data_len) _iscsi_sgl_append(struct _iscsi_sgl *s, uint8_t *data, uint32_t data_len)
{ {
if (ctx->iov_offset >= data_len) { if (s->iov_offset >= data_len) {
ctx->iov_offset -= data_len; s->iov_offset -= data_len;
} else { } else {
assert(ctx->iovcnt > 0); assert(s->iovcnt > 0);
ctx->iov->iov_base = data + ctx->iov_offset; s->iov->iov_base = data + s->iov_offset;
ctx->iov->iov_len = data_len - ctx->iov_offset; s->iov->iov_len = data_len - s->iov_offset;
ctx->mapped_len += data_len - ctx->iov_offset; s->total_size += data_len - s->iov_offset;
ctx->iov_offset = 0; s->iov_offset = 0;
ctx->iov++; s->iov++;
ctx->iovcnt--; s->iovcnt--;
if (ctx->iovcnt == 0) { if (s->iovcnt == 0) {
return false; return false;
} }
} }
@ -630,34 +630,33 @@ _iov_ctx_set_iov(struct _iov_ctx *ctx, uint8_t *data, uint32_t data_len)
* when reading data segment from socket. * when reading data segment from socket.
*/ */
static inline bool static inline bool
_iov_ctx_set_md_interleave_iov(struct _iov_ctx *ctx, _iscsi_sgl_append_with_md(struct _iscsi_sgl *s,
void *buf, uint32_t buf_len, uint32_t data_len, void *buf, uint32_t buf_len, uint32_t data_len,
struct spdk_dif_ctx *dif_ctx) struct spdk_dif_ctx *dif_ctx)
{ {
int rc; int rc;
uint32_t mapped_len = 0; uint32_t total_size = 0;
struct iovec buf_iov; struct iovec buf_iov;
if (ctx->iov_offset >= data_len) { if (s->iov_offset >= data_len) {
ctx->iov_offset -= buf_len; s->iov_offset -= buf_len;
} else { } else {
buf_iov.iov_base = buf; buf_iov.iov_base = buf;
buf_iov.iov_len = buf_len; buf_iov.iov_len = buf_len;
rc = spdk_dif_set_md_interleave_iovs(ctx->iov, ctx->iovcnt, rc = spdk_dif_set_md_interleave_iovs(s->iov, s->iovcnt, &buf_iov, 1,
&buf_iov, 1, s->iov_offset, data_len, &total_size,
ctx->iov_offset, data_len, &mapped_len,
dif_ctx); dif_ctx);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Failed to setup iovs for DIF strip\n"); SPDK_ERRLOG("Failed to setup iovs for DIF strip\n");
return false; return false;
} }
ctx->mapped_len += mapped_len; s->total_size += total_size;
ctx->iov_offset = 0; s->iov_offset = 0;
assert(ctx->iovcnt >= rc); assert(s->iovcnt >= rc);
ctx->iovcnt -= rc; s->iovcnt -= rc;
if (ctx->iovcnt == 0) { if (s->iovcnt == 0) {
return false; return false;
} }
} }
@ -669,7 +668,7 @@ int
spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int iovcnt, spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int iovcnt,
struct spdk_iscsi_pdu *pdu, uint32_t *_mapped_length) struct spdk_iscsi_pdu *pdu, uint32_t *_mapped_length)
{ {
struct _iov_ctx ctx; struct _iscsi_sgl sgl;
int enable_digest; int enable_digest;
uint32_t total_ahs_len; uint32_t total_ahs_len;
uint32_t data_len; uint32_t data_len;
@ -688,22 +687,22 @@ spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int iovc
enable_digest = 0; enable_digest = 0;
} }
_iov_ctx_init(&ctx, iovs, iovcnt, pdu->writev_offset); _iscsi_sgl_init(&sgl, iovs, iovcnt, pdu->writev_offset);
/* BHS */ /* BHS */
if (!_iov_ctx_set_iov(&ctx, (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN)) { if (!_iscsi_sgl_append(&sgl, (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN)) {
goto end; goto end;
} }
/* AHS */ /* AHS */
if (total_ahs_len > 0) { if (total_ahs_len > 0) {
if (!_iov_ctx_set_iov(&ctx, pdu->ahs, 4 * total_ahs_len)) { if (!_iscsi_sgl_append(&sgl, pdu->ahs, 4 * total_ahs_len)) {
goto end; goto end;
} }
} }
/* Header Digest */ /* Header Digest */
if (enable_digest && conn->header_digest) { if (enable_digest && conn->header_digest) {
if (!_iov_ctx_set_iov(&ctx, pdu->header_digest, ISCSI_DIGEST_LEN)) { if (!_iscsi_sgl_append(&sgl, pdu->header_digest, ISCSI_DIGEST_LEN)) {
goto end; goto end;
} }
} }
@ -711,11 +710,11 @@ spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int iovc
/* Data Segment */ /* Data Segment */
if (data_len > 0) { if (data_len > 0) {
if (!pdu->dif_insert_or_strip) { if (!pdu->dif_insert_or_strip) {
if (!_iov_ctx_set_iov(&ctx, pdu->data, data_len)) { if (!_iscsi_sgl_append(&sgl, pdu->data, data_len)) {
goto end; goto end;
} }
} else { } else {
if (!_iov_ctx_set_md_interleave_iov(&ctx, pdu->data, pdu->data_buf_len, if (!_iscsi_sgl_append_with_md(&sgl, pdu->data, pdu->data_buf_len,
data_len, &pdu->dif_ctx)) { data_len, &pdu->dif_ctx)) {
goto end; goto end;
} }
@ -724,15 +723,15 @@ spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int iovc
/* Data Digest */ /* Data Digest */
if (enable_digest && conn->data_digest && data_len != 0) { if (enable_digest && conn->data_digest && data_len != 0) {
_iov_ctx_set_iov(&ctx, pdu->data_digest, ISCSI_DIGEST_LEN); _iscsi_sgl_append(&sgl, pdu->data_digest, ISCSI_DIGEST_LEN);
} }
end: end:
if (_mapped_length != NULL) { if (_mapped_length != NULL) {
*_mapped_length = ctx.mapped_len; *_mapped_length = sgl.total_size;
} }
return iovcnt - ctx.iovcnt; return iovcnt - sgl.iovcnt;
} }
static int static int