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
examples: fix port mask parsing failure handling
[dpdk.git]
/
examples
/
performance-thread
/
l3fwd-thread
/
main.c
diff --git
a/examples/performance-thread/l3fwd-thread/main.c
b/examples/performance-thread/l3fwd-thread/main.c
index
9e25f06
..
e32802a
100644
(file)
--- a/
examples/performance-thread/l3fwd-thread/main.c
+++ b/
examples/performance-thread/l3fwd-thread/main.c
@@
-331,7
+331,7
@@
struct ipv4_5tuple {
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __
attribute__((__packed__))
;
+} __
rte_packed
;
union ipv4_5tuple_host {
struct {
union ipv4_5tuple_host {
struct {
@@
-354,7
+354,7
@@
struct ipv6_5tuple {
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __
attribute__((__packed__))
;
+} __
rte_packed
;
union ipv6_5tuple_host {
struct {
union ipv6_5tuple_host {
struct {
@@
-869,7
+869,7
@@
get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid,
#endif
static inline void l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)
#endif
static inline void l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)
- __
attribute__((unused))
;
+ __
rte_unused
;
#if ((APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) && \
(ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
#if ((APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) && \
(ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
@@
-1120,7
+1120,7
@@
simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)
struct rte_ether_hdr *eth_hdr[8];
union ipv6_5tuple_host key[8];
struct rte_ether_hdr *eth_hdr[8];
union ipv6_5tuple_host key[8];
- __
attribute__((unused))
struct rte_ipv6_hdr *ipv6_hdr[8];
+ __
rte_unused
struct rte_ipv6_hdr *ipv6_hdr[8];
eth_hdr[0] = rte_pktmbuf_mtod(m[0], struct rte_ether_hdr *);
eth_hdr[1] = rte_pktmbuf_mtod(m[1], struct rte_ether_hdr *);
eth_hdr[0] = rte_pktmbuf_mtod(m[0], struct rte_ether_hdr *);
eth_hdr[1] = rte_pktmbuf_mtod(m[1], struct rte_ether_hdr *);
@@
-1877,7
+1877,7
@@
process_burst(struct rte_mbuf *pkts_burst[MAX_PKT_BURST], int nb_rx,
/*
* CPU-load stats collector
*/
/*
* CPU-load stats collector
*/
-static int
+static int
__rte_noreturn
cpu_load_collector(__rte_unused void *arg) {
unsigned i, j, k;
uint64_t hits;
cpu_load_collector(__rte_unused void *arg) {
unsigned i, j, k;
uint64_t hits;
@@
-2299,7
+2299,7
@@
sched_spawner(__rte_unused void *arg) {
}
/* main processing loop */
}
/* main processing loop */
-static int
+static int
__rte_noreturn
pthread_tx(void *dummy)
{
struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
pthread_tx(void *dummy)
{
struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
@@
-2681,10
+2681,7
@@
parse_portmask(const char *portmask)
/* parse hexadecimal string */
pm = strtoul(portmask, &end, 16);
if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
/* parse hexadecimal string */
pm = strtoul(portmask, &end, 16);
if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
- return -1;
-
- if (pm == 0)
- return -1;
+ return 0;
return pm;
}
return pm;
}
@@
-3432,6
+3429,7
@@
check_all_ports_link_status(uint32_t port_mask)
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
+ int ret;
printf("\nChecking link status");
fflush(stdout);
printf("\nChecking link status");
fflush(stdout);
@@
-3441,7
+3439,14
@@
check_all_ports_link_status(uint32_t port_mask)
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
- rte_eth_link_get_nowait(portid, &link);
+ ret = rte_eth_link_get_nowait(portid, &link);
+ if (ret < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-ret));
+ continue;
+ }
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status)
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status)
@@
-3449,7
+3454,7
@@
check_all_ports_link_status(uint32_t port_mask)
"Port%d Link Up. Speed %u Mbps - %s\n",
portid, link.link_speed,
(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
"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
"));
+ ("full-duplex") : ("half-duplex"));
else
printf("Port %d Link Down\n", portid);
continue;
else
printf("Port %d Link Down\n", portid);
continue;
@@
-3594,7
+3599,12
@@
main(int argc, char **argv)
"rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%d\n",
ret, portid);
"rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%d\n",
ret, portid);
- rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
+ ret = rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+ "rte_eth_macaddr_get: err=%d, port=%d\n",
+ ret, portid);
+
print_ethaddr(" Address:", &ports_eth_addr[portid]);
printf(", ");
print_ethaddr("Destination:",
print_ethaddr(" Address:", &ports_eth_addr[portid]);
printf(", ");
print_ethaddr("Destination:",