examples/l3fwd: add event eth Rx/Tx adapter setup

Add event eth Rx/Tx adapter setup for both generic and internal port
event device pipelines.

Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index b58f9b7..0a75e39 100644 (file)
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -233,4 +233,7 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
 
        /* Event port configuration */
        evt_rsrc->ops.event_port_setup();
+
+       /* Rx/Tx adapters configuration */
+       evt_rsrc->ops.adapter_setup();
 }

diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index 4bceca9..b1ae970 100644 (file)
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -7,6 +7,7 @@
 
 #include <rte_common.h>
 #include <rte_eventdev.h>
+#include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
 #include <rte_service.h>
 #include <rte_spinlock.h>

diff --git a/examples/l3fwd/l3fwd_event_generic.c b/examples/l3fwd/l3fwd_event_generic.c
index 4d0cbec..c69c611 100644 (file)
--- a/examples/l3fwd/l3fwd_event_generic.c
+++ b/examples/l3fwd/l3fwd_event_generic.c
@@ -182,10 +182,122 @@ l3fwd_event_queue_setup_generic(uint32_t event_queue_cfg)
        evt_rsrc->evq.event_q_id[event_q_id] = event_q_id;
 }
 
+static void
+l3fwd_rx_tx_adapter_setup_generic(void)
+{
+       struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+       struct rte_event_eth_rx_adapter_queue_conf eth_q_conf;
+       uint8_t event_d_id = evt_rsrc->event_d_id;
+       uint8_t rx_adptr_id = 0;
+       uint8_t tx_adptr_id = 0;
+       uint8_t tx_port_id = 0;
+       uint16_t port_id;
+       uint32_t service_id;
+       int32_t ret, i = 0;
+
+       memset(&eth_q_conf, 0, sizeof(eth_q_conf));
+       eth_q_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+
+       /* Rx adapter setup */
+       evt_rsrc->rx_adptr.nb_rx_adptr = 1;
+       evt_rsrc->rx_adptr.rx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+                                       evt_rsrc->rx_adptr.nb_rx_adptr);
+       if (!evt_rsrc->rx_adptr.rx_adptr) {
+               free(evt_rsrc->evp.event_p_id);
+               free(evt_rsrc->evq.event_q_id);
+               rte_panic("Failed to allocate memory for Rx adapter\n");
+       }
+
+       ret = rte_event_eth_rx_adapter_create(rx_adptr_id, event_d_id,
+                                             &evt_rsrc->def_p_conf);
+       if (ret)
+               rte_panic("Failed to create rx adapter\n");
+
+       /* Configure user requested sched type */
+       eth_q_conf.ev.sched_type = evt_rsrc->sched_type;
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+                       continue;
+               eth_q_conf.ev.queue_id = evt_rsrc->evq.event_q_id[i];
+               ret = rte_event_eth_rx_adapter_queue_add(rx_adptr_id, port_id,
+                                                        -1, &eth_q_conf);
+               if (ret)
+                       rte_panic("Failed to add queues to Rx adapter\n");
+               if (i < evt_rsrc->evq.nb_queues)
+                       i++;
+       }
+
+       ret = rte_event_eth_rx_adapter_service_id_get(rx_adptr_id, &service_id);
+       if (ret != -ESRCH && ret != 0)
+               rte_panic("Error getting the service ID for rx adptr\n");
+
+       rte_service_runstate_set(service_id, 1);
+       rte_service_set_runstate_mapped_check(service_id, 0);
+       evt_rsrc->rx_adptr.service_id = service_id;
+
+       ret = rte_event_eth_rx_adapter_start(rx_adptr_id);
+       if (ret)
+               rte_panic("Rx adapter[%d] start Failed\n", rx_adptr_id);
+
+       evt_rsrc->rx_adptr.rx_adptr[0] = rx_adptr_id;
+
+       /* Tx adapter setup */
+       evt_rsrc->tx_adptr.nb_tx_adptr = 1;
+       evt_rsrc->tx_adptr.tx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+                                       evt_rsrc->tx_adptr.nb_tx_adptr);
+       if (!evt_rsrc->tx_adptr.tx_adptr) {
+               free(evt_rsrc->rx_adptr.rx_adptr);
+               free(evt_rsrc->evp.event_p_id);
+               free(evt_rsrc->evq.event_q_id);
+               rte_panic("Failed to allocate memory for Rx adapter\n");
+       }
+
+       ret = rte_event_eth_tx_adapter_create(tx_adptr_id, event_d_id,
+                                             &evt_rsrc->def_p_conf);
+       if (ret)
+               rte_panic("Failed to create tx adapter\n");
+
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+                       continue;
+               ret = rte_event_eth_tx_adapter_queue_add(tx_adptr_id, port_id,
+                                                        -1);
+               if (ret)
+                       rte_panic("Failed to add queues to Tx adapter\n");
+       }
+
+       ret = rte_event_eth_tx_adapter_service_id_get(tx_adptr_id, &service_id);
+       if (ret != -ESRCH && ret != 0)
+               rte_panic("Failed to get Tx adapter service ID\n");
+
+       rte_service_runstate_set(service_id, 1);
+       rte_service_set_runstate_mapped_check(service_id, 0);
+       evt_rsrc->tx_adptr.service_id = service_id;
+
+       ret = rte_event_eth_tx_adapter_event_port_get(tx_adptr_id, &tx_port_id);
+       if (ret)
+               rte_panic("Failed to get Tx adapter port id: %d\n", ret);
+
+       ret = rte_event_port_link(event_d_id, tx_port_id,
+                                 &evt_rsrc->evq.event_q_id[
+                                       evt_rsrc->evq.nb_queues - 1],
+                                 NULL, 1);
+       if (ret != 1)
+               rte_panic("Unable to link Tx adapter port to Tx queue:err=%d\n",
+                        ret);
+
+       ret = rte_event_eth_tx_adapter_start(tx_adptr_id);
+       if (ret)
+               rte_panic("Tx adapter[%d] start Failed\n", tx_adptr_id);
+
+       evt_rsrc->tx_adptr.tx_adptr[0] = tx_adptr_id;
+}
+
 void
 l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops)
 {
        ops->event_device_setup = l3fwd_event_device_setup_generic;
        ops->event_queue_setup = l3fwd_event_queue_setup_generic;
        ops->event_port_setup = l3fwd_event_port_setup_generic;
+       ops->adapter_setup = l3fwd_rx_tx_adapter_setup_generic;
 }

diff --git a/examples/l3fwd/l3fwd_event_internal_port.c b/examples/l3fwd/l3fwd_event_internal_port.c
index 476dd8a..993e26f 100644 (file)
--- a/examples/l3fwd/l3fwd_event_internal_port.c
+++ b/examples/l3fwd/l3fwd_event_internal_port.c
@@ -177,10 +177,103 @@ l3fwd_event_queue_setup_internal_port(uint32_t event_queue_cfg)
        }
 }
 
+static void
+l3fwd_rx_tx_adapter_setup_internal_port(void)
+{
+       struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+       struct rte_event_eth_rx_adapter_queue_conf eth_q_conf;
+       uint8_t event_d_id = evt_rsrc->event_d_id;
+       uint16_t adapter_id = 0;
+       uint16_t nb_adapter = 0;
+       uint16_t port_id;
+       uint8_t q_id = 0;
+       int ret;
+
+       memset(&eth_q_conf, 0, sizeof(eth_q_conf));
+       eth_q_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+                       continue;
+               nb_adapter++;
+       }
+
+       evt_rsrc->rx_adptr.nb_rx_adptr = nb_adapter;
+       evt_rsrc->rx_adptr.rx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+                                       evt_rsrc->rx_adptr.nb_rx_adptr);
+       if (!evt_rsrc->rx_adptr.rx_adptr) {
+               free(evt_rsrc->evp.event_p_id);
+               free(evt_rsrc->evq.event_q_id);
+               rte_panic("Failed to allocate memory for Rx adapter\n");
+       }
+
+
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+                       continue;
+               ret = rte_event_eth_rx_adapter_create(adapter_id, event_d_id,
+                                               &evt_rsrc->def_p_conf);
+               if (ret)
+                       rte_panic("Failed to create rx adapter[%d]\n",
+                                 adapter_id);
+
+               /* Configure user requested sched type*/
+               eth_q_conf.ev.sched_type = evt_rsrc->sched_type;
+               eth_q_conf.ev.queue_id = evt_rsrc->evq.event_q_id[q_id];
+               ret = rte_event_eth_rx_adapter_queue_add(adapter_id, port_id,
+                                                        -1, &eth_q_conf);
+               if (ret)
+                       rte_panic("Failed to add queues to Rx adapter\n");
+
+               ret = rte_event_eth_rx_adapter_start(adapter_id);
+               if (ret)
+                       rte_panic("Rx adapter[%d] start Failed\n", adapter_id);
+
+               evt_rsrc->rx_adptr.rx_adptr[adapter_id] = adapter_id;
+               adapter_id++;
+               if (q_id < evt_rsrc->evq.nb_queues)
+                       q_id++;
+       }
+
+       evt_rsrc->tx_adptr.nb_tx_adptr = nb_adapter;
+       evt_rsrc->tx_adptr.tx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+                                       evt_rsrc->tx_adptr.nb_tx_adptr);
+       if (!evt_rsrc->tx_adptr.tx_adptr) {
+               free(evt_rsrc->rx_adptr.rx_adptr);
+               free(evt_rsrc->evp.event_p_id);
+               free(evt_rsrc->evq.event_q_id);
+               rte_panic("Failed to allocate memory for Rx adapter\n");
+       }
+
+       adapter_id = 0;
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+                       continue;
+               ret = rte_event_eth_tx_adapter_create(adapter_id, event_d_id,
+                                               &evt_rsrc->def_p_conf);
+               if (ret)
+                       rte_panic("Failed to create tx adapter[%d]\n",
+                                 adapter_id);
+
+               ret = rte_event_eth_tx_adapter_queue_add(adapter_id, port_id,
+                                                        -1);
+               if (ret)
+                       rte_panic("Failed to add queues to Tx adapter\n");
+
+               ret = rte_event_eth_tx_adapter_start(adapter_id);
+               if (ret)
+                       rte_panic("Tx adapter[%d] start Failed\n", adapter_id);
+
+               evt_rsrc->tx_adptr.tx_adptr[adapter_id] = adapter_id;
+               adapter_id++;
+       }
+}
+
 void
 l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops)
 {
        ops->event_device_setup = l3fwd_event_device_setup_internal_port;
        ops->event_queue_setup = l3fwd_event_queue_setup_internal_port;
        ops->event_port_setup = l3fwd_event_port_setup_internal_port;
+       ops->adapter_setup = l3fwd_rx_tx_adapter_setup_internal_port;
 }