#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
-#include <rte_atomic.h>
#include <rte_lcore.h>
#include <rte_branch_prediction.h>
#include <rte_interrupts.h>
static int kni_config_network_interface(uint16_t port_id, uint8_t if_up);
static int kni_config_mac_address(uint16_t port_id, uint8_t mac_addr[]);
-static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0);
-static rte_atomic32_t kni_pause = RTE_ATOMIC32_INIT(0);
+static uint32_t kni_stop;
+static uint32_t kni_pause;
/* Print out statistics on packets handled */
static void
if (signum == SIGRTMIN || signum == SIGINT || signum == SIGTERM) {
printf("\nSIGRTMIN/SIGINT/SIGTERM received. "
"KNI processing stopping.\n");
- rte_atomic32_inc(&kni_stop);
+ __atomic_fetch_add(&kni_stop, 1, __ATOMIC_RELAXED);
return;
}
}
kni_port_params_array[i]->lcore_rx,
kni_port_params_array[i]->port_id);
while (1) {
- f_stop = rte_atomic32_read(&kni_stop);
- f_pause = rte_atomic32_read(&kni_pause);
+ f_stop = __atomic_load_n(&kni_stop, __ATOMIC_RELAXED);
+ f_pause = __atomic_load_n(&kni_pause, __ATOMIC_RELAXED);
if (f_stop)
break;
if (f_pause)
kni_port_params_array[i]->lcore_tx,
kni_port_params_array[i]->port_id);
while (1) {
- f_stop = rte_atomic32_read(&kni_stop);
- f_pause = rte_atomic32_read(&kni_pause);
+ f_stop = __atomic_load_n(&kni_stop, __ATOMIC_RELAXED);
+ f_pause = __atomic_load_n(&kni_pause, __ATOMIC_RELAXED);
if (f_stop)
break;
if (f_pause)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[RTE_ETH_LINK_MAX_STR_LEN];
printf("\nChecking link status\n");
fflush(stdout);
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up - speed %uMbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text,
+ sizeof(link_status_text), &link);
+ printf("Port %d %s\n", portid,
+ link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
static void
log_link_state(struct rte_kni *kni, int prev, struct rte_eth_link *link)
{
+ char link_status_text[RTE_ETH_LINK_MAX_STR_LEN];
if (kni == NULL || link == NULL)
return;
- if (prev == ETH_LINK_DOWN && link->link_status == ETH_LINK_UP) {
- RTE_LOG(INFO, APP, "%s NIC Link is Up %d Mbps %s %s.\n",
+ rte_eth_link_to_str(link_status_text, sizeof(link_status_text), link);
+ if (prev != link->link_status)
+ RTE_LOG(INFO, APP, "%s NIC %s",
rte_kni_get_name(kni),
- link->link_speed,
- link->link_autoneg ? "(AutoNeg)" : "(Fixed)",
- link->link_duplex ? "Full Duplex" : "Half Duplex");
- } else if (prev == ETH_LINK_UP && link->link_status == ETH_LINK_DOWN) {
- RTE_LOG(INFO, APP, "%s NIC Link is Down.\n",
- rte_kni_get_name(kni));
- }
+ link_status_text);
}
/*
RTE_LOG(INFO, APP, "Change MTU of port %d to %u\n", port_id, new_mtu);
/* Stop specific port */
- rte_eth_dev_stop(port_id);
+ ret = rte_eth_dev_stop(port_id);
+ if (ret != 0) {
+ RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
+ port_id, rte_strerror(-ret));
+ return ret;
+ }
memcpy(&conf, &port_conf, sizeof(conf));
/* Set new MTU */
{
int ret;
- rte_atomic32_inc(&kni_pause);
+ __atomic_fetch_add(&kni_pause, 1, __ATOMIC_RELAXED);
ret = kni_change_mtu_(port_id, new_mtu);
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
return ret;
}
RTE_LOG(INFO, APP, "Configure network interface of %d %s\n",
port_id, if_up ? "up" : "down");
- rte_atomic32_inc(&kni_pause);
+ __atomic_fetch_add(&kni_pause, 1, __ATOMIC_RELAXED);
if (if_up != 0) { /* Configure network interface up */
- rte_eth_dev_stop(port_id);
+ ret = rte_eth_dev_stop(port_id);
+ if (ret != 0) {
+ RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
+ port_id, rte_strerror(-ret));
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
+ return ret;
+ }
ret = rte_eth_dev_start(port_id);
- } else /* Configure network interface down */
- rte_eth_dev_stop(port_id);
+ } else { /* Configure network interface down */
+ ret = rte_eth_dev_stop(port_id);
+ if (ret != 0) {
+ RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
+ port_id, rte_strerror(-ret));
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
+ return ret;
+ }
+ }
- rte_atomic32_dec(&kni_pause);
+ __atomic_fetch_sub(&kni_pause, 1, __ATOMIC_RELAXED);
if (ret < 0)
RTE_LOG(ERR, APP, "Failed to start port %d\n", port_id);
conf.mbuf_size = MAX_PACKET_SZ;
/*
* The first KNI device associated to a port
- * is the master, for multiple kernel thread
+ * is the main, for multiple kernel thread
* environment.
*/
if (i == 0) {
kni_free_kni(uint16_t port_id)
{
uint8_t i;
+ int ret;
struct kni_port_params **p = kni_port_params_array;
if (port_id >= RTE_MAX_ETHPORTS || !p[port_id])
printf("Fail to release kni\n");
p[port_id]->kni[i] = NULL;
}
- rte_eth_dev_stop(port_id);
+ ret = rte_eth_dev_stop(port_id);
+ if (ret != 0)
+ RTE_LOG(ERR, APP, "Failed to stop port %d: %s\n",
+ port_id, rte_strerror(-ret));
+ rte_eth_dev_close(port_id);
return 0;
}
"Could not create link status thread!\n");
/* Launch per-lcore function on every lcore */
- rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
- RTE_LCORE_FOREACH_SLAVE(i) {
+ rte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);
+ RTE_LCORE_FOREACH_WORKER(i) {
if (rte_eal_wait_lcore(i) < 0)
return -1;
}
kni_port_params_array[i] = NULL;
}
+ /* clean up the EAL */
+ rte_eal_cleanup();
+
return 0;
}