RE: [PATCH RFC 2/4] eventdev: refactor rte_event_dma_adapater_op calls

[Amit Prakash Shukla <amitprakashs@marvell.com>]

> -----Original Message-----
> From: Kommula Shiva Shankar <kshankar@marvell.com>
> Sent: Wednesday, January 29, 2025 8:07 PM
> To: Jerin Jacob <jerinj@marvell.com>; Amit Prakash Shukla
> <amitprakashs@marvell.com>; Vamsi Krishna Attunuru
> <vattunuru@marvell.com>; fengchengwen@huawei.com; dev@dpdk.org
> Cc: Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>; Pavan Nikhilesh
> Bhagavatula <pbhagavatula@marvell.com>
> Subject: [PATCH RFC 2/4] eventdev: refactor rte_event_dma_adapater_op
> calls
> 
> From: Pavan Nikhilesh <pbhagavatula@marvell.com>
> 
> Migrate all invocations of rte_event_dma_adapter_op API to rte_dma_op.
> 
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
> Change-Id: I56b6e61af72d119287b0d2ba6a9bbacc3ae808d6
> ---
>  app/test-eventdev/test_perf_common.c |  6 +--  app/test-
> eventdev/test_perf_common.h |  4 +-
>  app/test/test_event_dma_adapter.c    |  6 +--
>  drivers/dma/cnxk/cnxk_dmadev.c       |  2 +-
>  drivers/dma/cnxk/cnxk_dmadev_fp.c    | 12 +++---
>  lib/eventdev/rte_event_dma_adapter.c | 18 ++++-----
> lib/eventdev/rte_event_dma_adapter.h | 57 ----------------------------
>  7 files changed, 24 insertions(+), 81 deletions(-)
> 

Acked-by: Amit Prakash Shukla <amitprakashs@marvell.com>

Thanks,
Amit Shukla

> diff --git a/app/test-eventdev/test_perf_common.c b/app/test-
> eventdev/test_perf_common.c
> index 627f07caa1..4e0109db52 100644
> --- a/app/test-eventdev/test_perf_common.c
> +++ b/app/test-eventdev/test_perf_common.c
> @@ -562,11 +562,11 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)
> static inline void  dma_adapter_enq_op_fwd(struct prod_data *p)  {
> -	struct rte_event_dma_adapter_op *ops[BURST_SIZE] = {NULL};
> +	struct rte_dma_op *ops[BURST_SIZE] = {NULL};
>  	struct test_perf *t = p->t;
>  	const uint32_t nb_flows = t->nb_flows;
>  	const uint64_t nb_pkts = t->nb_pkts;
> -	struct rte_event_dma_adapter_op op;
> +	struct rte_dma_op op;
>  	struct rte_event evts[BURST_SIZE];
>  	const uint8_t dev_id = p->dev_id;
>  	struct evt_options *opt = t->opt;
> @@ -2114,7 +2114,7 @@ perf_mempool_setup(struct evt_test *test, struct
> evt_options *opt)
>  	} else if (opt->prod_type == EVT_PROD_TYPE_EVENT_DMA_ADPTR) {
>  		t->pool = rte_mempool_create(test->name,   /* mempool
> name */
>  					     opt->pool_sz, /* number of
> elements*/
> -					     sizeof(struct
> rte_event_dma_adapter_op) +
> +					     sizeof(struct rte_dma_op) +
>  						     (sizeof(struct rte_dma_sge)
> * 2),
>  					     cache_sz,		       /* cache
> size*/
>  					     0, NULL, NULL, NULL,      /* obj
> constructor */
> diff --git a/app/test-eventdev/test_perf_common.h b/app/test-
> eventdev/test_perf_common.h
> index d7333ad390..63078b0ee2 100644
> --- a/app/test-eventdev/test_perf_common.h
> +++ b/app/test-eventdev/test_perf_common.h
> @@ -139,7 +139,7 @@ perf_mark_fwd_latency(enum evt_prod_type
> prod_type, struct rte_event *const ev)
>  		}
>  		pe->timestamp = rte_get_timer_cycles();
>  	} else if (prod_type == EVT_PROD_TYPE_EVENT_DMA_ADPTR) {
> -		struct rte_event_dma_adapter_op *op = ev->event_ptr;
> +		struct rte_dma_op *op = ev->event_ptr;
> 
>  		op->user_meta = rte_get_timer_cycles();
>  	} else {
> @@ -297,7 +297,7 @@ perf_process_last_stage_latency(struct rte_mempool
> *const pool, enum evt_prod_ty
>  		tstamp = pe->timestamp;
>  		rte_crypto_op_free(op);
>  	} else if (prod_type == EVT_PROD_TYPE_EVENT_DMA_ADPTR) {
> -		struct rte_event_dma_adapter_op *op = ev->event_ptr;
> +		struct rte_dma_op *op = ev->event_ptr;
> 
>  		to_free_in_bulk = op;
>  		tstamp = op->user_meta;
> diff --git a/app/test/test_event_dma_adapter.c
> b/app/test/test_event_dma_adapter.c
> index 9988d4fc7b..7f72a4e81d 100644
> --- a/app/test/test_event_dma_adapter.c
> +++ b/app/test/test_event_dma_adapter.c
> @@ -234,7 +234,7 @@ test_op_forward_mode(void)  {
>  	struct rte_mbuf *src_mbuf[TEST_MAX_OP];
>  	struct rte_mbuf *dst_mbuf[TEST_MAX_OP];
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	struct rte_event ev[TEST_MAX_OP];
>  	int ret, i;
> 
> @@ -266,7 +266,7 @@ test_op_forward_mode(void)
>  		op->vchan = TEST_DMA_VCHAN_ID;
>  		op->event_meta = dma_response_info.event;
> 
> -		/* Fill in event info and update event_ptr with
> rte_event_dma_adapter_op */
> +		/* Fill in event info and update event_ptr with rte_dma_op */
>  		memset(&ev[i], 0, sizeof(struct rte_event));
>  		ev[i].event = 0;
>  		ev[i].op = RTE_EVENT_OP_NEW;
> @@ -396,7 +396,7 @@ configure_dmadev(void)
>  						       rte_socket_id());
>  	RTE_TEST_ASSERT_NOT_NULL(params.dst_mbuf_pool, "Can't create
> DMA_DST_MBUFPOOL\n");
> 
> -	elt_size = sizeof(struct rte_event_dma_adapter_op) + (sizeof(struct
> rte_dma_sge) * 2);
> +	elt_size = sizeof(struct rte_dma_op) + (sizeof(struct rte_dma_sge) *
> +2);
>  	params.op_mpool = rte_mempool_create("EVENT_DMA_OP_POOL",
> DMA_OP_POOL_SIZE, elt_size, 0,
>  					     0, NULL, NULL, NULL, NULL,
> rte_socket_id(), 0);
>  	RTE_TEST_ASSERT_NOT_NULL(params.op_mpool, "Can't create
> DMA_OP_POOL\n"); diff --git a/drivers/dma/cnxk/cnxk_dmadev.c
> b/drivers/dma/cnxk/cnxk_dmadev.c index e7be3767b2..60b3d28d65 100644
> --- a/drivers/dma/cnxk/cnxk_dmadev.c
> +++ b/drivers/dma/cnxk/cnxk_dmadev.c
> @@ -591,7 +591,7 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv
> __rte_unused, struct rte_pci_de
>  	rdpi = &dpivf->rdpi;
> 
>  	rdpi->pci_dev = pci_dev;
> -	rc = roc_dpi_dev_init(rdpi, offsetof(struct
> rte_event_dma_adapter_op, impl_opaque));
> +	rc = roc_dpi_dev_init(rdpi, offsetof(struct rte_dma_op,
> impl_opaque));
>  	if (rc < 0)
>  		goto err_out_free;
> 
> diff --git a/drivers/dma/cnxk/cnxk_dmadev_fp.c
> b/drivers/dma/cnxk/cnxk_dmadev_fp.c
> index 26591235c6..340c7601d7 100644
> --- a/drivers/dma/cnxk/cnxk_dmadev_fp.c
> +++ b/drivers/dma/cnxk/cnxk_dmadev_fp.c
> @@ -453,7 +453,7 @@ uint16_t
>  cn10k_dma_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t
> nb_events)  {
>  	const struct rte_dma_sge *src, *dst;
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	struct cnxk_dpi_conf *dpi_conf;
>  	struct cnxk_dpi_vf_s *dpivf;
>  	struct cn10k_sso_hws *work;
> @@ -514,7 +514,7 @@ uint16_t
>  cn9k_dma_adapter_dual_enqueue(void *ws, struct rte_event ev[], uint16_t
> nb_events)  {
>  	const struct rte_dma_sge *fptr, *lptr;
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	struct cn9k_sso_hws_dual *work;
>  	struct cnxk_dpi_conf *dpi_conf;
>  	struct cnxk_dpi_vf_s *dpivf;
> @@ -530,7 +530,7 @@ cn9k_dma_adapter_dual_enqueue(void *ws, struct
> rte_event ev[], uint16_t nb_event
>  	for (count = 0; count < nb_events; count++) {
>  		op = ev[count].event_ptr;
>  		rsp_info = (struct rte_event *)((uint8_t *)op +
> -						sizeof(struct
> rte_event_dma_adapter_op));
> +						sizeof(struct rte_dma_op));
>  		dpivf = rte_dma_fp_objs[op->dma_dev_id].dev_private;
>  		dpi_conf = &dpivf->conf[op->vchan];
> 
> @@ -586,7 +586,7 @@ uint16_t
>  cn9k_dma_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t
> nb_events)  {
>  	const struct rte_dma_sge *fptr, *lptr;
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	struct cnxk_dpi_conf *dpi_conf;
>  	struct cnxk_dpi_vf_s *dpivf;
>  	struct cn9k_sso_hws *work;
> @@ -654,11 +654,11 @@ cn9k_dma_adapter_enqueue(void *ws, struct
> rte_event ev[], uint16_t nb_events)  uintptr_t
> cnxk_dma_adapter_dequeue(uintptr_t get_work1)  {
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	struct cnxk_dpi_conf *dpi_conf;
>  	struct cnxk_dpi_vf_s *dpivf;
> 
> -	op = (struct rte_event_dma_adapter_op *)get_work1;
> +	op = (struct rte_dma_op *)get_work1;
>  	dpivf = rte_dma_fp_objs[op->dma_dev_id].dev_private;
>  	dpi_conf = &dpivf->conf[op->vchan];
> 
> diff --git a/lib/eventdev/rte_event_dma_adapter.c
> b/lib/eventdev/rte_event_dma_adapter.c
> index ff2bc408c1..7baa46e0a3 100644
> --- a/lib/eventdev/rte_event_dma_adapter.c
> +++ b/lib/eventdev/rte_event_dma_adapter.c
> @@ -39,8 +39,8 @@ struct __rte_cache_aligned dma_ops_circular_buffer {
>  	/* Size of circular buffer */
>  	uint16_t size;
> 
> -	/* Pointer to hold rte_event_dma_adapter_op for processing */
> -	struct rte_event_dma_adapter_op **op_buffer;
> +	/* Pointer to hold rte_dma_op for processing */
> +	struct rte_dma_op **op_buffer;
>  };
> 
>  /* Vchan information */
> @@ -201,7 +201,7 @@ edma_circular_buffer_space_for_batch(struct
> dma_ops_circular_buffer *bufp)  static inline int
> edma_circular_buffer_init(const char *name, struct dma_ops_circular_buffer
> *buf, uint16_t sz)  {
> -	buf->op_buffer = rte_zmalloc(name, sizeof(struct
> rte_event_dma_adapter_op *) * sz, 0);
> +	buf->op_buffer = rte_zmalloc(name, sizeof(struct rte_dma_op *) * sz,
> +0);
>  	if (buf->op_buffer == NULL)
>  		return -ENOMEM;
> 
> @@ -217,7 +217,7 @@ edma_circular_buffer_free(struct
> dma_ops_circular_buffer *buf)  }
> 
>  static inline int
> -edma_circular_buffer_add(struct dma_ops_circular_buffer *bufp, struct
> rte_event_dma_adapter_op *op)
> +edma_circular_buffer_add(struct dma_ops_circular_buffer *bufp, struct
> +rte_dma_op *op)
>  {
>  	uint16_t *tail = &bufp->tail;
> 
> @@ -235,7 +235,7 @@ edma_circular_buffer_flush_to_dma_dev(struct
> event_dma_adapter *adapter,
>  				      struct dma_ops_circular_buffer *bufp,
> uint8_t dma_dev_id,
>  				      uint16_t vchan, uint16_t
> *nb_ops_flushed)  {
> -	struct rte_event_dma_adapter_op *op;
> +	struct rte_dma_op *op;
>  	uint16_t *head = &bufp->head;
>  	uint16_t *tail = &bufp->tail;
>  	struct dma_vchan_info *tq;
> @@ -498,7 +498,7 @@ edma_enq_to_dma_dev(struct event_dma_adapter
> *adapter, struct rte_event *ev, uns  {
>  	struct rte_event_dma_adapter_stats *stats = &adapter->dma_stats;
>  	struct dma_vchan_info *vchan_qinfo = NULL;
> -	struct rte_event_dma_adapter_op *dma_op;
> +	struct rte_dma_op *dma_op;
>  	uint16_t vchan, nb_enqueued = 0;
>  	int16_t dma_dev_id;
>  	unsigned int i, n;
> @@ -641,7 +641,7 @@ edma_adapter_enq_run(struct event_dma_adapter
> *adapter, unsigned int max_enq)  #define
> DMA_ADAPTER_MAX_EV_ENQ_RETRIES 100
> 
>  static inline uint16_t
> -edma_ops_enqueue_burst(struct event_dma_adapter *adapter, struct
> rte_event_dma_adapter_op **ops,
> +edma_ops_enqueue_burst(struct event_dma_adapter *adapter, struct
> +rte_dma_op **ops,
>  		       uint16_t num)
>  {
>  	struct rte_event_dma_adapter_stats *stats = &adapter->dma_stats;
> @@ -687,7 +687,7 @@ edma_circular_buffer_flush_to_evdev(struct
> event_dma_adapter *adapter,
>  				    struct dma_ops_circular_buffer *bufp,
>  				    uint16_t *enqueue_count)
>  {
> -	struct rte_event_dma_adapter_op **ops = bufp->op_buffer;
> +	struct rte_dma_op **ops = bufp->op_buffer;
>  	uint16_t n = 0, nb_ops_flushed;
>  	uint16_t *head = &bufp->head;
>  	uint16_t *tail = &bufp->tail;
> @@ -736,7 +736,7 @@ edma_adapter_deq_run(struct event_dma_adapter
> *adapter, unsigned int max_deq)
>  	struct rte_event_dma_adapter_stats *stats = &adapter->dma_stats;
>  	struct dma_vchan_info *vchan_info;
>  	struct dma_ops_circular_buffer *tq_buf;
> -	struct rte_event_dma_adapter_op *ops;
> +	struct rte_dma_op *ops;
>  	uint16_t n, nb_deq, nb_enqueued, i;
>  	struct dma_device_info *dev_info;
>  	uint16_t vchan, num_vchan;
> diff --git a/lib/eventdev/rte_event_dma_adapter.h
> b/lib/eventdev/rte_event_dma_adapter.h
> index 5c480b82ff..453754d13b 100644
> --- a/lib/eventdev/rte_event_dma_adapter.h
> +++ b/lib/eventdev/rte_event_dma_adapter.h
> @@ -151,63 +151,6 @@
>  extern "C" {
>  #endif
> 
> -/**
> - * A structure used to hold event based DMA operation entry. All the
> information
> - * required for a DMA transfer shall be populated in "struct
> rte_event_dma_adapter_op"
> - * instance.
> - */
> -struct rte_event_dma_adapter_op {
> -	uint64_t flags;
> -	/**< Flags related to the operation.
> -	 * @see RTE_DMA_OP_FLAG_*
> -	 */
> -	struct rte_mempool *op_mp;
> -	/**< Mempool from which op is allocated. */
> -	enum rte_dma_status_code status;
> -	/**< Status code for this operation. */
> -	uint32_t rsvd;
> -	/**< Reserved for future use. */
> -	uint64_t impl_opaque[2];
> -	/**< Implementation-specific opaque data.
> -	 * An dma device implementation use this field to hold
> -	 * implementation specific values to share between dequeue and
> enqueue
> -	 * operations.
> -	 * The application should not modify this field.
> -	 */
> -	uint64_t user_meta;
> -	/**<  Memory to store user specific metadata.
> -	 * The dma device implementation should not modify this area.
> -	 */
> -	uint64_t event_meta;
> -	/**< Event metadata of DMA completion event.
> -	 * Used when
> RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_VCHAN_EV_BIND is not
> -	 * supported in OP_NEW mode.
> -	 * @see
> rte_event_dma_adapter_mode::RTE_EVENT_DMA_ADAPTER_OP_NEW
> -	 * @see
> RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_VCHAN_EV_BIND
> -	 *
> -	 * Used when
> RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD is not
> -	 * supported in OP_FWD mode.
> -	 * @see
> rte_event_dma_adapter_mode::RTE_EVENT_DMA_ADAPTER_OP_FORWARD
> -	 * @see RTE_EVENT_DMA_ADAPTER_CAP_INTERNAL_PORT_OP_FWD
> -	 *
> -	 * @see struct rte_event::event
> -	 */
> -	int16_t dma_dev_id;
> -	/**< DMA device ID to be used with OP_FORWARD mode.
> -	 * @see
> rte_event_dma_adapter_mode::RTE_EVENT_DMA_ADAPTER_OP_FORWARD
> -	 */
> -	uint16_t vchan;
> -	/**< DMA vchan ID to be used with OP_FORWARD mode
> -	 * @see
> rte_event_dma_adapter_mode::RTE_EVENT_DMA_ADAPTER_OP_FORWARD
> -	 */
> -	uint16_t nb_src;
> -	/**< Number of source segments. */
> -	uint16_t nb_dst;
> -	/**< Number of destination segments. */
> -	struct rte_dma_sge src_dst_seg[];
> -	/**< Source and destination segments. */
> -};
> -
>  /**
>   *  DMA event adapter mode
>   */
> --
> 2.43.0