Acked-by: Abhinandan Gujjar <abhinandan.guj...@intel.com>
> -----Original Message-----
> From: pbhagavat...@marvell.com <pbhagavat...@marvell.com>
> Sent: Wednesday, October 6, 2021 12:20 PM
> To: jer...@marvell.com; Gujjar, Abhinandan S
> <abhinandan.guj...@intel.com>; Jayatheerthan, Jay
> <jay.jayatheert...@intel.com>
> Cc: dev@dpdk.org; Pavan Nikhilesh <pbhagavat...@marvell.com>
> Subject: [dpdk-dev] [PATCH v3 06/14] eventdev: use new API for inline
> functions
>
> From: Pavan Nikhilesh <pbhagavat...@marvell.com>
>
> Use new driver interface for the fastpath enqueue/dequeue inline
> functions.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
> Acked-by: Jay Jayatheerthan <jay.jayatheert...@intel.com>
> ---
> lib/eventdev/rte_event_crypto_adapter.h | 15 +++++---
> lib/eventdev/rte_event_eth_tx_adapter.h | 15 ++++----
> lib/eventdev/rte_eventdev.h | 46 +++++++++++++++----------
> 3 files changed, 47 insertions(+), 29 deletions(-)
>
> diff --git a/lib/eventdev/rte_event_crypto_adapter.h
> b/lib/eventdev/rte_event_crypto_adapter.h
> index 431d05b6ed..eb82818d05 100644
> --- a/lib/eventdev/rte_event_crypto_adapter.h
> +++ b/lib/eventdev/rte_event_crypto_adapter.h
> @@ -568,12 +568,19 @@ rte_event_crypto_adapter_enqueue(uint8_t
> dev_id,
> struct rte_event ev[],
> uint16_t nb_events)
> {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
> + void *port;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> + port = fp_ops->data[port_id];
> #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
> - RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
> + if (dev_id >= RTE_EVENT_MAX_DEVS ||
> + port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
> + rte_errno = EINVAL;
> + return 0;
> + }
>
> - if (port_id >= dev->data->nb_ports) {
> + if (port == NULL) {
> rte_errno = EINVAL;
> return 0;
> }
> @@ -581,7 +588,7 @@ rte_event_crypto_adapter_enqueue(uint8_t dev_id,
> rte_eventdev_trace_crypto_adapter_enqueue(dev_id, port_id, ev,
> nb_events);
>
> - return dev->ca_enqueue(dev->data->ports[port_id], ev,
> nb_events);
> + return fp_ops->ca_enqueue(port, ev, nb_events);
> }
>
> #ifdef __cplusplus
> diff --git a/lib/eventdev/rte_event_eth_tx_adapter.h
> b/lib/eventdev/rte_event_eth_tx_adapter.h
> index 8c59547165..3908c2ded5 100644
> --- a/lib/eventdev/rte_event_eth_tx_adapter.h
> +++ b/lib/eventdev/rte_event_eth_tx_adapter.h
> @@ -355,16 +355,19 @@ rte_event_eth_tx_adapter_enqueue(uint8_t
> dev_id,
> uint16_t nb_events,
> const uint8_t flags)
> {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
> + void *port;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> + port = fp_ops->data[port_id];
> #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
> if (dev_id >= RTE_EVENT_MAX_DEVS ||
> - !rte_eventdevs[dev_id].attached) {
> + port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
> rte_errno = EINVAL;
> return 0;
> }
>
> - if (port_id >= dev->data->nb_ports) {
> + if (port == NULL) {
> rte_errno = EINVAL;
> return 0;
> }
> @@ -372,11 +375,9 @@ rte_event_eth_tx_adapter_enqueue(uint8_t
> dev_id,
> rte_eventdev_trace_eth_tx_adapter_enqueue(dev_id, port_id, ev,
> nb_events, flags);
> if (flags)
> - return dev->txa_enqueue_same_dest(dev->data-
> >ports[port_id],
> - ev, nb_events);
> + return fp_ops->txa_enqueue_same_dest(port, ev,
> nb_events);
> else
> - return dev->txa_enqueue(dev->data->ports[port_id], ev,
> - nb_events);
> + return fp_ops->txa_enqueue(port, ev, nb_events);
> }
>
> /**
> diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
> index 1b11d4576d..31fa9ac4b8 100644
> --- a/lib/eventdev/rte_eventdev.h
> +++ b/lib/eventdev/rte_eventdev.h
> @@ -1747,15 +1747,19 @@ __rte_event_enqueue_burst(uint8_t dev_id,
> uint8_t port_id,
> const struct rte_event ev[], uint16_t nb_events,
> const event_enqueue_burst_t fn)
> {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
> + void *port;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> + port = fp_ops->data[port_id];
> #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
> - if (dev_id >= RTE_EVENT_MAX_DEVS ||
> !rte_eventdevs[dev_id].attached) {
> + if (dev_id >= RTE_EVENT_MAX_DEVS ||
> + port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
> rte_errno = EINVAL;
> return 0;
> }
>
> - if (port_id >= dev->data->nb_ports) {
> + if (port == NULL) {
> rte_errno = EINVAL;
> return 0;
> }
> @@ -1766,9 +1770,9 @@ __rte_event_enqueue_burst(uint8_t dev_id,
> uint8_t port_id,
> * requests nb_events as const one
> */
> if (nb_events == 1)
> - return (*dev->enqueue)(dev->data->ports[port_id], ev);
> + return (fp_ops->enqueue)(port, ev);
> else
> - return fn(dev->data->ports[port_id], ev, nb_events);
> + return fn(port, ev, nb_events);
> }
>
> /**
> @@ -1818,10 +1822,11 @@ static inline uint16_t
> rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
> const struct rte_event ev[], uint16_t nb_events) {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> return __rte_event_enqueue_burst(dev_id, port_id, ev, nb_events,
> - dev->enqueue_burst);
> + fp_ops->enqueue_burst);
> }
>
> /**
> @@ -1869,10 +1874,11 @@ static inline uint16_t
> rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
> const struct rte_event ev[], uint16_t nb_events) {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> return __rte_event_enqueue_burst(dev_id, port_id, ev, nb_events,
> - dev->enqueue_new_burst);
> + fp_ops->enqueue_new_burst);
> }
>
> /**
> @@ -1920,10 +1926,11 @@ static inline uint16_t
> rte_event_enqueue_forward_burst(uint8_t dev_id, uint8_t port_id,
> const struct rte_event ev[], uint16_t
> nb_events) {
> - const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> return __rte_event_enqueue_burst(dev_id, port_id, ev, nb_events,
> - dev->enqueue_forward_burst);
> + fp_ops->enqueue_forward_burst);
> }
>
> /**
> @@ -1996,15 +2003,19 @@ static inline uint16_t
> rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event
> ev[],
> uint16_t nb_events, uint64_t timeout_ticks) {
> - struct rte_eventdev *dev = &rte_eventdevs[dev_id];
> + const struct rte_event_fp_ops *fp_ops;
> + void *port;
>
> + fp_ops = &rte_event_fp_ops[dev_id];
> + port = fp_ops->data[port_id];
> #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
> - if (dev_id >= RTE_EVENT_MAX_DEVS ||
> !rte_eventdevs[dev_id].attached) {
> + if (dev_id >= RTE_EVENT_MAX_DEVS ||
> + port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
> rte_errno = EINVAL;
> return 0;
> }
>
> - if (port_id >= dev->data->nb_ports) {
> + if (port == NULL) {
> rte_errno = EINVAL;
> return 0;
> }
> @@ -2015,11 +2026,10 @@ rte_event_dequeue_burst(uint8_t dev_id,
> uint8_t port_id, struct rte_event ev[],
> * requests nb_events as const one
> */
> if (nb_events == 1)
> - return (*dev->dequeue)(dev->data->ports[port_id], ev,
> - timeout_ticks);
> + return (fp_ops->dequeue)(port, ev, timeout_ticks);
> else
> - return (*dev->dequeue_burst)(dev->data->ports[port_id],
> ev,
> - nb_events, timeout_ticks);
> + return (fp_ops->dequeue_burst)(port, ev, nb_events,
> + timeout_ticks);
> }
>
> #ifdef __cplusplus
> --
> 2.17.1
