X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmulti_process%2Fl2fwd_fork%2Fmain.c;h=6b130f2f5dd29df71ae6dff2b89b5fdf2a23ba62;hb=a9dbe1802226;hp=a34f420bbc86c5ce4b449242777a91b94eab4c6c;hpb=e5ffdd1457c0fb4e8365f524ee2529ac726edcf3;p=dpdk.git diff --git a/examples/multi_process/l2fwd_fork/main.c b/examples/multi_process/l2fwd_fork/main.c index a34f420bbc..6b130f2f5d 100644 --- a/examples/multi_process/l2fwd_fork/main.c +++ b/examples/multi_process/l2fwd_fork/main.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation */ #define _GNU_SOURCE #include @@ -51,10 +22,7 @@ #include #include #include -#include -#include #include -#include #include #include #include @@ -64,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -74,12 +41,11 @@ #include #include -#include "main.h" #include "flib.h" #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1 #define MBUF_NAME "mbuf_pool_%d" -#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) +#define MBUF_DATA_SIZE RTE_MBUF_DEFAULT_BUF_SIZE #define NB_MBUF 8192 #define RING_MASTER_NAME "l2fwd_ring_m2s_" #define RING_SLAVE_NAME "l2fwd_ring_s2m_" @@ -96,33 +62,14 @@ enum l2fwd_cmd{ CMD_STOP, }; -/* - * RX and TX Prefetch, Host, and Write-back threshold values should be - * carefully set for optimal performance. Consult the network - * controller's datasheet and supporting DPDK documentation for guidance - * on how these parameters should be set. - */ -#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */ -#define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */ -#define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */ - -/* - * These default values are optimized for use with the Intel(R) 82599 10 GbE - * Controller and the DPDK ixgbe PMD. Consider using other values for other - * network controllers and/or network drivers. - */ -#define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */ -#define TX_HTHRESH 0 /**< Default values of TX host threshold reg. */ -#define TX_WTHRESH 0 /**< Default values of TX write-back threshold reg. */ - #define MAX_PKT_BURST 32 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */ /* * Configurable number of RX/TX ring descriptors */ -#define RTE_TEST_RX_DESC_DEFAULT 128 -#define RTE_TEST_TX_DESC_DEFAULT 512 +#define RTE_TEST_RX_DESC_DEFAULT 1024 +#define RTE_TEST_TX_DESC_DEFAULT 1024 static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; @@ -147,25 +94,26 @@ struct mbuf_table { struct lcore_queue_conf { unsigned n_rx_port; unsigned rx_port_list[MAX_RX_QUEUE_PER_LCORE]; - struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS]; - } __rte_cache_aligned; struct lcore_queue_conf lcore_queue_conf[RTE_MAX_LCORE]; +struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS]; + struct lcore_resource_struct { int enabled; /* Only set in case this lcore involved into packet forwarding */ int flags; /* Set only slave need to restart or recreate */ unsigned lcore_id; /* lcore ID */ unsigned pair_id; /* dependency lcore ID on port */ - char ring_name[2][MAX_NAME_LEN]; + char ring_name[2][MAX_NAME_LEN]; /* ring[0] for master send cmd, slave read */ /* ring[1] for slave send ack, master read */ - struct rte_ring *ring[2]; + struct rte_ring *ring[2]; int port_num; /* Total port numbers */ - uint8_t port[RTE_MAX_ETHPORTS]; /* Port id for that lcore to receive packets */ + /* Port id for that lcore to receive packets */ + uint16_t port[RTE_MAX_ETHPORTS]; }__attribute__((packed)) __rte_cache_aligned; -static struct lcore_resource_struct lcore_resource[RTE_MAX_LCORE]; +static struct lcore_resource_struct lcore_resource[RTE_MAX_LCORE]; static struct rte_mempool *message_pool; static rte_spinlock_t res_lock = RTE_SPINLOCK_INITIALIZER; /* use floating processes */ @@ -179,36 +127,14 @@ struct cpu_aff_arg{ static const struct rte_eth_conf port_conf = { .rxmode = { .split_hdr_size = 0, - .header_split = 0, /**< Header Split disabled */ - .hw_ip_checksum = 0, /**< IP checksum offload disabled */ - .hw_vlan_filter = 0, /**< VLAN filtering disabled */ - .jumbo_frame = 0, /**< Jumbo Frame Support disabled */ - .hw_strip_crc = 0, /**< CRC stripped by hardware */ + .ignore_offload_bitfield = 1, + .offloads = DEV_RX_OFFLOAD_CRC_STRIP, }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, }, }; -static const struct rte_eth_rxconf rx_conf = { - .rx_thresh = { - .pthresh = RX_PTHRESH, - .hthresh = RX_HTHRESH, - .wthresh = RX_WTHRESH, - }, -}; - -static const struct rte_eth_txconf tx_conf = { - .tx_thresh = { - .pthresh = TX_PTHRESH, - .hthresh = TX_HTHRESH, - .wthresh = TX_WTHRESH, - }, - .tx_free_thresh = 0, /* Use PMD default values */ - .tx_rs_thresh = 0, /* Use PMD default values */ - .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS | ETH_TXQ_FLAGS_NOOFFLOADS, -}; - static struct rte_mempool * l2fwd_pktmbuf_pool[RTE_MAX_ETHPORTS]; /* Per-port statistics struct */ @@ -309,8 +235,8 @@ get_cpu_affinity(void) } /** - * This fnciton demonstrates the approach to create ring in first instance - * or re-attach an existed ring in later instance. + * This fnciton demonstrates the approach to create ring in first instance + * or re-attach an existed ring in later instance. **/ static struct rte_ring * create_ring(const char *name, unsigned count, @@ -320,7 +246,7 @@ create_ring(const char *name, unsigned count, if (name == NULL) return NULL; - + /* If already create, just attached it */ if (likely((ring = rte_ring_lookup(name)) != NULL)) return ring; @@ -330,7 +256,7 @@ create_ring(const char *name, unsigned count, } /* Malloc with rte_malloc on structures that shared by master and slave */ -static int +static int l2fwd_malloc_shared_struct(void) { port_statistics = rte_zmalloc("port_stat", @@ -355,36 +281,36 @@ l2fwd_malloc_shared_struct(void) } /* Create ring which used for communicate among master and slave */ -static int +static int create_ms_ring(unsigned slaveid) { unsigned flag = RING_F_SP_ENQ | RING_F_SC_DEQ; struct lcore_resource_struct *res = &lcore_resource[slaveid]; unsigned socketid = rte_socket_id(); - + /* Always assume create ring on master socket_id */ /* Default only create a ring size 32 */ snprintf(res->ring_name[0], MAX_NAME_LEN, "%s%u", RING_MASTER_NAME, slaveid); - if ((res->ring[0] = create_ring(res->ring_name[0], NB_CORE_MSGBUF, + if ((res->ring[0] = create_ring(res->ring_name[0], NB_CORE_MSGBUF, socketid, flag)) == NULL) { printf("Create m2s ring %s failed\n", res->ring_name[0]); return -1; } - + snprintf(res->ring_name[1], MAX_NAME_LEN, "%s%u", RING_SLAVE_NAME, slaveid); - if ((res->ring[1] = create_ring(res->ring_name[1], NB_CORE_MSGBUF, + if ((res->ring[1] = create_ring(res->ring_name[1], NB_CORE_MSGBUF, socketid, flag)) == NULL) { printf("Create s2m ring %s failed\n", res->ring_name[1]); return -1; - } + } return 0; } /* send command to pair in paired master and slave ring */ -static inline int +static inline int sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master) { struct lcore_resource_struct *res = &lcore_resource[slaveid]; @@ -394,10 +320,10 @@ sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master) /* Only check master, it must be enabled and running if it is slave */ if (is_master && !res->enabled) return -1; - + if (res->ring[fd] == NULL) - return -1; - + return -1; + if (rte_mempool_get(message_pool, &msg) < 0) { printf("Error to get message buffer\n"); return -1; @@ -410,7 +336,7 @@ sendcmd(unsigned slaveid, enum l2fwd_cmd cmd, int is_master) rte_mempool_put(message_pool, msg); return -1; } - + return 0; } @@ -439,7 +365,7 @@ getcmd(unsigned slaveid, enum l2fwd_cmd *cmd, int is_master) } /* Master send command to slave and wait until ack received or error met */ -static int +static int master_sendcmd_with_ack(unsigned slaveid, enum l2fwd_cmd cmd) { enum l2fwd_cmd ack_cmd; @@ -465,7 +391,7 @@ master_sendcmd_with_ack(unsigned slaveid, enum l2fwd_cmd cmd) } /* restart all port that assigned to that slave lcore */ -static int +static int reset_slave_all_ports(unsigned slaveid) { struct lcore_resource_struct *slave = &lcore_resource[slaveid]; @@ -479,12 +405,13 @@ reset_slave_all_ports(unsigned slaveid) rte_eth_dev_stop(slave->port[i]); snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, slave->port[i]); pool = rte_mempool_lookup(buf_name); - if (pool) - printf("Port %d mempool free object is %u(%u)\n", slave->port[i], - rte_mempool_count(pool), (unsigned)NB_MBUF); + if (pool) + printf("Port %d mempool free object is %u(%u)\n", slave->port[i], + rte_mempool_avail_count(pool), + (unsigned int)NB_MBUF); else printf("Can't find mempool %s\n", buf_name); - + printf("Start port :%d\n", slave->port[i]); ret = rte_eth_dev_start(slave->port[i]); if (ret != 0) @@ -493,7 +420,7 @@ reset_slave_all_ports(unsigned slaveid) return ret; } -static int +static int reset_shared_structures(unsigned slaveid) { int ret; @@ -503,18 +430,18 @@ reset_shared_structures(unsigned slaveid) return ret; } -/** - * Call this function to re-create resource that needed for slave process that +/** + * Call this function to re-create resource that needed for slave process that * exited in last instance **/ -static int +static int init_slave_res(unsigned slaveid) { struct lcore_resource_struct *slave = &lcore_resource[slaveid]; enum l2fwd_cmd cmd; - + if (!slave->enabled) { - printf("Something wrong with lcore=%u enabled=%d\n",slaveid, + printf("Something wrong with lcore=%u enabled=%d\n",slaveid, slave->enabled); return -1; } @@ -531,7 +458,7 @@ init_slave_res(unsigned slaveid) return 0; } -static int +static int recreate_one_slave(unsigned slaveid) { int ret = 0; @@ -539,12 +466,12 @@ recreate_one_slave(unsigned slaveid) if ((ret = init_slave_res(slaveid)) != 0) { printf("Init slave=%u failed\n", slaveid); return ret; - } - + } + if ((ret = flib_remote_launch(l2fwd_launch_one_lcore, NULL, slaveid)) != 0) printf("Launch slave %u failed\n", slaveid); - + return ret; } @@ -604,7 +531,7 @@ back: return ret; } -static void +static void slave_exit_cb(unsigned slaveid, __attribute__((unused))int stat) { struct lcore_resource_struct *slave = &lcore_resource[slaveid]; @@ -622,58 +549,14 @@ slave_exit_cb(unsigned slaveid, __attribute__((unused))int stat) rte_spinlock_unlock(&res_lock); } -/* Send the packet on an output interface */ -static int -l2fwd_send_burst(struct lcore_queue_conf *qconf, unsigned n, uint8_t port) -{ - struct rte_mbuf **m_table; - unsigned ret; - unsigned queueid =0; - - 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); - port_statistics[port].tx += ret; - if (unlikely(ret < n)) { - port_statistics[port].dropped += (n - ret); - do { - rte_pktmbuf_free(m_table[ret]); - } while (++ret < n); - } - - return 0; -} - -/* Send the packet on an output interface */ -static int -l2fwd_send_packet(struct rte_mbuf *m, uint8_t port) -{ - unsigned lcore_id, len; - struct lcore_queue_conf *qconf; - - lcore_id = rte_lcore_id(); - - qconf = &lcore_queue_conf[lcore_id]; - len = qconf->tx_mbufs[port].len; - qconf->tx_mbufs[port].m_table[len] = m; - len++; - - /* enough pkts to be sent */ - if (unlikely(len == MAX_PKT_BURST)) { - l2fwd_send_burst(qconf, MAX_PKT_BURST, port); - len = 0; - } - - qconf->tx_mbufs[port].len = len; - return 0; -} - static void l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) { struct ether_hdr *eth; void *tmp; unsigned dst_port; + int sent; + struct rte_eth_dev_tx_buffer *buffer; dst_port = l2fwd_dst_ports[portid]; eth = rte_pktmbuf_mtod(m, struct ether_hdr *); @@ -685,7 +568,10 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) /* src addr */ ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); - l2fwd_send_packet(m, (uint8_t) dst_port); + buffer = tx_buffer[dst_port]; + sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); + if (sent) + port_statistics[dst_port].tx += sent; } /* main processing loop */ @@ -694,12 +580,15 @@ l2fwd_main_loop(void) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mbuf *m; + int sent; unsigned lcore_id; uint64_t prev_tsc, diff_tsc, cur_tsc; unsigned i, j, portid, nb_rx; struct lcore_queue_conf *qconf; - const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US; - + const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * + BURST_TX_DRAIN_US; + struct rte_eth_dev_tx_buffer *buffer; + prev_tsc = 0; lcore_id = rte_lcore_id(); @@ -729,23 +618,27 @@ l2fwd_main_loop(void) /* If get stop command, stop forwarding and exit */ if (cmd == CMD_STOP) { return; - } + } } - + /* * TX burst queue drain */ diff_tsc = cur_tsc - prev_tsc; if (unlikely(diff_tsc > drain_tsc)) { - for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) { - if (qconf->tx_mbufs[portid].len == 0) - continue; - l2fwd_send_burst(&lcore_queue_conf[lcore_id], - qconf->tx_mbufs[portid].len, - (uint8_t) portid); - qconf->tx_mbufs[portid].len = 0; + for (i = 0; i < qconf->n_rx_port; i++) { + + portid = l2fwd_dst_ports[qconf->rx_port_list[i]]; + buffer = tx_buffer[portid]; + + sent = rte_eth_tx_buffer_flush(portid, 0, buffer); + if (sent) + port_statistics[portid].tx += sent; + } + + prev_tsc = cur_tsc; } /* @@ -877,7 +770,7 @@ l2fwd_parse_args(int argc, char **argv) {NULL, 0, 0, 0} }; int has_pmask = 0; - + argvopt = argv; while ((opt = getopt_long(argc, argvopt, "p:q:T:f", @@ -919,7 +812,7 @@ l2fwd_parse_args(int argc, char **argv) case 'f': float_proc = 1; break; - + /* long options */ case 0: l2fwd_usage(prgname); @@ -939,24 +832,25 @@ l2fwd_parse_args(int argc, char **argv) return -1; } ret = optind-1; - optind = 0; /* reset getopt lib */ + optind = 1; /* reset getopt lib */ return ret; } /* Check the link status of all ports in up to 9s, and print them finally */ static void -check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) +check_all_ports_link_status(uint32_t port_mask) { #define CHECK_INTERVAL 100 /* 100ms */ #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */ - uint8_t portid, count, all_ports_up, print_flag = 0; + uint16_t portid; + uint8_t count, all_ports_up, print_flag = 0; struct rte_eth_link link; printf("\nChecking link status"); fflush(stdout); for (count = 0; count <= MAX_CHECK_TIME; count++) { all_ports_up = 1; - for (portid = 0; portid < port_num; portid++) { + RTE_ETH_FOREACH_DEV(portid) { if ((port_mask & (1 << portid)) == 0) continue; memset(&link, 0, sizeof(link)); @@ -964,18 +858,17 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) /* print link status if flag set */ if (print_flag == 1) { if (link.link_status) - printf("Port %d Link Up - speed %u " - "Mbps - %s\n", (uint8_t)portid, - (unsigned)link.link_speed, + printf( + "Port%d Link Up- speed %u Mbps- %s\n", + portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? ("full-duplex") : ("half-duplex\n")); else - printf("Port %d Link Down\n", - (uint8_t)portid); + printf("Port %d Link Down\n", portid); continue; } /* clear all_ports_up flag if any link down */ - if (link.link_status == 0) { + if (link.link_status == ETH_LINK_DOWN) { all_ports_up = 0; break; } @@ -999,18 +892,16 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; - struct rte_eth_dev_info dev_info; int ret; - uint8_t nb_ports; - uint8_t nb_ports_available; - uint8_t portid, last_port; + uint16_t nb_ports; + uint16_t nb_ports_available = 0; + uint16_t portid, last_port; unsigned rx_lcore_id; unsigned nb_ports_in_mask = 0; unsigned i; - int flags = 0; uint64_t prev_tsc, diff_tsc, cur_tsc, timer_tsc; /* Save cpu_affinity first, restore it in case it's floating process option */ @@ -1038,7 +929,7 @@ MAIN(int argc, char **argv) rte_exit(EXIT_FAILURE, "flib init error"); /** - * Allocated structures that slave lcore would change. For those that slaves are + * Allocated structures that slave lcore would change. For those that slaves are * read only, needn't use malloc to share and global or static variables is ok since * slave inherit all the knowledge that master initialized. **/ @@ -1049,34 +940,23 @@ MAIN(int argc, char **argv) memset(lcore_resource, 0, sizeof(lcore_resource)); for (i = 0; i < RTE_MAX_LCORE; i++) lcore_resource[i].lcore_id = i; - - if (rte_eal_pci_probe() < 0) - rte_exit(EXIT_FAILURE, "Cannot probe PCI\n"); nb_ports = rte_eth_dev_count(); if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); - if (nb_ports > RTE_MAX_ETHPORTS) - nb_ports = RTE_MAX_ETHPORTS; - /* create the mbuf pool */ - for (portid = 0; portid < nb_ports; portid++) { + RTE_ETH_FOREACH_DEV(portid) { /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) - continue; + continue; char buf_name[RTE_MEMPOOL_NAMESIZE]; - flags = MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET; snprintf(buf_name, RTE_MEMPOOL_NAMESIZE, MBUF_NAME, portid); l2fwd_pktmbuf_pool[portid] = - rte_mempool_create(buf_name, NB_MBUF, - MBUF_SIZE, 32, - sizeof(struct rte_pktmbuf_pool_private), - rte_pktmbuf_pool_init, NULL, - rte_pktmbuf_init, NULL, - rte_socket_id(), flags); + rte_pktmbuf_pool_create(buf_name, NB_MBUF, 32, + 0, MBUF_DATA_SIZE, rte_socket_id()); if (l2fwd_pktmbuf_pool[portid] == NULL) - rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n"); + rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n"); printf("Create mbuf %s\n", buf_name); } @@ -1089,7 +969,7 @@ MAIN(int argc, char **argv) /* * Each logical core is assigned a dedicated TX queue on each port. */ - for (portid = 0; portid < nb_ports; portid++) { + RTE_ETH_FOREACH_DEV(portid) { /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) continue; @@ -1102,8 +982,6 @@ MAIN(int argc, char **argv) last_port = portid; nb_ports_in_mask++; - - rte_eth_dev_info_get(portid, &dev_info); } if (nb_ports_in_mask % 2) { printf("Notice: odd number of ports in portmask.\n"); @@ -1114,7 +992,7 @@ MAIN(int argc, char **argv) qconf = NULL; /* Initialize the port/queue configuration of each logical core */ - for (portid = 0; portid < nb_ports; portid++) { + RTE_ETH_FOREACH_DEV(portid) { struct lcore_resource_struct *res; /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) @@ -1123,7 +1001,7 @@ MAIN(int argc, char **argv) /* get the lcore_id for this port */ /* skip master lcore */ while (rte_lcore_is_enabled(rx_lcore_id) == 0 || - rte_get_master_lcore() == rx_lcore_id || + rte_get_master_lcore() == rx_lcore_id || lcore_queue_conf[rx_lcore_id].n_rx_port == l2fwd_rx_queue_per_lcore) { @@ -1143,34 +1021,50 @@ MAIN(int argc, char **argv) res = &lcore_resource[rx_lcore_id]; res->enabled = 1; res->port[res->port_num++] = portid; - + printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned) portid); } - nb_ports_available = nb_ports; - /* Initialise each port */ - for (portid = 0; portid < nb_ports; portid++) { + RTE_ETH_FOREACH_DEV(portid) { + struct rte_eth_rxconf rxq_conf; + struct rte_eth_txconf txq_conf; + struct rte_eth_conf local_port_conf = port_conf; + /* skip ports that are not enabled */ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) { printf("Skipping disabled port %u\n", (unsigned) portid); - nb_ports_available--; continue; } + nb_ports_available++; /* init port */ printf("Initializing port %u... ", (unsigned) portid); fflush(stdout); - ret = rte_eth_dev_configure(portid, 1, 1, &port_conf); + rte_eth_dev_info_get(portid, &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; + ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf); if (ret < 0) rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n", ret, (unsigned) portid); + ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd, + &nb_txd); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%u\n", + ret, (unsigned) portid); + rte_eth_macaddr_get(portid,&l2fwd_ports_eth_addr[portid]); /* init one RX queue */ fflush(stdout); + rxq_conf = dev_info.default_rxconf; + rxq_conf.offloads = local_port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd, - rte_eth_dev_socket_id(portid), &rx_conf, + rte_eth_dev_socket_id(portid), + &rxq_conf, l2fwd_pktmbuf_pool[portid]); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n", @@ -1178,12 +1072,33 @@ MAIN(int argc, char **argv) /* init one TX queue on each port */ fflush(stdout); + txq_conf = dev_info.default_txconf; + txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE; + txq_conf.tx_offloads = local_port_conf.txmode.offloads; ret = rte_eth_tx_queue_setup(portid, 0, nb_txd, - rte_eth_dev_socket_id(portid), &tx_conf); + rte_eth_dev_socket_id(portid), + &txq_conf); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n", ret, (unsigned) portid); + /* Initialize TX buffers */ + tx_buffer[portid] = rte_zmalloc_socket("tx_buffer", + RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0, + rte_eth_dev_socket_id(portid)); + if (tx_buffer[portid] == NULL) + rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n", + (unsigned) portid); + + rte_eth_tx_buffer_init(tx_buffer[portid], MAX_PKT_BURST); + + ret = rte_eth_tx_buffer_set_err_callback(tx_buffer[portid], + rte_eth_tx_buffer_count_callback, + &port_statistics[portid].dropped); + if (ret < 0) + rte_exit(EXIT_FAILURE, "Cannot set error callback for " + "tx buffer on port %u\n", (unsigned) portid); + /* Start device */ ret = rte_eth_dev_start(portid); if (ret < 0) @@ -1212,18 +1127,18 @@ MAIN(int argc, char **argv) "All available ports are disabled. Please set portmask.\n"); } - check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask); + check_all_ports_link_status(l2fwd_enabled_port_mask); /* Record pair lcore */ /** - * Since l2fwd example would create pair between different neighbour port, that's + * Since l2fwd example would create pair between different neighbour port, that's * port 0 receive and forward to port 1, the same to port 1, these 2 ports will have * dependency. If one port stopped working (killed, for example), the port need to * be stopped/started again. During the time, another port need to wait until stop/start * procedure completed. So, record the pair relationship for those lcores working - * on ports. + * on ports. **/ - for (portid = 0; portid < nb_ports; portid++) { + RTE_ETH_FOREACH_DEV(portid) { uint32_t pair_port; unsigned lcore = 0, pair_lcore = 0; unsigned j, find_lcore, find_pair_lcore; @@ -1239,12 +1154,12 @@ MAIN(int argc, char **argv) continue; for (j = 0; j < lcore_queue_conf[i].n_rx_port;j++) { if (lcore_queue_conf[i].rx_port_list[j] == portid) { - lcore = i; + lcore = i; find_lcore = 1; break; } if (lcore_queue_conf[i].rx_port_list[j] == pair_port) { - pair_lcore = i; + pair_lcore = i; find_pair_lcore = 1; break; } @@ -1261,21 +1176,18 @@ MAIN(int argc, char **argv) } /* Create message buffer for all master and slave */ - message_pool = rte_mempool_create("ms_msg_pool", + message_pool = rte_mempool_create("ms_msg_pool", NB_CORE_MSGBUF * RTE_MAX_LCORE, sizeof(enum l2fwd_cmd), NB_CORE_MSGBUF / 2, - 0, - rte_pktmbuf_pool_init, NULL, - rte_pktmbuf_init, NULL, - rte_socket_id(), 0); + 0, NULL, NULL, NULL, NULL, rte_socket_id(), 0); if (message_pool == NULL) rte_exit(EXIT_FAILURE, "Create msg mempool failed\n"); /* Create ring for each master and slave pair, also register cb when slave leaves */ for (i = 0; i < RTE_MAX_LCORE; i++) { - /** - * Only create ring and register slave_exit cb in case that core involved into + /** + * Only create ring and register slave_exit cb in case that core involved into * packet forwarding **/ if (lcore_resource[i].enabled) { @@ -1287,7 +1199,7 @@ MAIN(int argc, char **argv) if (flib_register_slave_exit_notify(i, slave_exit_cb) != 0) - rte_exit(EXIT_FAILURE, + rte_exit(EXIT_FAILURE, "Register master_trace_slave_exit failed"); } } @@ -1304,19 +1216,19 @@ MAIN(int argc, char **argv) diff_tsc = cur_tsc - prev_tsc; /* if timer is enabled */ if (timer_period > 0) { - + /* advance the timer */ timer_tsc += diff_tsc; - + /* if timer has reached its timeout */ if (unlikely(timer_tsc >= (uint64_t) timer_period)) { - + print_stats(); /* reset the timer */ timer_tsc = 0; } } - + prev_tsc = cur_tsc; /* Check any slave need restart or recreate */