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

lib/iscsi: Unify array size and used count in SGL operation

Browse Source 
This patch adopts the good practice in DIF library, and unifies
array size and used count into unused count.

Change-Id: Ifde15d1fa66dbd2578da771b5500e45a84664f63
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455475
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-05-21 16:15:31 +09:00 committed by Jim Harris
parent 92cafd1586
commit 5ef1a15c6f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/iscsi/iscsi.c
View File

@ -590,20 +590,18 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
struct _iov_ctx { struct _iov_ctx {
struct iovec *iov; struct iovec *iov;
int num_iovs;
uint32_t iov_offset;
int iovcnt; int iovcnt;
uint32_t iov_offset;
uint32_t mapped_len; uint32_t mapped_len;
}; };
static inline void static inline void
_iov_ctx_init(struct _iov_ctx *ctx, struct iovec *iovs, int num_iovs, _iov_ctx_init(struct _iov_ctx *ctx, struct iovec *iovs, int iovcnt,
uint32_t iov_offset) uint32_t iov_offset)
{ {
ctx->iov = iovs; ctx->iov = iovs;
ctx->num_iovs = num_iovs; ctx->iovcnt = iovcnt;
ctx->iov_offset = iov_offset; ctx->iov_offset = iov_offset;
ctx->iovcnt = 0;
ctx->mapped_len = 0; ctx->mapped_len = 0;
} }
@ -613,13 +611,14 @@ _iov_ctx_set_iov(struct _iov_ctx *ctx, uint8_t *data, uint32_t data_len)
if (ctx->iov_offset >= data_len) { if (ctx->iov_offset >= data_len) {
ctx->iov_offset -= data_len; ctx->iov_offset -= data_len;
} else { } else {
assert(ctx->iovcnt > 0);
ctx->iov->iov_base = data + ctx->iov_offset; ctx->iov->iov_base = data + ctx->iov_offset;
ctx->iov->iov_len = data_len - ctx->iov_offset; ctx->iov->iov_len = data_len - ctx->iov_offset;
ctx->mapped_len += data_len - ctx->iov_offset; ctx->mapped_len += data_len - ctx->iov_offset;
ctx->iov_offset = 0; ctx->iov_offset = 0;
ctx->iov++; ctx->iov++;
ctx->iovcnt++; ctx->iovcnt--;
if (ctx->iovcnt == ctx->num_iovs) { if (ctx->iovcnt == 0) {
return false; return false;
} }
} }
@ -644,7 +643,7 @@ _iov_ctx_set_md_interleave_iov(struct _iov_ctx *ctx,
} 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->num_iovs - ctx->iovcnt, rc = spdk_dif_set_md_interleave_iovs(ctx->iov, ctx->iovcnt,
&buf_iov, 1, &buf_iov, 1,
ctx->iov_offset, data_len, &mapped_len, ctx->iov_offset, data_len, &mapped_len,
dif_ctx); dif_ctx);
@ -655,9 +654,10 @@ _iov_ctx_set_md_interleave_iov(struct _iov_ctx *ctx,
ctx->mapped_len += mapped_len; ctx->mapped_len += mapped_len;
ctx->iov_offset = 0; ctx->iov_offset = 0;
ctx->iovcnt += rc; assert(ctx->iovcnt >= rc);
ctx->iovcnt -= rc;
if (ctx->iovcnt == ctx->num_iovs) { if (ctx->iovcnt == 0) {
return false; return false;
} }
} }
@ -666,7 +666,7 @@ _iov_ctx_set_md_interleave_iov(struct _iov_ctx *ctx,
} }
int int
spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int num_iovs, 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 _iov_ctx ctx;
@ -674,7 +674,7 @@ spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int num_
uint32_t total_ahs_len; uint32_t total_ahs_len;
uint32_t data_len; uint32_t data_len;
if (num_iovs == 0) { if (iovcnt == 0) {
return 0; return 0;
} }
@ -688,7 +688,7 @@ spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int num_
enable_digest = 0; enable_digest = 0;
} }
_iov_ctx_init(&ctx, iovs, num_iovs, pdu->writev_offset); _iov_ctx_init(&ctx, iovs, iovcnt, pdu->writev_offset);
/* BHS */ /* BHS */
if (!_iov_ctx_set_iov(&ctx, (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN)) { if (!_iov_ctx_set_iov(&ctx, (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN)) {
@ -732,7 +732,7 @@ end:
*_mapped_length = ctx.mapped_len; *_mapped_length = ctx.mapped_len;
} }
return ctx.iovcnt; return iovcnt - ctx.iovcnt;
} }
static int static int

2
lib/iscsi/iscsi.h
View File

@ -407,7 +407,7 @@ void spdk_iscsi_send_nopin(struct spdk_iscsi_conn *conn);
void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn, void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn,
struct spdk_iscsi_task *task); struct spdk_iscsi_task *task);
int spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu); int spdk_iscsi_execute(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu);
int spdk_iscsi_build_iovs(struct spdk_iscsi_conn *conn, struct iovec *iovs, int num_iovs, int 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);
int spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu); int spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu);
bool spdk_iscsi_get_dif_ctx(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu, bool spdk_iscsi_get_dif_ctx(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu,