Commit 0d99245c authored by paul luse's avatar paul luse Committed by Jim Harris
Browse files

bdev/compress: move poller function 



In prep for next patch where queueing a comp op requires
the poller to call a func that was previously below it.

Change-Id: I0ba8a00e958e0766f866a0cd49d7b288ea4cbe73
Signed-off-by: default avatarpaul luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453029


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 7b641c75

lib/bdev/compress/vbdev_compress.c

+42 −42
Original line number Diff line number Diff line
@@ -362,48 +362,6 @@ error_create_mbuf: 
	return rc;

}



/* Poller for the DPDK compression driver. */

static int

comp_dev_poller(void *args)

{

	struct vbdev_compress *comp_bdev = args;

	uint8_t cdev_id = comp_bdev->device_qp->device->cdev_id;

	struct rte_comp_op *deq_ops;

	uint16_t num_deq;

	struct spdk_reduce_vol_cb_args *reduce_args;



	num_deq = rte_compressdev_dequeue_burst(cdev_id, 0, &deq_ops, 1);



	if (num_deq > 0) {

		reduce_args = (struct spdk_reduce_vol_cb_args *)deq_ops->m_src->userdata;



		if (deq_ops->status != RTE_COMP_OP_STATUS_SUCCESS) {

			SPDK_ERRLOG("deque status %u\n", deq_ops->status);



			/* TODO update produced with translated -errno */

			/*

			 * RTE_COMP_OP_STATUS_SUCCESS = 0,

			 * RTE_COMP_OP_STATUS_NOT_PROCESSED,

			 * RTE_COMP_OP_STATUS_INVALID_ARGS,

			 * RTE_COMP_OP_STATUS_ERROR,

			 * RTE_COMP_OP_STATUS_INVALID_STATE,

			 * RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED,

			 * RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE,

			 */

		}

		reduce_args->cb_fn(reduce_args->cb_arg, deq_ops->produced);



		/* Now free both mbufs and the compress operation. The rte_pktmbuf_free()

		 * call takes care of freeing all of the mbufs in the chain back to their

		 * original pool.

		 */

		rte_pktmbuf_free(deq_ops->m_src);

		rte_pktmbuf_free(deq_ops->m_dst);

		rte_comp_op_free(deq_ops);

	}

	return 0;

}



/* Completion callback for r/w that were issued via reducelib. */

static void

spdk_reduce_rw_blocks_cb(void *arg, int reduce_errno)
@@ -530,6 +488,48 @@ error_get_src: 
	return rc;

}



/* Poller for the DPDK compression driver. */

static int

comp_dev_poller(void *args)

{

	struct vbdev_compress *comp_bdev = args;

	uint8_t cdev_id = comp_bdev->device_qp->device->cdev_id;

	struct rte_comp_op *deq_ops;

	uint16_t num_deq;

	struct spdk_reduce_vol_cb_args *reduce_args;



	num_deq = rte_compressdev_dequeue_burst(cdev_id, 0, &deq_ops, 1);



	if (num_deq > 0) {

		reduce_args = (struct spdk_reduce_vol_cb_args *)deq_ops->m_src->userdata;



		if (deq_ops->status != RTE_COMP_OP_STATUS_SUCCESS) {

			SPDK_ERRLOG("deque status %u\n", deq_ops->status);



			/* TODO update produced with translated -errno */

			/*

			 * RTE_COMP_OP_STATUS_SUCCESS = 0,

			 * RTE_COMP_OP_STATUS_NOT_PROCESSED,

			 * RTE_COMP_OP_STATUS_INVALID_ARGS,

			 * RTE_COMP_OP_STATUS_ERROR,

			 * RTE_COMP_OP_STATUS_INVALID_STATE,

			 * RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED,

			 * RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE,

			 */

		}

		reduce_args->cb_fn(reduce_args->cb_arg, deq_ops->produced);



		/* Now free both mbufs and the compress operation. The rte_pktmbuf_free()

		 * call takes care of freeing all of the mbufs in the chain back to their

		 * original pool.

		 */

		rte_pktmbuf_free(deq_ops->m_src);

		rte_pktmbuf_free(deq_ops->m_dst);

		rte_comp_op_free(deq_ops);

	}

	return 0;

}



/* Entry point for reduce lib to issue a compress operation. */

static void

_comp_reduce_compress(struct spdk_reduce_backing_dev *dev,