@@ -739,6 +739,18 @@ check_all_ports_link_status(uint32_t port_mask)
}
}
+static void
+stop_and_close_eth_dev(uint16_t portid)
+{
+ RTE_ETH_FOREACH_DEV(portid) {
+ printf("Closing port %d...", portid);
+ rte_eth_dev_stop(portid);
+ rte_eth_dev_close(portid);
+ printf(" Done\n");
+ }
+ rte_eal_cleanup();
+}
+
int
main(int argc, char **argv)
{
@@ -749,7 +761,8 @@ main(int argc, char **argv)
char name[RTE_JOBSTATS_NAMESIZE];
uint16_t nb_ports;
uint16_t nb_ports_available = 0;
- uint16_t portid, last_port;
+ uint16_t portid = 0;
+ uint16_t last_port;
uint8_t i;
/* init EAL */
@@ -761,8 +774,10 @@ main(int argc, char **argv)
/* parse application arguments (after the EAL ones) */
ret = l2fwd_parse_args(argc, argv);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "Invalid L2FWD arguments\n");
+ }
rte_timer_subsystem_init();
@@ -773,12 +788,16 @@ main(int argc, char **argv)
l2fwd_pktmbuf_pool =
rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
- if (l2fwd_pktmbuf_pool == NULL)
+ if (l2fwd_pktmbuf_pool == NULL) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
+ }
nb_ports = rte_eth_dev_count_avail();
- if (nb_ports == 0)
+ if (nb_ports == 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
+ }
/* reset l2fwd_dst_ports */
for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
@@ -820,8 +839,10 @@ main(int argc, char **argv)
lcore_queue_conf[rx_lcore_id].n_rx_port ==
l2fwd_rx_queue_per_lcore) {
rx_lcore_id++;
- if (rx_lcore_id >= RTE_MAX_LCORE)
+ if (rx_lcore_id >= RTE_MAX_LCORE) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "Not enough cores\n");
+ }
}
if (qconf != &lcore_queue_conf[rx_lcore_id])
@@ -852,32 +873,40 @@ main(int argc, char **argv)
fflush(stdout);
ret = rte_eth_dev_info_get(portid, &dev_info);
- if (ret != 0)
+ if (ret != 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"Error during getting device (port %u) info: %s\n",
portid, strerror(-ret));
+ }
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)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
ret, portid);
+ }
ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd,
&nb_txd);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"Cannot adjust number of descriptors: err=%d, port=%u\n",
ret, portid);
+ }
ret = rte_eth_macaddr_get(portid,
&l2fwd_ports_eth_addr[portid]);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"Cannot get MAC address: err=%d, port=%u\n",
ret, portid);
+ }
/* init one RX queue */
fflush(stdout);
@@ -887,9 +916,11 @@ main(int argc, char **argv)
rte_eth_dev_socket_id(portid),
&rxq_conf,
l2fwd_pktmbuf_pool);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
ret, portid);
+ }
/* init one TX queue on each port */
txq_conf = dev_info.default_txconf;
@@ -898,39 +929,48 @@ main(int argc, char **argv)
ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
rte_eth_dev_socket_id(portid),
&txq_conf);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"rte_eth_tx_queue_setup:err=%d, port=%u\n",
ret, 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)
+ if (tx_buffer[portid] == NULL) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
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)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"Cannot set error callback for tx buffer on port %u\n",
portid);
+ }
/* Start device */
ret = rte_eth_dev_start(portid);
- if (ret < 0)
+ if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n",
ret, portid);
+ }
printf("done:\n");
ret = rte_eth_promiscuous_enable(portid);
if (ret != 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"rte_eth_promiscuous_enable:err=%s, port=%u\n",
rte_strerror(-ret), portid);
@@ -952,6 +992,7 @@ main(int argc, char **argv)
}
if (!nb_ports_available) {
+ stop_and_close_eth_dev(portid);
rte_exit(EXIT_FAILURE,
"All available ports are disabled. Please set portmask.\n");
}
@@ -965,8 +1006,10 @@ main(int argc, char **argv)
rte_spinlock_init(&qconf->lock);
- if (rte_jobstats_context_init(&qconf->jobs_context) != 0)
+ if (rte_jobstats_context_init(&qconf->jobs_context) != 0) {
+ stop_and_close_eth_dev(portid);
rte_panic("Jobs stats context for core %u init failed\n", lcore_id);
+ }
if (qconf->n_rx_port == 0) {
RTE_LOG(INFO, L2FWD,
@@ -985,6 +1028,7 @@ main(int argc, char **argv)
lcore_id, &l2fwd_flush_job, NULL);
if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(1, "Failed to reset flush job timer for lcore %u: %s",
lcore_id, rte_strerror(-ret));
}
@@ -1007,6 +1051,7 @@ main(int argc, char **argv)
&l2fwd_fwd_job, (void *)(uintptr_t)i);
if (ret < 0) {
+ stop_and_close_eth_dev(portid);
rte_exit(1, "Failed to reset lcore %u port %u job timer: %s",
lcore_id, qconf->rx_port_list[i], rte_strerror(-ret));
}