From: Intel Date: Wed, 19 Dec 2012 23:00:00 +0000 (+0100) Subject: examples/l2fwd: update X-Git-Tag: spdx-start~11308 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=16ac9cf052d7d3bbbb6038d777ad9f8c7188319d;p=dpdk.git examples/l2fwd: update Signed-off-by: Intel --- diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 7948e3a6b2..cf7f103211 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -133,9 +132,8 @@ struct mbuf_table { #define MAX_RX_QUEUE_PER_LCORE 16 #define MAX_TX_QUEUE_PER_PORT 16 struct lcore_queue_conf { - unsigned n_rx_queue; - unsigned rx_queue_list[MAX_RX_QUEUE_PER_LCORE]; - unsigned tx_queue_id; + unsigned n_rx_port; + unsigned rx_port_list[MAX_RX_QUEUE_PER_LCORE]; struct mbuf_table tx_mbufs[L2FWD_MAX_PORTS]; } __rte_cache_aligned; @@ -240,9 +238,8 @@ l2fwd_send_burst(struct lcore_queue_conf *qconf, unsigned n, uint8_t port) { struct rte_mbuf **m_table; unsigned ret; - unsigned queueid; + unsigned queueid =0; - queueid = (uint16_t) qconf->tx_queue_id; m_table = (struct rte_mbuf **)qconf->tx_mbufs[port].m_table; ret = rte_eth_tx_burst(port, (uint16_t) queueid, m_table, (uint16_t) n); @@ -291,9 +288,9 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) dst_port = l2fwd_dst_ports[portid]; eth = rte_pktmbuf_mtod(m, struct ether_hdr *); - /* 00:09:c0:00:00:xx */ + /* 02:00:00:00:00:xx */ tmp = ð->d_addr.addr_bytes[0]; - *((uint64_t *)tmp) = 0x000000c00900 + (dst_port << 24); + *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); @@ -318,16 +315,16 @@ l2fwd_main_loop(void) lcore_id = rte_lcore_id(); qconf = &lcore_queue_conf[lcore_id]; - if (qconf->n_rx_queue == 0) { + if (qconf->n_rx_port == 0) { RTE_LOG(INFO, L2FWD, "lcore %u has nothing to do\n", lcore_id); while(1); } RTE_LOG(INFO, L2FWD, "entering main loop on lcore %u\n", lcore_id); - for (i = 0; i < qconf->n_rx_queue; i++) { + for (i = 0; i < qconf->n_rx_port; i++) { - portid = qconf->rx_queue_list[i]; + portid = qconf->rx_port_list[i]; RTE_LOG(INFO, L2FWD, " -- lcoreid=%u portid=%u\n", lcore_id, portid); } @@ -342,8 +339,6 @@ l2fwd_main_loop(void) diff_tsc = cur_tsc - prev_tsc; if (unlikely(diff_tsc > BURST_TX_DRAIN)) { - /* this could be optimized (use queueid instead of - * portid), but it is not called so often */ for (portid = 0; portid < L2FWD_MAX_PORTS; portid++) { if (qconf->tx_mbufs[portid].len == 0) continue; @@ -377,9 +372,9 @@ l2fwd_main_loop(void) /* * Read packet from RX queues */ - for (i = 0; i < qconf->n_rx_queue; i++) { + for (i = 0; i < qconf->n_rx_port; i++) { - portid = qconf->rx_queue_list[i]; + portid = qconf->rx_port_list[i]; nb_rx = rte_eth_rx_burst((uint8_t) portid, 0, pkts_burst, MAX_PKT_BURST); @@ -591,10 +586,9 @@ MAIN(int argc, char **argv) struct lcore_queue_conf *qconf; struct rte_eth_dev_info dev_info; int ret; - unsigned int nb_ports, nb_lcores; - unsigned portid, last_port, queueid = 0; + unsigned int nb_ports; + unsigned portid, last_port; unsigned lcore_id, rx_lcore_id; - unsigned n_tx_queue, max_tx_queues; unsigned nb_ports_in_mask = 0; /* init EAL */ @@ -634,8 +628,6 @@ MAIN(int argc, char **argv) if (nb_ports > L2FWD_MAX_PORTS) nb_ports = L2FWD_MAX_PORTS; - nb_lcores = rte_lcore_count(); - /* reset l2fwd_dst_ports */ for (portid = 0; portid < L2FWD_MAX_PORTS; portid++) l2fwd_dst_ports[portid] = 0; @@ -643,9 +635,7 @@ MAIN(int argc, char **argv) /* * Each logical core is assigned a dedicated TX queue on each port. - * Compute the maximum number of TX queues that can be used. */ - max_tx_queues = nb_lcores; for (portid = 0; portid < nb_ports; portid++) { /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) @@ -661,17 +651,13 @@ MAIN(int argc, char **argv) nb_ports_in_mask++; rte_eth_dev_info_get((uint8_t) portid, &dev_info); - if (max_tx_queues > dev_info.max_tx_queues) - max_tx_queues = dev_info.max_tx_queues; } - if (nb_ports_in_mask < 2 || nb_ports_in_mask % 2) { - rte_exit(EXIT_FAILURE, "invalid number of ports in portmask. " - "Should be an even number.\n"); + printf("Notice: odd number of ports in portmask.\n"); + l2fwd_dst_ports[last_port] = last_port; } rx_lcore_id = 0; - n_tx_queue = 0; qconf = NULL; /* Initialize the port/queue configuration of each logical core */ @@ -682,31 +668,24 @@ MAIN(int argc, char **argv) /* get the lcore_id for this port */ while (rte_lcore_is_enabled(rx_lcore_id) == 0 || - lcore_queue_conf[rx_lcore_id].n_rx_queue == + lcore_queue_conf[rx_lcore_id].n_rx_port == l2fwd_rx_queue_per_lcore) { - rx_lcore_id++; if (rx_lcore_id >= RTE_MAX_LCORE) rte_exit(EXIT_FAILURE, "Not enough cores\n"); } - if (qconf != &lcore_queue_conf[rx_lcore_id]) { - if (n_tx_queue == max_tx_queues) - rte_exit(EXIT_FAILURE, - "Not enough TX queues\n"); + + if (qconf != &lcore_queue_conf[rx_lcore_id]) /* Assigned a new logical core in the loop above. */ qconf = &lcore_queue_conf[rx_lcore_id]; - qconf->tx_queue_id = n_tx_queue; - n_tx_queue++; - } - qconf->rx_queue_list[qconf->n_rx_queue] = portid; - qconf->n_rx_queue++; - printf("Lcore %u: RX port %u TX queue %u\n", - rx_lcore_id, portid, qconf->tx_queue_id); + + qconf->rx_port_list[qconf->n_rx_port] = portid; + qconf->n_rx_port++; + printf("Lcore %u: RX port %u\n", rx_lcore_id, portid); } /* Initialise each port */ for (portid = 0; portid < nb_ports; portid++) { - /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) { printf("Skipping disabled port %u\n", portid); @@ -715,15 +694,12 @@ MAIN(int argc, char **argv) /* init port */ printf("Initializing port %u... ", portid); fflush(stdout); - ret = rte_eth_dev_configure((uint8_t) portid, 1, - (uint16_t) n_tx_queue, &port_conf); + ret = rte_eth_dev_configure((uint8_t) portid, 1, 1, &port_conf); if (ret < 0) - rte_exit(EXIT_FAILURE, "Cannot configure device: " - "err=%d, port=%u\n", + rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n", ret, portid); - rte_eth_macaddr_get((uint8_t) portid, - &l2fwd_ports_eth_addr[portid]); + rte_eth_macaddr_get((uint8_t) portid,&l2fwd_ports_eth_addr[portid]); /* init one RX queue */ fflush(stdout); @@ -731,27 +707,21 @@ MAIN(int argc, char **argv) SOCKET0, &rx_conf, l2fwd_pktmbuf_pool); if (ret < 0) - rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: " - "err=%d, port=%u\n", + rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n", ret, portid); /* init one TX queue logical core on each port */ - for (queueid = 0; queueid < n_tx_queue; queueid++) { - fflush(stdout); - ret = rte_eth_tx_queue_setup((uint8_t) portid, - (uint16_t) queueid, nb_txd, - SOCKET0, &tx_conf); - if (ret < 0) - rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: " - "err=%d, port=%u queue=%u\n", - ret, portid, queueid); - } + fflush(stdout); + ret = rte_eth_tx_queue_setup((uint8_t) portid, 0, nb_txd, + SOCKET0, &tx_conf); + if (ret < 0) + rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n", + ret, portid); /* Start device */ ret = rte_eth_dev_start((uint8_t) portid); if (ret < 0) - rte_exit(EXIT_FAILURE, "rte_eth_dev_start: " - "err=%d, port=%u\n", + rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n", ret, portid); printf("done: \n");