git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal: introduce internal wrappers for file operations
[dpdk.git]
/
examples
/
ethtool
/
ethtool-app
/
main.c
diff --git
a/examples/ethtool/ethtool-app/main.c
b/examples/ethtool/ethtool-app/main.c
index
3d2a70d
..
7383413
100644
(file)
--- a/
examples/ethtool/ethtool-app/main.c
+++ b/
examples/ethtool/ethtool-app/main.c
@@
-95,6
+95,7
@@
static void setup_ports(struct app_config *app_cfg, int cnt_ports)
char str_name[16];
uint16_t nb_rxd = PORT_RX_QUEUE_SIZE;
uint16_t nb_txd = PORT_TX_QUEUE_SIZE;
char str_name[16];
uint16_t nb_rxd = PORT_RX_QUEUE_SIZE;
uint16_t nb_txd = PORT_TX_QUEUE_SIZE;
+ int ret;
memset(&cfg_port, 0, sizeof(cfg_port));
cfg_port.txmode.mq_mode = ETH_MQ_TX_NONE;
memset(&cfg_port, 0, sizeof(cfg_port));
cfg_port.txmode.mq_mode = ETH_MQ_TX_NONE;
@@
-102,7
+103,12
@@
static void setup_ports(struct app_config *app_cfg, int cnt_ports)
for (idx_port = 0; idx_port < cnt_ports; idx_port++) {
struct app_port *ptr_port = &app_cfg->ports[idx_port];
for (idx_port = 0; idx_port < cnt_ports; idx_port++) {
struct app_port *ptr_port = &app_cfg->ports[idx_port];
- rte_eth_dev_info_get(idx_port, &dev_info);
+ ret = rte_eth_dev_info_get(idx_port, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info: %s\n",
+ idx_port, strerror(-ret));
+
size_pktpool = dev_info.rx_desc_lim.nb_max +
dev_info.tx_desc_lim.nb_max + PKTPOOL_EXTRA_SIZE;
size_pktpool = dev_info.rx_desc_lim.nb_max +
dev_info.tx_desc_lim.nb_max + PKTPOOL_EXTRA_SIZE;
@@
-150,7
+156,12
@@
static void setup_ports(struct app_config *app_cfg, int cnt_ports)
"%s:%i: rte_eth_dev_start failed",
__FILE__, __LINE__
);
"%s:%i: rte_eth_dev_start failed",
__FILE__, __LINE__
);
- rte_eth_macaddr_get(idx_port, &ptr_port->mac_addr);
+ ret = rte_eth_macaddr_get(idx_port, &ptr_port->mac_addr);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "rte_eth_macaddr_get failed (port %u): %s\n",
+ idx_port, rte_strerror(-ret));
+
rte_spinlock_init(&ptr_port->lock);
}
}
rte_spinlock_init(&ptr_port->lock);
}
}
@@
-165,7
+176,7
@@
static void process_frame(struct app_port *ptr_port,
rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);
}
rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);
}
-static int slave_main(__
attribute__((unused))
void *ptr_data)
+static int slave_main(__
rte_unused
void *ptr_data)
{
struct app_port *ptr_port;
struct rte_mbuf *ptr_frame;
{
struct app_port *ptr_port;
struct rte_mbuf *ptr_frame;
@@
-176,6
+187,7
@@
static int slave_main(__attribute__((unused)) void *ptr_data)
uint16_t cnt_sent;
uint16_t idx_port;
uint16_t lock_result;
uint16_t cnt_sent;
uint16_t idx_port;
uint16_t lock_result;
+ int ret;
while (app_cfg.exit_now == 0) {
for (idx_port = 0; idx_port < app_cfg.cnt_ports; idx_port++) {
while (app_cfg.exit_now == 0) {
for (idx_port = 0; idx_port < app_cfg.cnt_ports; idx_port++) {
@@
-192,8
+204,16
@@
static int slave_main(__attribute__((unused)) void *ptr_data)
/* MAC address was updated */
if (ptr_port->port_dirty == 1) {
/* MAC address was updated */
if (ptr_port->port_dirty == 1) {
- rte_eth_macaddr_get(ptr_port->idx_port,
+ r
et = r
te_eth_macaddr_get(ptr_port->idx_port,
&ptr_port->mac_addr);
&ptr_port->mac_addr);
+ if (ret != 0) {
+ rte_spinlock_unlock(&ptr_port->lock);
+ printf("Failed to get MAC address (port %u): %s",
+ ptr_port->idx_port,
+ rte_strerror(-ret));
+ return ret;
+ }
+
ptr_port->port_dirty = 0;
}
ptr_port->port_dirty = 0;
}