Generate a default conf for Rx adapter, if not specified in the conf.
This routine will check the available eth ports and event queues, and
maps them 1:1. So one eth port will be connected to one event queue.
This way, event queue ID could be used to figure out the port on which
the packet came in.
Signed-off-by: Anoob Joseph <anoob.jos...@caviumnetworks.com>
---
lib/librte_eventdev/rte_eventmode_helper.c | 127 +++++++++++++++++++++
.../rte_eventmode_helper_internal.h | 4 +
2 files changed, 131 insertions(+)
diff --git a/lib/librte_eventdev/rte_eventmode_helper.c
b/lib/librte_eventdev/rte_eventmode_helper.c
index 4d6888c..bec893c 100644
--- a/lib/librte_eventdev/rte_eventmode_helper.c
+++ b/lib/librte_eventdev/rte_eventmode_helper.c
@@ -65,6 +65,29 @@ internal_get_eventdev_params(struct eventmode_conf *em_conf,
return &(em_conf->eventdev_config[i]);
}
+static inline unsigned
+internal_get_next_rx_core(struct eventmode_conf *em_conf, unsigned prev_core)
+{
+ unsigned next_core;
+
+get_next_core:
+ /* Get the next core */
+ next_core = rte_get_next_lcore(prev_core, 0, 0);
+
+ /* Check if we have reached max lcores */
+ if (next_core == RTE_MAX_LCORE)
+ return next_core;
+
+ /* Only some cores would be marked as rx cores. Skip others */
+ if (!(em_conf->rx_core_mask & (1 << next_core))) {
+ prev_core = next_core;
+ goto get_next_core;
+ }
+
+ return next_core;
+}
+
+
/* Global functions */
void
@@ -105,6 +128,7 @@ static void
em_initialize_helper_conf(struct rte_eventmode_helper_conf *conf)
{
struct eventmode_conf *em_conf = NULL;
+ unsigned rx_core_id;
/* Set default conf */
@@ -119,6 +143,13 @@ em_initialize_helper_conf(struct rte_eventmode_helper_conf
*conf)
/* Stage 1 schedule type: atomic */
em_conf->ext_params.s1_sched_type = RTE_SCHED_TYPE_ATOMIC;
+
+ /* Set rx core. Use first core other than master core as Rx core */
+ rx_core_id = rte_get_next_lcore(0, /* curr core */
+ 1, /* skip master core */
+ 0 /* wrap */);
+
+ em_conf->rx_core_mask = (1 << rx_core_id);
}
struct rte_eventmode_helper_conf *
@@ -253,6 +284,89 @@ rte_eventmode_helper_set_default_conf_eventdev(struct
eventmode_conf *em_conf)
}
static int
+rte_eventmode_helper_set_default_conf_adapter(struct eventmode_conf *em_conf)
+{
+ int nb_eth_dev;
+ int i;
+ int adapter_id;
+ int eventdev_id;
+ int conn_id;
+ struct rx_adapter_conf *adapter;
+ struct adapter_connection_info *conn;
+ struct eventdev_params *eventdev_config;
+
+ /* Create one adapter with all eth queues mapped to event queues 1:1 */
+
+ if (em_conf->nb_eventdev == 0) {
+ RTE_EM_HLPR_LOG_ERR("No event devs registered");
+ return -1;
+ }
+
+ /* 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->adapter[adapter_id]);
+
+ /* Set adapter conf */
+ adapter->eventdev_id = eventdev_id;
+ adapter->adapter_id = adapter_id;
+ adapter->rx_core_id = internal_get_next_rx_core(em_conf, -1);
+
+ /*
+ * All queues of one eth device (port) will be mapped to one event
+ * queue. Each port will have an individual connection.
+ *
+ */
+
+ /* Make sure there is enough event queues for 1:1 mapping */
+ if (nb_eth_dev > eventdev_config->nb_eventqueue) {
+ RTE_EM_HLPR_LOG_ERR(
+ "Not enough event queues for 1:1 mapping "
+ "[eth devs: %d, event queues: %d]\n",
+ nb_eth_dev,
+ eventdev_config->nb_eventqueue);
+ return -1;
+ }
+
+ 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 1:1 mapping between eth ports & event queues*/
+ conn->ethdev_id = i;
+ conn->eventq_id = i;
+
+ /* Add all eth queues of one eth port to one 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
rte_eventmode_helper_validate_conf(struct eventmode_conf *em_conf)
{
int ret;
@@ -272,6 +386,16 @@ rte_eventmode_helper_validate_conf(struct eventmode_conf
*em_conf)
return ret;
}
+ /*
+ * See if adapters are specified. Else generate a default conf
+ * with one adapter and all eth queue - event queue mapped.
+ */
+ if (em_conf->nb_rx_adapter == 0) {
+ ret = rte_eventmode_helper_set_default_conf_adapter(em_conf);
+ if (ret != 0)
+ return ret;
+ }
+
return 0;
}
@@ -591,6 +715,9 @@ rte_eventmode_helper_initialize_devs(
/* Get eventmode conf */
em_conf = (struct eventmode_conf *)(mode_conf->mode_params);
+ /* Eventmode conf would need eth portmask */
+ em_conf->eth_portmask = mode_conf->eth_portmask;
+
/* Validate the conf requested */
if (rte_eventmode_helper_validate_conf(em_conf) != 0) {
RTE_EM_HLPR_LOG_ERR(
diff --git a/lib/librte_eventdev/rte_eventmode_helper_internal.h
b/lib/librte_eventdev/rte_eventmode_helper_internal.h
index 63b2fb5..9db9684 100644
--- a/lib/librte_eventdev/rte_eventmode_helper_internal.h
+++ b/lib/librte_eventdev/rte_eventmode_helper_internal.h
@@ -83,6 +83,10 @@ struct eventmode_conf {
struct rte_eventmode_helper_event_link_info
link[EVENT_MODE_MAX_LCORE_LINKS];
/**< Per link conf */
+ uint32_t rx_core_mask;
+ /**< Core mask of rx cores to be used */
+ uint32_t eth_portmask;
+ /**< Mask of the eth ports to be used */
union {
struct {
uint64_t s1_sched_type : 2;
--
2.7.4
