Commit 74dd2485 authored by paul Luse's avatar paul Luse Committed by Tomasz Zawadzki
Browse files

Revert "idxd: Remove the batch_op field because it is not necessary." 



This reverts commit 585e808e.

Signed-off-by: default avatarpaul Luse <paul.e.luse@intel.com>
Change-Id: I578d248d490c27a5806c5a77fb241a15ba85a530
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8908


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
parent 789f8b85

lib/idxd/idxd.c

+7 −2
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ _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.
@@ -1093,10 +1095,13 @@ spdk_idxd_process_events(struct spdk_idxd_io_channel *chan) 
			}



			comp_ctx->hw.status = status = 0;

			if (comp_ctx->desc->opcode != IDXD_OPCODE_BATCH) {



			if (comp_ctx->batch_op == false) {

				assert(spdk_bit_array_get(chan->ring_slots, comp_ctx->index));

				spdk_bit_array_clear(chan->ring_slots, comp_ctx->index);

			} else {

			}



			if (comp_ctx->desc->opcode == IDXD_OPCODE_BATCH) {

				_free_batch(comp_ctx->batch, chan);

			}

		} else {

lib/idxd/idxd.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 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;

};