@@ -215,7 +215,6 @@ l3fwd_eventdev_capability_setup(void)
l3fwd_eventdev_set_internal_port_ops(&evdev_rsrc->ops);
}
-
static uint32_t
l3fwd_eventdev_setup(uint16_t ethdev_count)
{
@@ -267,6 +266,7 @@ l3fwd_eventdev_setup(uint16_t ethdev_count)
num_workers = dev_info.max_event_ports;
event_d_conf.nb_event_ports = num_workers;
+ evdev_rsrc->evp.nb_ports = num_workers;
evdev_rsrc->has_burst = !!(dev_info.event_dev_cap &
RTE_EVENT_DEV_CAP_BURST_MODE);
@@ -278,11 +278,31 @@ l3fwd_eventdev_setup(uint16_t ethdev_count)
return event_queue_cfg;
}
+int
+l3fwd_get_free_event_port(struct l3fwd_eventdev_resources *evdev_rsrc)
+{
+ static int index;
+ int port_id;
+
+ rte_spinlock_lock(&evdev_rsrc->evp.lock);
+ if (index >= evdev_rsrc->evp.nb_ports) {
+ printf("No free event port is available\n");
+ return -1;
+ }
+
+ port_id = evdev_rsrc->evp.event_p_id[index];
+ index++;
+ rte_spinlock_unlock(&evdev_rsrc->evp.lock);
+
+ return port_id;
+}
+
void
l3fwd_eventdev_resource_setup(struct rte_eth_conf *port_conf)
{
struct l3fwd_eventdev_resources *evdev_rsrc = l3fwd_get_eventdev_rsrc();
uint16_t ethdev_count = rte_eth_dev_count_avail();
+ uint32_t event_queue_cfg;
int32_t ret;
/* Parse eventdev command line options */
@@ -300,5 +320,11 @@ l3fwd_eventdev_resource_setup(struct rte_eth_conf *port_conf)
l3fwd_eth_dev_port_setup(port_conf);
/* Event device configuration */
- l3fwd_eventdev_setup(ethdev_count);
+ event_queue_cfg = l3fwd_eventdev_setup(ethdev_count);
+
+ /* Event queue configuration */
+ evdev_rsrc->ops.event_queue_setup(ethdev_count, event_queue_cfg);
+
+ /* Event port configuration */
+ evdev_rsrc->ops.event_port_setup();
}
@@ -29,6 +29,17 @@ typedef void (*event_port_setup_cb)(void);
typedef void (*service_setup_cb)(void);
typedef int (*event_loop_cb)(void *);
+struct l3fwd_eventdev_queues {
+ uint8_t *event_q_id;
+ uint8_t nb_queues;
+};
+
+struct l3fwd_eventdev_ports {
+ uint8_t *event_p_id;
+ uint8_t nb_ports;
+ rte_spinlock_t lock;
+};
+
struct l3fwd_eventdev_setup_ops {
event_queue_setup_cb event_queue_setup;
event_port_setup_cb event_port_setup;
@@ -38,14 +49,18 @@ struct l3fwd_eventdev_setup_ops {
};
struct l3fwd_eventdev_resources {
+ struct rte_event_port_conf def_p_conf;
uint8_t disable_implicit_release;
struct l3fwd_eventdev_setup_ops ops;
struct rte_mempool * (*pkt_pool)[NB_SOCKETS];
+ struct l3fwd_eventdev_queues evq;
+ struct l3fwd_eventdev_ports evp;
uint32_t port_mask;
uint8_t per_port_pool;
uint8_t event_d_id;
uint8_t sync_mode;
uint8_t tx_mode_q;
+ uint8_t deq_depth;
uint8_t has_burst;
uint8_t enabled;
uint8_t nb_args;
@@ -76,6 +91,7 @@ l3fwd_get_eventdev_rsrc(void)
}
void l3fwd_eventdev_resource_setup(struct rte_eth_conf *port_conf);
+int l3fwd_get_free_event_port(struct l3fwd_eventdev_resources *eventdev_rsrc);
void l3fwd_eventdev_set_generic_ops(struct l3fwd_eventdev_setup_ops *ops);
void l3fwd_eventdev_set_internal_port_ops(struct l3fwd_eventdev_setup_ops *ops);
@@ -5,8 +5,119 @@
#include "l3fwd.h"
#include "l3fwd_eventdev.h"
+static void
+l3fwd_event_port_setup_generic(void)
+{
+ struct l3fwd_eventdev_resources *evdev_rsrc = l3fwd_get_eventdev_rsrc();
+ uint8_t event_d_id = evdev_rsrc->event_d_id;
+ struct rte_event_port_conf event_p_conf = {
+ .dequeue_depth = 32,
+ .enqueue_depth = 32,
+ .new_event_threshold = 4096
+ };
+ struct rte_event_port_conf def_p_conf;
+ uint8_t event_p_id;
+ int32_t ret;
+
+ evdev_rsrc->evp.event_p_id = (uint8_t *)malloc(sizeof(uint8_t) *
+ evdev_rsrc->evp.nb_ports);
+ if (!evdev_rsrc->evp.event_p_id)
+ rte_exit(EXIT_FAILURE, " No space is available");
+
+ memset(&def_p_conf, 0, sizeof(struct rte_event_port_conf));
+ rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf);
+
+ if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold)
+ event_p_conf.new_event_threshold =
+ def_p_conf.new_event_threshold;
+
+ if (def_p_conf.dequeue_depth < event_p_conf.dequeue_depth)
+ event_p_conf.dequeue_depth = def_p_conf.dequeue_depth;
+
+ if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth)
+ event_p_conf.enqueue_depth = def_p_conf.enqueue_depth;
+
+ event_p_conf.disable_implicit_release =
+ evdev_rsrc->disable_implicit_release;
+ evdev_rsrc->deq_depth = def_p_conf.dequeue_depth;
+
+ for (event_p_id = 0; event_p_id < evdev_rsrc->evp.nb_ports;
+ event_p_id++) {
+ ret = rte_event_port_setup(event_d_id, event_p_id,
+ &event_p_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ "Error in configuring event port %d\n",
+ event_p_id);
+ }
+
+ ret = rte_event_port_link(event_d_id, event_p_id,
+ evdev_rsrc->evq.event_q_id,
+ NULL,
+ evdev_rsrc->evq.nb_queues - 1);
+ if (ret != (evdev_rsrc->evq.nb_queues - 1)) {
+ rte_exit(EXIT_FAILURE, "Error in linking event port %d "
+ "to event queue", event_p_id);
+ }
+ evdev_rsrc->evp.event_p_id[event_p_id] = event_p_id;
+ }
+ /* init spinlock */
+ rte_spinlock_init(&evdev_rsrc->evp.lock);
+
+ evdev_rsrc->def_p_conf = event_p_conf;
+}
+
+static void
+l3fwd_event_queue_setup_generic(uint16_t ethdev_count,
+ uint32_t event_queue_cfg)
+{
+ struct l3fwd_eventdev_resources *evdev_rsrc = l3fwd_get_eventdev_rsrc();
+ uint8_t event_d_id = evdev_rsrc->event_d_id;
+ struct rte_event_queue_conf event_q_conf = {
+ .nb_atomic_flows = 1024,
+ .nb_atomic_order_sequences = 1024,
+ .event_queue_cfg = event_queue_cfg,
+ .priority = RTE_EVENT_DEV_PRIORITY_NORMAL
+ };
+ struct rte_event_queue_conf def_q_conf;
+ uint8_t event_q_id;
+ int32_t ret;
+
+ event_q_conf.schedule_type = evdev_rsrc->sync_mode;
+ evdev_rsrc->evq.nb_queues = ethdev_count + 1;
+ evdev_rsrc->evq.event_q_id = (uint8_t *)malloc(sizeof(uint8_t) *
+ evdev_rsrc->evq.nb_queues);
+ if (!evdev_rsrc->evq.event_q_id)
+ rte_exit(EXIT_FAILURE, "Memory allocation failure");
+
+ rte_event_queue_default_conf_get(event_d_id, 0, &def_q_conf);
+ if (def_q_conf.nb_atomic_flows < event_q_conf.nb_atomic_flows)
+ event_q_conf.nb_atomic_flows = def_q_conf.nb_atomic_flows;
+
+ for (event_q_id = 0; event_q_id < (evdev_rsrc->evq.nb_queues - 1);
+ event_q_id++) {
+ ret = rte_event_queue_setup(event_d_id, event_q_id,
+ &event_q_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ "Error in configuring event queue");
+ }
+ evdev_rsrc->evq.event_q_id[event_q_id] = event_q_id;
+ }
+
+ event_q_conf.event_queue_cfg |= RTE_EVENT_QUEUE_CFG_SINGLE_LINK;
+ event_q_conf.priority = RTE_EVENT_DEV_PRIORITY_HIGHEST,
+ ret = rte_event_queue_setup(event_d_id, event_q_id, &event_q_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ "Error in configuring event queue for Tx adapter");
+ }
+ evdev_rsrc->evq.event_q_id[event_q_id] = event_q_id;
+}
+
void
l3fwd_eventdev_set_generic_ops(struct l3fwd_eventdev_setup_ops *ops)
{
- RTE_SET_USED(ops);
+ ops->event_queue_setup = l3fwd_event_queue_setup_generic;
+ ops->event_port_setup = l3fwd_event_port_setup_generic;
}
@@ -5,9 +5,113 @@
#include "l3fwd.h"
#include "l3fwd_eventdev.h"
+static void
+l3fwd_event_port_setup_internal_port(void)
+{
+ struct l3fwd_eventdev_resources *evdev_rsrc = l3fwd_get_eventdev_rsrc();
+ uint8_t event_d_id = evdev_rsrc->event_d_id;
+ struct rte_event_port_conf event_p_conf = {
+ .dequeue_depth = 32,
+ .enqueue_depth = 32,
+ .new_event_threshold = 4096
+ };
+ struct rte_event_port_conf def_p_conf;
+ uint8_t event_p_id;
+ int32_t ret;
+
+ evdev_rsrc->evp.event_p_id = (uint8_t *)malloc(sizeof(uint8_t) *
+ evdev_rsrc->evp.nb_ports);
+ if (!evdev_rsrc->evp.event_p_id)
+ rte_exit(EXIT_FAILURE,
+ "Failed to allocate memory for Event Ports");
+
+ rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf);
+ if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold)
+ event_p_conf.new_event_threshold =
+ def_p_conf.new_event_threshold;
+
+ if (def_p_conf.dequeue_depth < event_p_conf.dequeue_depth)
+ event_p_conf.dequeue_depth = def_p_conf.dequeue_depth;
+
+ if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth)
+ event_p_conf.enqueue_depth = def_p_conf.enqueue_depth;
+
+ event_p_conf.disable_implicit_release =
+ evdev_rsrc->disable_implicit_release;
+
+ for (event_p_id = 0; event_p_id < evdev_rsrc->evp.nb_ports;
+ event_p_id++) {
+ ret = rte_event_port_setup(event_d_id, event_p_id,
+ &event_p_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ "Error in configuring event port %d\n",
+ event_p_id);
+ }
+
+ ret = rte_event_port_link(event_d_id, event_p_id, NULL,
+ NULL, 0);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE, "Error in linking event port %d "
+ "to event queue", event_p_id);
+ }
+ evdev_rsrc->evp.event_p_id[event_p_id] = event_p_id;
+
+ /* init spinlock */
+ rte_spinlock_init(&evdev_rsrc->evp.lock);
+ }
+
+ evdev_rsrc->def_p_conf = event_p_conf;
+}
+
+static void
+l3fwd_event_queue_setup_internal_port(uint16_t ethdev_count,
+ uint32_t event_queue_cfg)
+{
+ struct l3fwd_eventdev_resources *evdev_rsrc = l3fwd_get_eventdev_rsrc();
+ uint8_t event_d_id = evdev_rsrc->event_d_id;
+ struct rte_event_queue_conf event_q_conf = {
+ .nb_atomic_flows = 1024,
+ .nb_atomic_order_sequences = 1024,
+ .event_queue_cfg = event_queue_cfg,
+ .priority = RTE_EVENT_DEV_PRIORITY_NORMAL
+ };
+ struct rte_event_queue_conf def_q_conf;
+ uint8_t event_q_id = 0;
+ int32_t ret;
+
+ rte_event_queue_default_conf_get(event_d_id, event_q_id, &def_q_conf);
+
+ if (def_q_conf.nb_atomic_flows < event_q_conf.nb_atomic_flows)
+ event_q_conf.nb_atomic_flows = def_q_conf.nb_atomic_flows;
+
+ if (def_q_conf.nb_atomic_order_sequences <
+ event_q_conf.nb_atomic_order_sequences)
+ event_q_conf.nb_atomic_order_sequences =
+ def_q_conf.nb_atomic_order_sequences;
+
+ event_q_conf.event_queue_cfg = event_queue_cfg;
+ event_q_conf.schedule_type = evdev_rsrc->sync_mode;
+ evdev_rsrc->evq.nb_queues = ethdev_count;
+ evdev_rsrc->evq.event_q_id = (uint8_t *)malloc(sizeof(uint8_t) *
+ evdev_rsrc->evq.nb_queues);
+ if (!evdev_rsrc->evq.event_q_id)
+ rte_exit(EXIT_FAILURE, "Memory allocation failure");
+
+ for (event_q_id = 0; event_q_id < ethdev_count; event_q_id++) {
+ ret = rte_event_queue_setup(event_d_id, event_q_id,
+ &event_q_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ "Error in configuring event queue");
+ }
+ evdev_rsrc->evq.event_q_id[event_q_id] = event_q_id;
+ }
+}
void
l3fwd_eventdev_set_internal_port_ops(struct l3fwd_eventdev_setup_ops *ops)
{
- RTE_SET_USED(ops);
+ ops->event_queue_setup = l3fwd_event_queue_setup_internal_port;
+ ops->event_port_setup = l3fwd_event_port_setup_internal_port;
}