net: add rte prefix to ARP structures

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

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 98415d6..2447964 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -122,7 +122,6 @@ static struct rte_eth_conf port_conf = {
                .mq_mode = ETH_MQ_RX_NONE,
                .max_rx_pkt_len = ETHER_MAX_LEN,
                .split_hdr_size = 0,
-               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -153,6 +152,18 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                local_port_conf.txmode.offloads |=
                        DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+       local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+               dev_info.flow_type_rss_offloads;
+       if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+                       port_conf.rx_adv_conf.rss_conf.rss_hf) {
+               printf("Port %u modified RSS hash function based on hardware support,"
+                       "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                       portid,
+                       port_conf.rx_adv_conf.rss_conf.rss_hf,
+                       local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+       }
+
        retval = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
        if (retval != 0)
                rte_exit(EXIT_FAILURE, "port %u: configuration failed (res=%d)\n",
@@ -209,6 +220,7 @@ bond_port_init(struct rte_mempool *mbuf_pool)
        struct rte_eth_rxconf rxq_conf;
        struct rte_eth_txconf txq_conf;
        struct rte_eth_conf local_port_conf = port_conf;
+       uint16_t wait_counter = 20;
 
        retval = rte_eth_bond_create("net_bonding0", BONDING_MODE_ALB,
                        0 /*SOCKET_ID_ANY*/);
@@ -232,6 +244,13 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                rte_exit(EXIT_FAILURE, "port %u: rte_eth_dev_adjust_nb_rx_tx_desc "
                                "failed (res=%d)\n", BOND_PORT, retval);
 
+       for (i = 0; i < slaves_count; i++) {
+               if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1)
+                       rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n",
+                                       slaves[i], BOND_PORT);
+
+       }
+
        /* RX setup */
        rxq_conf = dev_info.default_rxconf;
        rxq_conf.offloads = local_port_conf.rxmode.offloads;
@@ -252,17 +271,24 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
                                BOND_PORT, retval);
 
-       for (i = 0; i < slaves_count; i++) {
-               if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1)
-                       rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n",
-                                       slaves[i], BOND_PORT);
-
-       }
-
        retval  = rte_eth_dev_start(BOND_PORT);
        if (retval < 0)
                rte_exit(retval, "Start port %d failed (res=%d)", BOND_PORT, retval);
 
+       printf("Waiting for slaves to become active...");
+       while (wait_counter) {
+               uint16_t act_slaves[16] = {0};
+               if (rte_eth_bond_active_slaves_get(BOND_PORT, act_slaves, 16) ==
+                               slaves_count) {
+                       printf("\n");
+                       break;
+               }
+               sleep(1);
+               printf("...");
+               if (--wait_counter == 0)
+                       rte_exit(-1, "\nFailed to activate slaves\n");
+       }
+
        rte_eth_promiscuous_enable(BOND_PORT);
 
        struct ether_addr addr;
@@ -313,7 +339,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
        struct ether_addr d_addr;
 
        struct ether_hdr *eth_hdr;
-       struct arp_hdr *arp_hdr;
+       struct rte_arp_hdr *arp_hdr;
        struct ipv4_hdr *ipv4_hdr;
        uint16_t ether_type, offset;
 
@@ -356,10 +382,11 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                        global_flag_stru_p->port_packets[1]++;
                                        rte_spinlock_unlock(&global_flag_stru_p->lock);
                                }
-                               arp_hdr = (struct arp_hdr *)((char *)(eth_hdr + 1) + offset);
+                               arp_hdr = (struct rte_arp_hdr *)(
+                                       (char *)(eth_hdr + 1) + offset);
                                if (arp_hdr->arp_data.arp_tip == bond_ip) {
-                                       if (arp_hdr->arp_op == rte_cpu_to_be_16(ARP_OP_REQUEST)) {
-                                               arp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REPLY);
+                                       if (arp_hdr->arp_opcode == rte_cpu_to_be_16(ARP_OP_REQUEST)) {
+                                               arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REPLY);
                                                /* Switch src and dst data and set bonding MAC */
                                                ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                                rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
@@ -424,7 +451,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
 
        struct rte_mbuf *created_pkt;
        struct ether_hdr *eth_hdr;
-       struct arp_hdr *arp_hdr;
+       struct rte_arp_hdr *arp_hdr;
 
        uint32_t bond_ip;
        size_t pkt_size;
@@ -443,7 +470,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
                return;
        }
 
-       pkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr);
+       pkt_size = sizeof(struct ether_hdr) + sizeof(struct rte_arp_hdr);
        created_pkt->data_len = pkt_size;
        created_pkt->pkt_len = pkt_size;
 
@@ -452,12 +479,13 @@ static void cmd_obj_send_parsed(void *parsed_result,
        memset(&eth_hdr->d_addr, 0xFF, ETHER_ADDR_LEN);
        eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);
 
-       arp_hdr = (struct arp_hdr *)((char *)eth_hdr + sizeof(struct ether_hdr));
-       arp_hdr->arp_hrd = rte_cpu_to_be_16(ARP_HRD_ETHER);
-       arp_hdr->arp_pro = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
-       arp_hdr->arp_hln = ETHER_ADDR_LEN;
-       arp_hdr->arp_pln = sizeof(uint32_t);
-       arp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REQUEST);
+       arp_hdr = (struct rte_arp_hdr *)(
+               (char *)eth_hdr + sizeof(struct ether_hdr));
+       arp_hdr->arp_hardware = rte_cpu_to_be_16(ARP_HRD_ETHER);
+       arp_hdr->arp_protocol = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+       arp_hdr->arp_hlen = ETHER_ADDR_LEN;
+       arp_hdr->arp_plen = sizeof(uint32_t);
+       arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REQUEST);
 
        rte_eth_macaddr_get(BOND_PORT, &arp_hdr->arp_data.arp_sha);
        arp_hdr->arp_data.arp_sip = bond_ip;