@@ -4,10 +4,58 @@
#include <rte_bitmap.h>
#include <rte_ethdev.h>
#include <rte_eventdev.h>
+#include <rte_event_eth_rx_adapter.h>
#include <rte_malloc.h>
+#include <stdbool.h>
#include "event_helper.h"
+static int
+eh_get_enabled_cores(struct rte_bitmap *eth_core_mask)
+{
+ int i, count = 0;
+
+ RTE_LCORE_FOREACH(i) {
+ /* Check if this core is enabled in core mask*/
+ if (rte_bitmap_get(eth_core_mask, i)) {
+ /* Found enabled core */
+ count++;
+ }
+ }
+ return count;
+}
+
+static inline unsigned int
+eh_get_next_eth_core(struct eventmode_conf *em_conf)
+{
+ static unsigned int prev_core = -1;
+ unsigned int next_core;
+
+ /*
+ * Make sure we have at least one eth core running, else the following
+ * logic would lead to an infinite loop.
+ */
+ if (eh_get_enabled_cores(em_conf->eth_core_mask) == 0) {
+ EH_LOG_ERR("No enabled eth core found");
+ return RTE_MAX_LCORE;
+ }
+
+ /* Only some cores are marked as eth cores, skip others */
+ do {
+ /* Get the next core */
+ next_core = rte_get_next_lcore(prev_core, 0, 1);
+
+ /* Check if we have reached max lcores */
+ if (next_core == RTE_MAX_LCORE)
+ return next_core;
+
+ /* Update prev_core */
+ prev_core = next_core;
+ } while (!(rte_bitmap_get(em_conf->eth_core_mask, next_core)));
+
+ return next_core;
+}
+
static inline unsigned int
eh_get_next_active_core(struct eventmode_conf *em_conf, unsigned int prev_core)
{
@@ -164,6 +212,82 @@ eh_set_default_conf_link(struct eventmode_conf *em_conf)
}
static int
+eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)
+{
+ struct rx_adapter_connection_info *conn;
+ struct eventdev_params *eventdev_config;
+ struct rx_adapter_conf *adapter;
+ bool single_ev_queue = false;
+ int eventdev_id;
+ int nb_eth_dev;
+ int adapter_id;
+ int conn_id;
+ int i;
+
+ /* Create one adapter with eth queues mapped to event queue(s) */
+
+ if (em_conf->nb_eventdev == 0) {
+ EH_LOG_ERR("No event devs registered");
+ return -EINVAL;
+ }
+
+ /* Get the number of eth devs */
+ nb_eth_dev = rte_eth_dev_count_avail();
+
+ /* Use the first event dev */
+ eventdev_config = &(em_conf->eventdev_config[0]);
+
+ /* Get eventdev ID */
+ eventdev_id = eventdev_config->eventdev_id;
+ adapter_id = 0;
+
+ /* Get adapter conf */
+ adapter = &(em_conf->rx_adapter[adapter_id]);
+
+ /* Set adapter conf */
+ adapter->eventdev_id = eventdev_id;
+ adapter->adapter_id = adapter_id;
+ adapter->rx_core_id = eh_get_next_eth_core(em_conf);
+
+ /*
+ * Map all queues of eth device (port) to an event queue. If there
+ * are more event queues than eth ports then create 1:1 mapping.
+ * Otherwise map all eth ports to a single event queue.
+ */
+ if (nb_eth_dev > eventdev_config->nb_eventqueue)
+ single_ev_queue = true;
+
+ for (i = 0; i < nb_eth_dev; i++) {
+
+ /* Use only the ports enabled */
+ if ((em_conf->eth_portmask & (1 << i)) == 0)
+ continue;
+
+ /* Get the connection id */
+ conn_id = adapter->nb_connections;
+
+ /* Get the connection */
+ conn = &(adapter->conn[conn_id]);
+
+ /* Set mapping between eth ports & event queues*/
+ conn->ethdev_id = i;
+ conn->eventq_id = single_ev_queue ? 0 : i;
+
+ /* Add all eth queues eth port to event queue */
+ conn->ethdev_rx_qid = -1;
+
+ /* Update no of connections */
+ adapter->nb_connections++;
+
+ }
+
+ /* We have setup one adapter */
+ em_conf->nb_rx_adapter = 1;
+
+ return 0;
+}
+
+static int
eh_validate_conf(struct eventmode_conf *em_conf)
{
int ret;
@@ -188,6 +312,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)
return ret;
}
+ /*
+ * Check if rx adapters are specified. Else generate a default config
+ * with one rx adapter and all eth queues - event queue mapped.
+ */
+ if (em_conf->nb_rx_adapter == 0) {
+ ret = eh_set_default_conf_rx_adapter(em_conf);
+ if (ret != 0)
+ return ret;
+ }
+
return 0;
}
@@ -341,6 +475,104 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)
return 0;
}
+static int
+eh_rx_adapter_configure(struct eventmode_conf *em_conf,
+ struct rx_adapter_conf *adapter)
+{
+ struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0};
+ struct rte_event_dev_info evdev_default_conf = {0};
+ struct rte_event_port_conf port_conf = {0};
+ struct rx_adapter_connection_info *conn;
+ uint8_t eventdev_id;
+ uint32_t service_id;
+ int ret;
+ int j;
+
+ /* Get event dev ID */
+ eventdev_id = adapter->eventdev_id;
+
+ /* Get default configuration of event dev */
+ ret = rte_event_dev_info_get(eventdev_id, &evdev_default_conf);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to get event dev info %d", ret);
+ return ret;
+ }
+
+ /* Setup port conf */
+ port_conf.new_event_threshold = 1200;
+ port_conf.dequeue_depth =
+ evdev_default_conf.max_event_port_dequeue_depth;
+ port_conf.enqueue_depth =
+ evdev_default_conf.max_event_port_enqueue_depth;
+
+ /* Create Rx adapter */
+ ret = rte_event_eth_rx_adapter_create(adapter->adapter_id,
+ adapter->eventdev_id, &port_conf);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to create rx adapter %d", ret);
+ return ret;
+ }
+
+ /* Setup various connections in the adapter */
+ for (j = 0; j < adapter->nb_connections; j++) {
+ /* Get connection */
+ conn = &(adapter->conn[j]);
+
+ /* Setup queue conf */
+ queue_conf.ev.queue_id = conn->eventq_id;
+ queue_conf.ev.sched_type = em_conf->ext_params.sched_type;
+ queue_conf.ev.event_type = RTE_EVENT_TYPE_ETHDEV;
+
+ /* Add queue to the adapter */
+ ret = rte_event_eth_rx_adapter_queue_add(adapter->adapter_id,
+ conn->ethdev_id, conn->ethdev_rx_qid,
+ &queue_conf);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to add eth queue to rx adapter %d",
+ ret);
+ return ret;
+ }
+ }
+
+ /* Get the service ID used by rx adapter */
+ ret = rte_event_eth_rx_adapter_service_id_get(adapter->adapter_id,
+ &service_id);
+ if (ret != -ESRCH && ret < 0) {
+ EH_LOG_ERR("Failed to get service id used by rx adapter %d",
+ ret);
+ return ret;
+ }
+
+ rte_service_set_runstate_mapped_check(service_id, 0);
+
+ /* Start adapter */
+ ret = rte_event_eth_rx_adapter_start(adapter->adapter_id);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to start rx adapter %d", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int
+eh_initialize_rx_adapter(struct eventmode_conf *em_conf)
+{
+ struct rx_adapter_conf *adapter;
+ int i, ret;
+
+ /* Configure rx adapters */
+ for (i = 0; i < em_conf->nb_rx_adapter; i++) {
+ adapter = &(em_conf->rx_adapter[i]);
+ ret = eh_rx_adapter_configure(em_conf, adapter);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to configure rx adapter %d", ret);
+ return ret;
+ }
+ }
+ return 0;
+}
+
int32_t
eh_devs_init(struct eh_conf *conf)
{
@@ -364,6 +596,9 @@ eh_devs_init(struct eh_conf *conf)
/* Get eventmode conf */
em_conf = conf->mode_params;
+ /* Eventmode conf would need eth portmask */
+ em_conf->eth_portmask = conf->eth_portmask;
+
/* Validate the requested config */
ret = eh_validate_conf(em_conf);
if (ret < 0) {
@@ -388,6 +623,13 @@ eh_devs_init(struct eh_conf *conf)
return ret;
}
+ /* Setup Rx adapter */
+ ret = eh_initialize_rx_adapter(em_conf);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to initialize rx adapter %d", ret);
+ return ret;
+ }
+
/* Start eth devices after setting up adapter */
RTE_ETH_FOREACH_DEV(port_id) {
@@ -410,8 +652,8 @@ int32_t
eh_devs_uninit(struct eh_conf *conf)
{
struct eventmode_conf *em_conf;
+ int ret, i, j;
uint16_t id;
- int ret, i;
if (conf == NULL) {
EH_LOG_ERR("Invalid event helper configuration");
@@ -429,6 +671,35 @@ eh_devs_uninit(struct eh_conf *conf)
/* Get eventmode conf */
em_conf = conf->mode_params;
+ /* Stop and release rx adapters */
+ for (i = 0; i < em_conf->nb_rx_adapter; i++) {
+
+ id = em_conf->rx_adapter[i].adapter_id;
+ ret = rte_event_eth_rx_adapter_stop(id);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to stop rx adapter %d", ret);
+ return ret;
+ }
+
+ for (j = 0; j < em_conf->rx_adapter[i].nb_connections; j++) {
+
+ ret = rte_event_eth_rx_adapter_queue_del(id,
+ em_conf->rx_adapter[i].conn[j].ethdev_id, -1);
+ if (ret < 0) {
+ EH_LOG_ERR(
+ "Failed to remove rx adapter queues %d",
+ ret);
+ return ret;
+ }
+ }
+
+ ret = rte_event_eth_rx_adapter_free(id);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to free rx adapter %d", ret);
+ return ret;
+ }
+ }
+
/* Stop and release event devices */
for (i = 0; i < em_conf->nb_eventdev; i++) {
@@ -16,6 +16,12 @@
/* Max event devices supported */
#define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS
+/* Max Rx adapters supported */
+#define EVENT_MODE_MAX_RX_ADAPTERS RTE_EVENT_MAX_DEVS
+
+/* Max Rx adapter connections */
+#define EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER 16
+
/* Max event queues supported per event device */
#define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV
@@ -53,12 +59,33 @@ struct eh_event_link_info {
/**< Lcore to be polling on this port */
};
+/* Rx adapter connection info */
+struct rx_adapter_connection_info {
+ uint8_t ethdev_id;
+ uint8_t eventq_id;
+ int32_t ethdev_rx_qid;
+};
+
+/* Rx adapter conf */
+struct rx_adapter_conf {
+ int32_t eventdev_id;
+ int32_t adapter_id;
+ uint32_t rx_core_id;
+ uint8_t nb_connections;
+ struct rx_adapter_connection_info
+ conn[EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER];
+};
+
/* Eventmode conf data */
struct eventmode_conf {
int nb_eventdev;
/**< No of event devs */
struct eventdev_params eventdev_config[EVENT_MODE_MAX_EVENT_DEVS];
/**< Per event dev conf */
+ uint8_t nb_rx_adapter;
+ /**< No of Rx adapters */
+ struct rx_adapter_conf rx_adapter[EVENT_MODE_MAX_RX_ADAPTERS];
+ /**< Rx adapter conf */
uint8_t nb_link;
/**< No of links */
struct eh_event_link_info
@@ -66,6 +93,8 @@ struct eventmode_conf {
/**< Per link conf */
struct rte_bitmap *eth_core_mask;
/**< Core mask of cores to be used for software Rx and Tx */
+ uint32_t eth_portmask;
+ /**< Mask of the eth ports to be used */
union {
RTE_STD_C11
struct {