Commit b7e793eb authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

idxd: Move the batch functions up in the file 



These will be used internally by some of the other code paths.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: Idc3c024cf1bf3d468f87176373ef97bf064ced8f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11033


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 avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 4b426c97

lib/idxd/idxd.c

+99 −101
Original line number Diff line number Diff line
@@ -464,6 +464,105 @@ _idxd_batch_prep_nop(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch 
	return 0;

}



struct idxd_batch *

spdk_idxd_batch_create(struct spdk_idxd_io_channel *chan)

{

	struct idxd_batch *batch;



	assert(chan != NULL);



	if (!TAILQ_EMPTY(&chan->batch_pool)) {

		batch = TAILQ_FIRST(&chan->batch_pool);

		batch->index = 0;

		batch->chan = chan;

		TAILQ_REMOVE(&chan->batch_pool, batch, link);

	} else {

		/* The application needs to handle this. */

		return NULL;

	}



	return batch;

}



static void

_free_batch(struct idxd_batch *batch, struct spdk_idxd_io_channel *chan)

{

	SPDK_DEBUGLOG(idxd, "Free batch %p\n", batch);

	batch->index = 0;

	batch->chan = NULL;

	TAILQ_INSERT_TAIL(&chan->batch_pool, batch, link);

}



int

spdk_idxd_batch_cancel(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch)

{

	assert(chan != NULL);

	assert(batch != NULL);



	if (_is_batch_valid(batch, chan) == false) {

		SPDK_ERRLOG("Attempt to cancel an invalid batch.\n");

		return -EINVAL;

	}



	if (batch->index > 0) {

		SPDK_ERRLOG("Cannot cancel batch, already submitted to HW.\n");

		return -EINVAL;

	}



	_free_batch(batch, chan);



	return 0;

}



int

spdk_idxd_batch_submit(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch,

		       spdk_idxd_req_cb cb_fn, void *cb_arg)

{

	struct idxd_hw_desc *desc;

	struct idxd_ops *op;

	int i, rc;



	assert(chan != NULL);

	assert(batch != NULL);



	if (_is_batch_valid(batch, chan) == false) {

		SPDK_ERRLOG("Attempt to submit an invalid batch.\n");

		return -EINVAL;

	}



	if (batch->index < MIN_USER_DESC_COUNT) {

		/* DSA needs at least MIN_USER_DESC_COUNT for a batch, add a NOP to make it so. */

		if (_idxd_batch_prep_nop(chan, batch)) {

			return -EINVAL;

		}

	}



	/* Common prep. */

	rc = _idxd_prep_command(chan, cb_fn, cb_arg, &desc, &op);

	if (rc) {

		return rc;

	}



	/* Command specific. */

	desc->opcode = IDXD_OPCODE_BATCH;

	desc->desc_list_addr = batch->user_desc_addr;

	desc->desc_count = batch->index;

	op->batch = batch;

	assert(batch->index <= DESC_PER_BATCH);



	/* Add the batch elements completion contexts to the outstanding list to be polled. */

	for (i = 0 ; i < batch->index; i++) {

		TAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i],

				  link);

	}



	/* Submit operation. */

	_submit_to_hw(chan, op);

	SPDK_DEBUGLOG(idxd, "Submitted batch %p\n", batch);



	return 0;

}



static inline int

_idxd_submit_copy_single(struct spdk_idxd_io_channel *chan, void *dst, const void *src,

			 uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg)
@@ -1059,107 +1158,6 @@ spdk_idxd_batch_get_max(void) 
	return DESC_PER_BATCH;

}



struct idxd_batch *

spdk_idxd_batch_create(struct spdk_idxd_io_channel *chan)

{

	struct idxd_batch *batch;



	assert(chan != NULL);



	if (!TAILQ_EMPTY(&chan->batch_pool)) {

		batch = TAILQ_FIRST(&chan->batch_pool);

		batch->index = 0;

		batch->chan = chan;

		TAILQ_REMOVE(&chan->batch_pool, batch, link);

	} else {

		/* The application needs to handle this. */

		return NULL;

	}



	return batch;

}



static void

_free_batch(struct idxd_batch *batch, struct spdk_idxd_io_channel *chan)

{

	SPDK_DEBUGLOG(idxd, "Free batch %p\n", batch);

	batch->index = 0;

	batch->chan = NULL;

	TAILQ_INSERT_TAIL(&chan->batch_pool, batch, link);

}



int

spdk_idxd_batch_cancel(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch)

{

	assert(chan != NULL);

	assert(batch != NULL);



	if (_is_batch_valid(batch, chan) == false) {

		SPDK_ERRLOG("Attempt to cancel an invalid batch.\n");

		return -EINVAL;

	}



	if (batch->index > 0) {

		SPDK_ERRLOG("Cannot cancel batch, already submitted to HW.\n");

		return -EINVAL;

	}



	_free_batch(batch, chan);



	return 0;

}



static int _idxd_batch_prep_nop(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch);



int

spdk_idxd_batch_submit(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch,

		       spdk_idxd_req_cb cb_fn, void *cb_arg)

{

	struct idxd_hw_desc *desc;

	struct idxd_ops *op;

	int i, rc;



	assert(chan != NULL);

	assert(batch != NULL);



	if (_is_batch_valid(batch, chan) == false) {

		SPDK_ERRLOG("Attempt to submit an invalid batch.\n");

		return -EINVAL;

	}



	if (batch->index < MIN_USER_DESC_COUNT) {

		/* DSA needs at least MIN_USER_DESC_COUNT for a batch, add a NOP to make it so. */

		if (_idxd_batch_prep_nop(chan, batch)) {

			return -EINVAL;

		}

	}



	/* Common prep. */

	rc = _idxd_prep_command(chan, cb_fn, cb_arg, &desc, &op);

	if (rc) {

		return rc;

	}



	/* Command specific. */

	desc->opcode = IDXD_OPCODE_BATCH;

	desc->desc_list_addr = batch->user_desc_addr;

	desc->desc_count = batch->index;

	op->batch = batch;

	assert(batch->index <= DESC_PER_BATCH);



	/* Add the batch elements completion contexts to the outstanding list to be polled. */

	for (i = 0 ; i < batch->index; i++) {

		TAILQ_INSERT_TAIL(&chan->ops_outstanding, (struct idxd_ops *)&batch->user_ops[i],

				  link);

	}



	/* Submit operation. */

	_submit_to_hw(chan, op);

	SPDK_DEBUGLOG(idxd, "Submitted batch %p\n", batch);



	return 0;

}



int

spdk_idxd_batch_prep_copy(struct spdk_idxd_io_channel *chan, struct idxd_batch *batch,

			  void *dst, const void *src, uint64_t nbytes, spdk_idxd_req_cb cb_fn, void *cb_arg)