From 585e808e06158ff698f49c6ed5e67e19cb50cfa9 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Wed, 21 Jul 2021 23:20:29 +0800 Subject: [PATCH] idxd: Remove the batch_op field because it is not necessary. This batch_op field is not necessary because we can use the comp_ctx->desc->opcode to judge whether it is related a batched task or not. Change-Id: Id329221ccf272c4c3bb8c1b5ec08433029a9a1f8 Signed-off-by: Ziye Yang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8865 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto Community-CI: Mellanox Build Bot Community-CI: Broadcom CI --- lib/idxd/idxd.c | 9 ++------- lib/idxd/idxd.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/idxd/idxd.c b/lib/idxd/idxd.c index dc7811b785..4d4821bcb8 100644 --- a/lib/idxd/idxd.c +++ b/lib/idxd/idxd.c @@ -329,8 +329,6 @@ _track_comp(struct spdk_idxd_io_channel *chan, bool batch_op, uint32_t index, { comp_ctx->desc = desc; comp_ctx->index = index; - /* Tag this as a batched operation or not so we know which bit array index to clear. */ - comp_ctx->batch_op = batch_op; /* Only add non-batch completions here. Batch completions are added when the batch is * submitted. @@ -1095,13 +1093,10 @@ spdk_idxd_process_events(struct spdk_idxd_io_channel *chan) } comp_ctx->hw.status = status = 0; - - if (comp_ctx->batch_op == false) { + if (comp_ctx->desc->opcode != IDXD_OPCODE_BATCH) { assert(spdk_bit_array_get(chan->ring_slots, comp_ctx->index)); spdk_bit_array_clear(chan->ring_slots, comp_ctx->index); - } - - if (comp_ctx->desc->opcode == IDXD_OPCODE_BATCH) { + } else { _free_batch(comp_ctx->batch, chan); } } else { diff --git a/lib/idxd/idxd.h b/lib/idxd/idxd.h index 00f8b067b6..9c42ddcb07 100644 --- a/lib/idxd/idxd.h +++ b/lib/idxd/idxd.h @@ -160,7 +160,6 @@ struct idxd_comp { struct idxd_hw_desc *desc; uint32_t *crc_dst; uint32_t index; - bool batch_op; char pad[3]; TAILQ_ENTRY(idxd_comp) link; };