examples/l3fwd: add ethdev setup based on eventdev

Add ethernet port Rx/Tx queue setup for event device which are later
used for setting up event eth Rx/Tx adapters.

Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index e2399d7..ed5ba5f 100644 (file)
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -16,9 +16,16 @@
 #define NO_HASH_MULTI_LOOKUP 1
 #endif
 
+/*
+ * Configurable number of RX/TX ring descriptors
+ */
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
+
 #define MAX_PKT_BURST     32
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 
+#define MEMPOOL_CACHE_SIZE 256
 #define MAX_RX_QUEUE_PER_LCORE 16
 
 /*
@@ -170,6 +177,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
 }
 #endif /* DO_RFC_1812_CHECKS */
 
+int
+init_mem(uint16_t portid, unsigned int nb_mbuf);
+
 /* Function pointers for LPM or EM functionality. */
 void
 setup_lpm(const int socketid);

diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 9cb46c7..f9491ec 100644 (file)
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -10,6 +10,14 @@
 #include "l3fwd.h"
 #include "l3fwd_event.h"
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+       printf("%s%s", name, buf);
+}
+
 struct l3fwd_event_resources *
 l3fwd_get_eventdev_rsrc(void)
 {
@@ -30,6 +38,131 @@ l3fwd_get_eventdev_rsrc(void)
        return NULL;
 }
 
+static void
+l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
+{
+       struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+       uint16_t nb_ports = rte_eth_dev_count_avail();
+       uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
+       uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
+       unsigned int nb_lcores = rte_lcore_count();
+       struct rte_eth_conf local_port_conf;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_txconf txconf;
+       struct rte_eth_rxconf rxconf;
+       unsigned int nb_mbuf;
+       uint16_t port_id;
+       uint8_t eth_qid;
+       int32_t ret;
+
+       /* initialize all ports */
+       RTE_ETH_FOREACH_DEV(port_id) {
+               local_port_conf = *port_conf;
+               /* skip ports that are not enabled */
+               if ((evt_rsrc->port_mask & (1 << port_id)) == 0) {
+                       printf("\nSkipping disabled port %d\n", port_id);
+                       continue;
+               }
+
+               /* init port */
+               printf("Initializing port %d ... ", port_id);
+               fflush(stdout);
+               printf("Creating queues: nb_rxq=%d nb_txq=1...\n",
+                      evt_rsrc->eth_rx_queues);
+
+               rte_eth_dev_info_get(port_id, &dev_info);
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       local_port_conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+               local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+                                               dev_info.flow_type_rss_offloads;
+               if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+                               port_conf->rx_adv_conf.rss_conf.rss_hf) {
+                       printf("Port %u modified RSS hash function "
+                              "based on hardware support,"
+                              "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                              port_id,
+                              port_conf->rx_adv_conf.rss_conf.rss_hf,
+                              local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+               }
+
+               ret = rte_eth_dev_configure(port_id, evt_rsrc->eth_rx_queues,
+                                           1, &local_port_conf);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                                "Cannot configure device: err=%d, port=%d\n",
+                                ret, port_id);
+
+               ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd,
+                                                      &nb_txd);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                                "Cannot adjust number of descriptors: err=%d, "
+                                "port=%d\n", ret, port_id);
+
+               rte_eth_macaddr_get(port_id, &ports_eth_addr[port_id]);
+               print_ethaddr(" Address:", &ports_eth_addr[port_id]);
+               printf(", ");
+               print_ethaddr("Destination:",
+                       (const struct rte_ether_addr *)&dest_eth_addr[port_id]);
+               printf(", ");
+
+               /* prepare source MAC for each port. */
+               rte_ether_addr_copy(&ports_eth_addr[port_id],
+                       (struct rte_ether_addr *)(val_eth + port_id) + 1);
+
+               /* init memory */
+               if (!evt_rsrc->per_port_pool) {
+                       /* port_id = 0; this is *not* signifying the first port,
+                        * rather, it signifies that port_id is ignored.
+                        */
+                       nb_mbuf = RTE_MAX(nb_ports * nb_rxd +
+                                         nb_ports * nb_txd +
+                                         nb_ports * nb_lcores *
+                                                       MAX_PKT_BURST +
+                                         nb_lcores * MEMPOOL_CACHE_SIZE,
+                                         8192u);
+                       ret = init_mem(0, nb_mbuf);
+               } else {
+                       nb_mbuf = RTE_MAX(nb_rxd + nb_rxd +
+                                         nb_lcores * MAX_PKT_BURST +
+                                         nb_lcores * MEMPOOL_CACHE_SIZE,
+                                         8192u);
+                       ret = init_mem(port_id, nb_mbuf);
+               }
+               /* init Rx queues per port */
+               rxconf = dev_info.default_rxconf;
+               rxconf.offloads = local_port_conf.rxmode.offloads;
+
+               for (eth_qid = 0; eth_qid < evt_rsrc->eth_rx_queues;
+                    eth_qid++) {
+                       if (!evt_rsrc->per_port_pool)
+                               ret = rte_eth_rx_queue_setup(port_id, eth_qid,
+                                       nb_rxd, 0, &rxconf,
+                                       evt_rsrc->pkt_pool[0][0]);
+                       else
+                               ret = rte_eth_rx_queue_setup(port_id, eth_qid,
+                                       nb_rxd, 0, &rxconf,
+                                       evt_rsrc->pkt_pool[port_id][0]);
+                       if (ret < 0)
+                               rte_exit(EXIT_FAILURE,
+                                        "rte_eth_rx_queue_setup: err=%d, "
+                                        "port=%d, eth_qid: %d\n",
+                                        ret, port_id, eth_qid);
+               }
+
+               /* init one Tx queue per port */
+               txconf = dev_info.default_txconf;
+               txconf.offloads = local_port_conf.txmode.offloads;
+               ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd, 0, &txconf);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                                "rte_eth_tx_queue_setup: err=%d, "
+                                "port=%d\n", ret, port_id);
+       }
+}
+
 static void
 l3fwd_event_capability_setup(void)
 {
@@ -56,7 +189,7 @@ l3fwd_event_capability_setup(void)
 }
 
 void
-l3fwd_event_resource_setup(void)
+l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
 {
        struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
 
@@ -69,6 +202,9 @@ l3fwd_event_resource_setup(void)
        /* Setup eventdev capability callbacks */
        l3fwd_event_capability_setup();
 
+       /* Ethernet device configuration */
+       l3fwd_eth_dev_port_setup(port_conf);
+
        /* Event device configuration */
        evt_rsrc->ops.event_device_setup();
 }

diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index fc3862e..53feea0 100644 (file)
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -72,7 +72,7 @@ struct l3fwd_event_resources {
 };
 
 struct l3fwd_event_resources *l3fwd_get_eventdev_rsrc(void);
-void l3fwd_event_resource_setup(void);
+void l3fwd_event_resource_setup(struct rte_eth_conf *port_conf);
 void l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops);
 void l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops);
 

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 8a5cdb5..0452634 100644 (file)
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -48,12 +48,6 @@
 #include "l3fwd.h"
 #include "l3fwd_event.h"
 
-/*
- * Configurable number of RX/TX ring descriptors
- */
-#define RTE_TEST_RX_DESC_DEFAULT 1024
-#define RTE_TEST_TX_DESC_DEFAULT 1024
-
 #define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS
 #define MAX_RX_QUEUE_PER_PORT 128
 
@@ -495,7 +489,6 @@ parse_event_eth_rx_queues(const char *eth_rx_queues)
 }
 
 #define MAX_JUMBO_PKT_LEN  9600
-#define MEMPOOL_CACHE_SIZE 256
 
 static const char short_options[] =
        "p:"  /* portmask */
@@ -752,7 +745,7 @@ print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
        printf("%s%s", name, buf);
 }
 
-static int
+int
 init_mem(uint16_t portid, unsigned int nb_mbuf)
 {
        struct lcore_conf *qconf;
@@ -939,14 +932,16 @@ main(int argc, char **argv)
        }
 
        evt_rsrc = l3fwd_get_eventdev_rsrc();
-       RTE_SET_USED(evt_rsrc);
        /* parse application arguments (after the EAL ones) */
        ret = parse_args(argc, argv);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid L3FWD parameters\n");
 
+       evt_rsrc->per_port_pool = per_port_pool;
+       evt_rsrc->pkt_pool = pktmbuf_pool;
+       evt_rsrc->port_mask = enabled_port_mask;
        /* Configure eventdev parameters if user has requested */
-       l3fwd_event_resource_setup();
+       l3fwd_event_resource_setup(&port_conf);
 
        if (check_lcore_params() < 0)
                rte_exit(EXIT_FAILURE, "check_lcore_params failed\n");