/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf = ETH_RSS_IPV4,
+ .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6,
},
},
.txmode = {
+ .mq_mode = ETH_DCB_NONE,
},
};
.wthresh = APP_DEFAULT_NIC_RX_WTHRESH,
},
.rx_free_thresh = APP_DEFAULT_NIC_RX_FREE_THRESH,
+ .rx_drop_en = APP_DEFAULT_NIC_RX_DROP_EN,
};
static struct rte_eth_txconf tx_conf = {
static void
app_init_mbuf_pools(void)
{
- uint32_t socket, lcore;
+ unsigned socket, lcore;
/* Init the buffer pools */
for (socket = 0; socket < APP_MAX_SOCKETS; socket ++) {
static void
app_init_lpm_tables(void)
{
- uint32_t socket, lcore;
+ unsigned socket, lcore;
/* Init the LPM tables */
for (socket = 0; socket < APP_MAX_SOCKETS; socket ++) {
if (ret < 0) {
rte_panic("Unable to add entry %u (%x/%u => %u) to the LPM table on socket %u (%d)\n",
- rule, app.lpm_rules[rule].ip,
- (uint32_t) app.lpm_rules[rule].depth,
- (uint32_t) app.lpm_rules[rule].if_out,
+ (unsigned) rule,
+ (unsigned) app.lpm_rules[rule].ip,
+ (unsigned) app.lpm_rules[rule].depth,
+ (unsigned) app.lpm_rules[rule].if_out,
socket,
ret);
}
static void
app_init_rings_rx(void)
{
- uint32_t lcore;
+ unsigned lcore;
/* Initialize the rings for the RX side */
for (lcore = 0; lcore < APP_MAX_LCORES; lcore ++) {
struct app_lcore_params_io *lp_io = &app.lcore_params[lcore].io;
- uint32_t socket_io, lcore_worker;
+ unsigned socket_io, lcore_worker;
if ((app.lcore_params[lcore].type != e_APP_LCORE_IO) ||
(lp_io->rx.n_nic_queues == 0)) {
static void
app_init_rings_tx(void)
{
- uint32_t lcore;
+ unsigned lcore;
/* Initialize the rings for the TX side */
for (lcore = 0; lcore < APP_MAX_LCORES; lcore ++) {
struct app_lcore_params_worker *lp_worker = &app.lcore_params[lcore].worker;
- uint32_t port;
+ unsigned port;
if (app.lcore_params[lcore].type != e_APP_LCORE_WORKER) {
continue;
socket_io = rte_lcore_to_socket_id(lcore_io);
printf("Creating ring to connect worker lcore %u with TX port %u (through I/O lcore %u) (socket %u) ...\n",
- lcore, port, lcore_io, socket_io);
+ lcore, port, (unsigned)lcore_io, (unsigned)socket_io);
rte_snprintf(name, sizeof(name), "app_ring_tx_s%u_w%u_p%u", socket_io, lcore, port);
ring = rte_ring_create(
name,
for (lcore = 0; lcore < APP_MAX_LCORES; lcore ++) {
struct app_lcore_params_io *lp_io = &app.lcore_params[lcore].io;
- uint32_t i;
+ unsigned i;
if ((app.lcore_params[lcore].type != e_APP_LCORE_IO) ||
(lp_io->tx.n_nic_ports == 0)) {
}
for (i = 0; i < lp_io->tx.n_nic_ports; i ++){
- uint32_t port, j;
+ unsigned port, j;
port = lp_io->tx.nic_ports[i];
for (j = 0; j < app_get_lcores_worker(); j ++) {
}
}
+/* 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)
+{
+#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;
+ struct rte_eth_link link;
+ uint32_t n_rx_queues, n_tx_queues;
+
+ 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++) {
+ if ((port_mask & (1 << portid)) == 0)
+ continue;
+ n_rx_queues = app_get_nic_rx_queues_per_port(portid);
+ n_tx_queues = app.nic_tx_port_mask[portid];
+ if ((n_rx_queues == 0) && (n_tx_queues == 0))
+ continue;
+ memset(&link, 0, sizeof(link));
+ rte_eth_link_get_nowait(portid, &link);
+ /* 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,
+ (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
+ ("full-duplex") : ("half-duplex\n"));
+ else
+ printf("Port %d Link Down\n",
+ (uint8_t)portid);
+ continue;
+ }
+ /* clear all_ports_up flag if any link down */
+ if (link.link_status == 0) {
+ all_ports_up = 0;
+ break;
+ }
+ }
+ /* after finally printing all link status, get out */
+ if (print_flag == 1)
+ break;
+
+ if (all_ports_up == 0) {
+ printf(".");
+ fflush(stdout);
+ rte_delay_ms(CHECK_INTERVAL);
+ }
+
+ /* set the print_flag if all ports up or timeout */
+ if (all_ports_up == 1 || count == (MAX_CHECK_TIME - 1)) {
+ print_flag = 1;
+ printf("done\n");
+ }
+ }
+}
+
static void
app_init_nics(void)
{
- uint32_t socket, lcore;
- uint8_t port, queue;
+ unsigned socket;
+ uint32_t lcore;
+ uint8_t port, queue;
int ret;
+ uint32_t n_rx_queues, n_tx_queues;
/* Init driver */
printf("Initializing the PMD driver ...\n");
/* Init NIC ports and queues, then start the ports */
for (port = 0; port < APP_MAX_NIC_PORTS; port ++) {
- struct rte_eth_link link;
struct rte_mempool *pool;
- uint32_t n_rx_queues, n_tx_queues;
n_rx_queues = app_get_nic_rx_queues_per_port(port);
n_tx_queues = app.nic_tx_port_mask[port];
}
/* Init port */
- printf("Initializing NIC port %u ...\n", (uint32_t) port);
+ printf("Initializing NIC port %u ...\n", (unsigned) port);
ret = rte_eth_dev_configure(
port,
(uint8_t) n_rx_queues,
(uint8_t) n_tx_queues,
&port_conf);
if (ret < 0) {
- rte_panic("Cannot init NIC port %u (%d)\n", (uint32_t) port, ret);
+ rte_panic("Cannot init NIC port %u (%d)\n", (unsigned) port, ret);
}
rte_eth_promiscuous_enable(port);
pool = app.lcore_params[lcore].pool;
printf("Initializing NIC port %u RX queue %u ...\n",
- (uint32_t) port,
- (uint32_t) queue);
+ (unsigned) port,
+ (unsigned) queue);
ret = rte_eth_rx_queue_setup(
port,
queue,
pool);
if (ret < 0) {
rte_panic("Cannot init RX queue %u for port %u (%d)\n",
- (uint32_t) queue,
- (uint32_t) port,
+ (unsigned) queue,
+ (unsigned) port,
ret);
}
}
app_get_lcore_for_nic_tx(port, &lcore);
socket = rte_lcore_to_socket_id(lcore);
printf("Initializing NIC port %u TX queue 0 ...\n",
- (uint32_t) port);
+ (unsigned) port);
ret = rte_eth_tx_queue_setup(
port,
0,
if (ret < 0) {
rte_panic("Cannot start port %d (%d)\n", port, ret);
}
-
- /* Get link status */
- rte_eth_link_get(port, &link);
- if (link.link_status) {
- printf("Port %u is UP (%u Mbps)\n",
- (uint32_t) port,
- (unsigned) link.link_speed);
- } else {
- printf("Port %u is DOWN\n",
- (uint32_t) port);
- }
}
+
+ check_all_ports_link_status(APP_MAX_NIC_PORTS, (~0x0));
}
void
git.droids-corp.org / dpdk.git / blobdiff