replace unused attributes

[dpdk.git] / examples / bond / main.c

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 39214cf..8608285 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -208,7 +208,12 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
 
        struct rte_ether_addr addr;
 
-       rte_eth_macaddr_get(portid, &addr);
+       retval = rte_eth_macaddr_get(portid, &addr);
+       if (retval != 0)
+               rte_exit(retval,
+                               "Mac address get port %d failed (res=%d)",
+                               portid, retval);
+
        printf("Port %u MAC: ", portid);
        PRINT_MAC(addr);
        printf("\n");
@@ -309,7 +314,11 @@ bond_port_init(struct rte_mempool *mbuf_pool)
 
        struct rte_ether_addr addr;
 
-       rte_eth_macaddr_get(BOND_PORT, &addr);
+       retval = rte_eth_macaddr_get(BOND_PORT, &addr);
+       if (retval != 0)
+               rte_exit(retval, "port %u: Mac address get failed (res=%d)",
+                               BOND_PORT, retval);
+
        printf("Port %u MAC: ", (unsigned)BOND_PORT);
                PRINT_MAC(addr);
                printf("\n");
@@ -350,11 +359,12 @@ struct global_flag_stru_t *global_flag_stru_p = &global_flag_stru;
  * Main thread that does the work, reading from INPUT_PORT
  * and writing to OUTPUT_PORT
  */
-static int lcore_main(__attribute__((unused)) void *arg1)
+static int lcore_main(__rte_unused void *arg1)
 {
        struct rte_mbuf *pkts[MAX_PKT_BURST] __rte_cache_aligned;
        struct rte_ether_addr d_addr;
 
+       struct rte_ether_addr bond_mac_addr;
        struct rte_ether_hdr *eth_hdr;
        struct rte_arp_hdr *arp_hdr;
        struct rte_ipv4_hdr *ipv4_hdr;
@@ -364,6 +374,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
        uint32_t bond_ip;
        int i = 0;
        uint8_t is_free;
+       int ret;
 
        bond_ip = BOND_IP_1 | (BOND_IP_2 << 8) |
                                (BOND_IP_3 << 16) | (BOND_IP_4 << 24);
@@ -381,6 +392,15 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                        continue;
                }
 
+               ret = rte_eth_macaddr_get(BOND_PORT, &bond_mac_addr);
+               if (ret != 0) {
+                       printf("Bond (port %u) MAC address get failed: %s.\n"
+                              "%u packets dropped", BOND_PORT, strerror(-ret),
+                              rx_cnt);
+                       rte_pktmbuf_free(pkts[i]);
+                       continue;
+               }
+
                /* Search incoming data for ARP packets and prepare response */
                for (i = 0; i < rx_cnt; i++) {
                        if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1) {
@@ -407,11 +427,11 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                                arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);
                                                /* Switch src and dst data and set bonding MAC */
                                                rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-                                               rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
+                                               rte_ether_addr_copy(&bond_mac_addr, &eth_hdr->s_addr);
                                                rte_ether_addr_copy(&arp_hdr->arp_data.arp_sha,
                                                                &arp_hdr->arp_data.arp_tha);
                                                arp_hdr->arp_data.arp_tip = arp_hdr->arp_data.arp_sip;
-                                               rte_eth_macaddr_get(BOND_PORT, &d_addr);
+                                               rte_ether_addr_copy(&bond_mac_addr, &d_addr);
                                                rte_ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha);
                                                arp_hdr->arp_data.arp_sip = bond_ip;
                                                rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1);
@@ -428,7 +448,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                ipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset);
                                if (ipv4_hdr->dst_addr == bond_ip) {
                                        rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-                                       rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
+                                       rte_ether_addr_copy(&bond_mac_addr, &eth_hdr->s_addr);
                                        ipv4_hdr->dst_addr = ipv4_hdr->src_addr;
                                        ipv4_hdr->src_addr = bond_ip;
                                        rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1);
@@ -461,19 +481,21 @@ static inline void get_string(struct cmd_obj_send_result *res, char *buf, uint8_
                );
 }
 static void cmd_obj_send_parsed(void *parsed_result,
-               __attribute__((unused)) struct cmdline *cl,
-                              __attribute__((unused)) void *data)
+               __rte_unused struct cmdline *cl,
+                              __rte_unused void *data)
 {
 
        struct cmd_obj_send_result *res = parsed_result;
        char ip_str[INET6_ADDRSTRLEN];
 
+       struct rte_ether_addr bond_mac_addr;
        struct rte_mbuf *created_pkt;
        struct rte_ether_hdr *eth_hdr;
        struct rte_arp_hdr *arp_hdr;
 
        uint32_t bond_ip;
        size_t pkt_size;
+       int ret;
 
        if (res->ip.family == AF_INET)
                get_string(res, ip_str, INET_ADDRSTRLEN);
@@ -483,6 +505,13 @@ static void cmd_obj_send_parsed(void *parsed_result,
        bond_ip = BOND_IP_1 | (BOND_IP_2 << 8) |
                                (BOND_IP_3 << 16) | (BOND_IP_4 << 24);
 
+       ret = rte_eth_macaddr_get(BOND_PORT, &bond_mac_addr);
+       if (ret != 0) {
+               cmdline_printf(cl,
+                              "Failed to get bond (port %u) MAC address: %s\n",
+                              BOND_PORT, strerror(-ret));
+       }
+
        created_pkt = rte_pktmbuf_alloc(mbuf_pool);
        if (created_pkt == NULL) {
                cmdline_printf(cl, "Failed to allocate mbuf\n");
@@ -494,7 +523,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
        created_pkt->pkt_len = pkt_size;
 
        eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *);
-       rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
+       rte_ether_addr_copy(&bond_mac_addr, &eth_hdr->s_addr);
        memset(&eth_hdr->d_addr, 0xFF, RTE_ETHER_ADDR_LEN);
        eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP);
 
@@ -506,7 +535,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
        arp_hdr->arp_plen = sizeof(uint32_t);
        arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REQUEST);
 
-       rte_eth_macaddr_get(BOND_PORT, &arp_hdr->arp_data.arp_sha);
+       rte_ether_addr_copy(&bond_mac_addr, &arp_hdr->arp_data.arp_sha);
        arp_hdr->arp_data.arp_sip = bond_ip;
        memset(&arp_hdr->arp_data.arp_tha, 0, RTE_ETHER_ADDR_LEN);
        arp_hdr->arp_data.arp_tip =
@@ -540,9 +569,9 @@ struct cmd_start_result {
        cmdline_fixed_string_t start;
 };
 
-static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_start_parsed(__rte_unused void *parsed_result,
                               struct cmdline *cl,
-                              __attribute__((unused)) void *data)
+                              __rte_unused void *data)
 {
        int slave_core_id = rte_lcore_id();
 
@@ -598,9 +627,9 @@ struct cmd_help_result {
        cmdline_fixed_string_t help;
 };
 
-static void cmd_help_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_help_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
-                           __attribute__((unused)) void *data)
+                           __rte_unused void *data)
 {
        cmdline_printf(cl,
                        "ALB - link bonding mode 6 example\n"
@@ -630,9 +659,9 @@ struct cmd_stop_result {
        cmdline_fixed_string_t stop;
 };
 
-static void cmd_stop_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_stop_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
-                           __attribute__((unused)) void *data)
+                           __rte_unused void *data)
 {
        rte_spinlock_trylock(&global_flag_stru_p->lock);
        if (global_flag_stru_p->LcoreMainIsRunning == 0)        {
@@ -671,9 +700,9 @@ struct cmd_quit_result {
        cmdline_fixed_string_t quit;
 };
 
-static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_quit_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
-                           __attribute__((unused)) void *data)
+                           __rte_unused void *data)
 {
        rte_spinlock_trylock(&global_flag_stru_p->lock);
        if (global_flag_stru_p->LcoreMainIsRunning == 0)        {
@@ -714,20 +743,27 @@ struct cmd_show_result {
        cmdline_fixed_string_t show;
 };
 
-static void cmd_show_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_show_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
-                           __attribute__((unused)) void *data)
+                           __rte_unused void *data)
 {
        uint16_t slaves[16] = {0};
        uint8_t len = 16;
        struct rte_ether_addr addr;
-       uint16_t i = 0;
+       uint16_t i;
+       int ret;
+
+       for (i = 0; i < slaves_count; i++) {
+               ret = rte_eth_macaddr_get(i, &addr);
+               if (ret != 0) {
+                       cmdline_printf(cl,
+                               "Failed to get port %u MAC address: %s\n",
+                               i, strerror(-ret));
+                       continue;
+               }
 
-       while (i < slaves_count)        {
-               rte_eth_macaddr_get(i, &addr);
                PRINT_MAC(addr);
                printf("\n");
-               i++;
        }
 
        rte_spinlock_trylock(&global_flag_stru_p->lock);
@@ -767,7 +803,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 };
 
 /* prompt function, called from main on MASTER lcore */
-static void prompt(__attribute__((unused)) void *arg1)
+static void prompt(__rte_unused void *arg1)
 {
        struct cmdline *cl;