X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_link_bonding.c;h=eb6f1a9f1866b36b03cc0c887cf498cc7521f592;hb=35b2d13fd6fdcbd191f2a30d74648faeb1186c65;hp=0fe1d78eb0f51b241c048eb187c52f0f20e982bc;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index 0fe1d78eb0..eb6f1a9f18 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -73,11 +73,11 @@ struct link_bonding_unittest_params { struct rte_mempool *mbuf_pool; - struct ether_addr *default_slave_mac; - struct ether_addr *default_bonded_mac; + struct rte_ether_addr *default_slave_mac; + struct rte_ether_addr *default_bonded_mac; /* Packet Headers */ - struct ether_hdr *pkt_eth_hdr; + struct rte_ether_hdr *pkt_eth_hdr; struct ipv4_hdr *pkt_ipv4_hdr; struct ipv6_hdr *pkt_ipv6_hdr; struct udp_hdr *pkt_udp_hdr; @@ -99,8 +99,8 @@ static struct link_bonding_unittest_params default_params = { .mbuf_pool = NULL, - .default_slave_mac = (struct ether_addr *)slave_mac, - .default_bonded_mac = (struct ether_addr *)bonded_mac, + .default_slave_mac = (struct rte_ether_addr *)slave_mac, + .default_bonded_mac = (struct rte_ether_addr *)bonded_mac, .pkt_eth_hdr = NULL, .pkt_ipv4_hdr = &pkt_ipv4_hdr, @@ -136,7 +136,7 @@ static struct rte_eth_conf default_pmd_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_NONE, .split_hdr_size = 0, - .max_rx_pkt_len = ETHER_MAX_LEN, + .max_rx_pkt_len = RTE_ETHER_MAX_LEN, }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, @@ -201,6 +201,7 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t en_isr) } static int slaves_initialized; +static int mac_slaves_initialized; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t cvar = PTHREAD_COND_INITIALIZER; @@ -210,12 +211,12 @@ static int test_setup(void) { int i, nb_mbuf_per_pool; - struct ether_addr *mac_addr = (struct ether_addr *)slave_mac; + struct rte_ether_addr *mac_addr = (struct rte_ether_addr *)slave_mac; /* Allocate ethernet packet header with space for VLAN header */ if (test_params->pkt_eth_hdr == NULL) { - test_params->pkt_eth_hdr = malloc(sizeof(struct ether_hdr) + - sizeof(struct vlan_hdr)); + test_params->pkt_eth_hdr = malloc(sizeof(struct rte_ether_hdr) + + sizeof(struct rte_vlan_hdr)); TEST_ASSERT_NOT_NULL(test_params->pkt_eth_hdr, "Ethernet header struct allocation failed!"); @@ -236,7 +237,7 @@ test_setup(void) for (i = 0; i < TEST_MAX_NUMBER_OF_PORTS; i++) { char pmd_name[RTE_ETH_NAME_MAX_LEN]; - mac_addr->addr_bytes[ETHER_ADDR_LEN-1] = i; + mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] = i; snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "eth_virt_%d", i); @@ -376,7 +377,7 @@ static int test_remove_slave_from_bonded_device(void) { int current_slave_count; - struct ether_addr read_mac_addr, *mac_addr; + struct rte_ether_addr read_mac_addr, *mac_addr; uint16_t slaves[RTE_MAX_ETHPORTS]; TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(test_params->bonded_port_id, @@ -394,8 +395,8 @@ test_remove_slave_from_bonded_device(void) current_slave_count, test_params->bonded_slave_count - 1); - mac_addr = (struct ether_addr *)slave_mac; - mac_addr->addr_bytes[ETHER_ADDR_LEN-1] = + mac_addr = (struct rte_ether_addr *)slave_mac; + mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] = test_params->bonded_slave_count-1; rte_eth_macaddr_get( @@ -699,8 +700,8 @@ static int test_set_primary_slave(void) { int i, j, retval; - struct ether_addr read_mac_addr; - struct ether_addr *expected_mac_addr; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr *expected_mac_addr; /* Add 4 slaves to bonded device */ for (i = test_params->bonded_slave_count; i < 4; i++) @@ -750,8 +751,8 @@ test_set_primary_slave(void) "Failed to start bonded port %d", test_params->bonded_port_id); - expected_mac_addr = (struct ether_addr *)&slave_mac; - expected_mac_addr->addr_bytes[ETHER_ADDR_LEN-1] = i; + expected_mac_addr = (struct rte_ether_addr *)&slave_mac; + expected_mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] = i; /* Check primary slave MAC */ rte_eth_macaddr_get(test_params->slave_port_ids[i], &read_mac_addr); @@ -801,12 +802,12 @@ static int test_set_explicit_bonded_mac(void) { int i; - struct ether_addr read_mac_addr; - struct ether_addr *mac_addr; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr *mac_addr; uint8_t explicit_bonded_mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0x01 }; - mac_addr = (struct ether_addr *)explicit_bonded_mac; + mac_addr = (struct rte_ether_addr *)explicit_bonded_mac; /* Invalid port ID */ TEST_ASSERT_FAIL(rte_eth_bond_mac_address_set(INVALID_PORT_ID, mac_addr), @@ -873,43 +874,52 @@ test_set_explicit_bonded_mac(void) static int test_set_bonded_port_initialization_mac_assignment(void) { - int i, slave_count, bonded_port_id; + int i, slave_count; uint16_t slaves[RTE_MAX_ETHPORTS]; - int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT]; + static int bonded_port_id = -1; + static int slave_port_ids[BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT]; - struct ether_addr slave_mac_addr, bonded_mac_addr, read_mac_addr; + struct rte_ether_addr slave_mac_addr, bonded_mac_addr, read_mac_addr; /* Initialize default values for MAC addresses */ - memcpy(&slave_mac_addr, slave_mac, sizeof(struct ether_addr)); - memcpy(&bonded_mac_addr, slave_mac, sizeof(struct ether_addr)); + memcpy(&slave_mac_addr, slave_mac, sizeof(struct rte_ether_addr)); + memcpy(&bonded_mac_addr, slave_mac, sizeof(struct rte_ether_addr)); /* * 1. a - Create / configure bonded / slave ethdevs */ - bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test", - BONDING_MODE_ACTIVE_BACKUP, rte_socket_id()); - TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device"); + if (bonded_port_id == -1) { + bonded_port_id = rte_eth_bond_create("net_bonding_mac_ass_test", + BONDING_MODE_ACTIVE_BACKUP, rte_socket_id()); + TEST_ASSERT(bonded_port_id > 0, "failed to create bonded device"); - TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0), - "Failed to configure bonded ethdev"); + TEST_ASSERT_SUCCESS(configure_ethdev(bonded_port_id, 0, 0), + "Failed to configure bonded ethdev"); + } - for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) { - char pmd_name[RTE_ETH_NAME_MAX_LEN]; + if (!mac_slaves_initialized) { + for (i = 0; i < BONDED_INIT_MAC_ASSIGNMENT_SLAVE_COUNT; i++) { + char pmd_name[RTE_ETH_NAME_MAX_LEN]; - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = i + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = + i + 100; - snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, "eth_slave_%d", i); + snprintf(pmd_name, RTE_ETH_NAME_MAX_LEN, + "eth_slave_%d", i); - slave_port_ids[i] = virtual_ethdev_create(pmd_name, - &slave_mac_addr, rte_socket_id(), 1); + slave_port_ids[i] = virtual_ethdev_create(pmd_name, + &slave_mac_addr, rte_socket_id(), 1); - TEST_ASSERT(slave_port_ids[i] >= 0, - "Failed to create slave ethdev %s", pmd_name); + TEST_ASSERT(slave_port_ids[i] >= 0, + "Failed to create slave ethdev %s", + pmd_name); - TEST_ASSERT_SUCCESS(configure_ethdev(slave_port_ids[i], 1, 0), - "Failed to configure virtual ethdev %s", - pmd_name); + TEST_ASSERT_SUCCESS(configure_ethdev(slave_port_ids[i], 1, 0), + "Failed to configure virtual ethdev %s", + pmd_name); + } + mac_slaves_initialized = 1; } @@ -933,8 +943,8 @@ test_set_bonded_port_initialization_mac_assignment(void) /* * 3. Set explicit MAC address on bonded ethdev */ - bonded_mac_addr.addr_bytes[ETHER_ADDR_LEN-2] = 0xFF; - bonded_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 0xAA; + bonded_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-2] = 0xFF; + bonded_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 0xAA; TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( bonded_port_id, &bonded_mac_addr), @@ -965,13 +975,13 @@ test_set_bonded_port_initialization_mac_assignment(void) sizeof(read_mac_addr)), "slave port 0 mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 1 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100; rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), "slave port 1 mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 2 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 2 + 100; rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), @@ -996,13 +1006,13 @@ test_set_bonded_port_initialization_mac_assignment(void) sizeof(read_mac_addr)), "bonded port mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 0 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 0 + 100; rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), "slave port 0 mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 1 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100; rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), @@ -1033,19 +1043,19 @@ test_set_bonded_port_initialization_mac_assignment(void) "Number of slaves (%d) is great than expected (%d).", slave_count, 0); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 0 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 0 + 100; rte_eth_macaddr_get(slave_port_ids[0], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), "slave port 0 mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 1 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 1 + 100; rte_eth_macaddr_get(slave_port_ids[1], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), "slave port 1 mac address not as expected"); - slave_mac_addr.addr_bytes[ETHER_ADDR_LEN-1] = 2 + 100; + slave_mac_addr.addr_bytes[RTE_ETHER_ADDR_LEN-1] = 2 + 100; rte_eth_macaddr_get(slave_port_ids[2], &read_mac_addr); TEST_ASSERT_SUCCESS(memcmp(&slave_mac_addr, &read_mac_addr, sizeof(read_mac_addr)), @@ -1262,17 +1272,19 @@ generate_test_burst(struct rte_mbuf **pkts_burst, uint16_t burst_size, void *ip_hdr; if (ipv4) - ether_type = ETHER_TYPE_IPv4; + ether_type = RTE_ETHER_TYPE_IPv4; else - ether_type = ETHER_TYPE_IPv6; + ether_type = RTE_ETHER_TYPE_IPv6; if (toggle_dst_mac) initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_1, + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_1, ether_type, vlan, vlan_id); else initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_0, ether_type, vlan, vlan_id); @@ -1663,7 +1675,8 @@ test_roundrobin_rx_burst_on_multiple_slaves(void) static int test_roundrobin_verify_mac_assignment(void) { - struct ether_addr read_mac_addr, expected_mac_addr_0, expected_mac_addr_2; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_2; int i; @@ -1722,7 +1735,8 @@ test_roundrobin_verify_mac_assignment(void) /* Set explicit MAC address */ TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( - test_params->bonded_port_id, (struct ether_addr *)bonded_mac), + test_params->bonded_port_id, + (struct rte_ether_addr *)bonded_mac), "Failed to set MAC"); rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr); @@ -1931,7 +1945,8 @@ int polling_test_slaves[TEST_RR_POLLING_LINK_STATUS_SLAVE_COUNT] = { -1, -1 }; static int test_roundrobin_verfiy_polling_slave_link_status_change(void) { - struct ether_addr *mac_addr = (struct ether_addr *)polling_slave_mac; + struct rte_ether_addr *mac_addr = + (struct rte_ether_addr *)polling_slave_mac; char slave_name[RTE_ETH_NAME_MAX_LEN]; int i; @@ -1939,7 +1954,7 @@ test_roundrobin_verfiy_polling_slave_link_status_change(void) for (i = 0; i < TEST_RR_POLLING_LINK_STATUS_SLAVE_COUNT; i++) { /* Generate slave name / MAC address */ snprintf(slave_name, RTE_ETH_NAME_MAX_LEN, "eth_virt_poll_%d", i); - mac_addr->addr_bytes[ETHER_ADDR_LEN-1] = i; + mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN-1] = i; /* Create slave devices with no ISR Support */ if (polling_test_slaves[i] == -1) { @@ -2030,8 +2045,9 @@ test_activebackup_tx_burst(void) "Failed to initialize bonded device with slaves"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, - ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_0, + RTE_ETHER_TYPE_IPv4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2237,7 +2253,8 @@ test_activebackup_verify_promiscuous_enable_disable(void) static int test_activebackup_verify_mac_assignment(void) { - struct ether_addr read_mac_addr, expected_mac_addr_0, expected_mac_addr_1; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1; rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0); rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1); @@ -2319,7 +2336,8 @@ test_activebackup_verify_mac_assignment(void) /* Set explicit MAC address */ TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( - test_params->bonded_port_id, (struct ether_addr *)bonded_mac), + test_params->bonded_port_id, + (struct rte_ether_addr *)bonded_mac), "failed to set MAC address"); rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr); @@ -2564,8 +2582,9 @@ test_balance_l2_tx_burst(void) "Failed to set balance xmit policy."); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, - ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_0, + RTE_ETHER_TYPE_IPv4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2579,8 +2598,9 @@ test_balance_l2_tx_burst(void) "failed to generate packet burst"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_1, - ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_1, + RTE_ETHER_TYPE_IPv4, 0, 0); /* Generate a burst 2 of packets to transmit */ TEST_ASSERT_EQUAL(generate_packet_burst(test_params->mbuf_pool, &pkts_burst[1][0], @@ -3129,7 +3149,8 @@ test_balance_verify_promiscuous_enable_disable(void) static int test_balance_verify_mac_assignment(void) { - struct ether_addr read_mac_addr, expected_mac_addr_0, expected_mac_addr_1; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1; rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0); rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1); @@ -3211,7 +3232,8 @@ test_balance_verify_mac_assignment(void) /* Set explicit MAC address */ TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( - test_params->bonded_port_id, (struct ether_addr *)bonded_mac), + test_params->bonded_port_id, + (struct rte_ether_addr *)bonded_mac), "failed to set MAC"); rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr); @@ -3402,8 +3424,9 @@ test_broadcast_tx_burst(void) "Failed to initialise bonded device"); initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, (struct ether_addr *)dst_mac_0, - ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_0, + RTE_ETHER_TYPE_IPv4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); @@ -3713,7 +3736,8 @@ test_broadcast_verify_promiscuous_enable_disable(void) static int test_broadcast_verify_mac_assignment(void) { - struct ether_addr read_mac_addr, expected_mac_addr_0, expected_mac_addr_1; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1; int i; @@ -3774,7 +3798,8 @@ test_broadcast_verify_mac_assignment(void) /* Set explicit MAC address */ TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( - test_params->bonded_port_id, (struct ether_addr *)bonded_mac), + test_params->bonded_port_id, + (struct rte_ether_addr *)bonded_mac), "Failed to set MAC address"); rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr); @@ -3985,12 +4010,14 @@ test_tlb_tx_burst(void) /*test two types of mac src own(bonding) and others */ if (i % 2 == 0) { initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)src_mac, - (struct ether_addr *)dst_mac_0, ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)src_mac, + (struct rte_ether_addr *)dst_mac_0, + RTE_ETHER_TYPE_IPv4, 0, 0); } else { initialize_eth_header(test_params->pkt_eth_hdr, - (struct ether_addr *)test_params->default_slave_mac, - (struct ether_addr *)dst_mac_0, ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)test_params->default_slave_mac, + (struct rte_ether_addr *)dst_mac_0, + RTE_ETHER_TYPE_IPv4, 0, 0); } pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); @@ -4201,7 +4228,8 @@ test_tlb_verify_promiscuous_enable_disable(void) static int test_tlb_verify_mac_assignment(void) { - struct ether_addr read_mac_addr, expected_mac_addr_0, expected_mac_addr_1; + struct rte_ether_addr read_mac_addr; + struct rte_ether_addr expected_mac_addr_0, expected_mac_addr_1; rte_eth_macaddr_get(test_params->slave_port_ids[0], &expected_mac_addr_0); rte_eth_macaddr_get(test_params->slave_port_ids[1], &expected_mac_addr_1); @@ -4284,7 +4312,8 @@ test_tlb_verify_mac_assignment(void) /* Set explicit MAC address */ TEST_ASSERT_SUCCESS(rte_eth_bond_mac_address_set( - test_params->bonded_port_id, (struct ether_addr *)bonded_mac), + test_params->bonded_port_id, + (struct rte_ether_addr *)bonded_mac), "failed to set MAC address"); rte_eth_macaddr_get(test_params->bonded_port_id, &read_mac_addr); @@ -4459,14 +4488,14 @@ test_alb_change_mac_in_reply_sent(void) struct rte_mbuf *pkt; struct rte_mbuf *pkts_sent[MAX_PKT_BURST]; - struct ether_hdr *eth_pkt; - struct arp_hdr *arp_pkt; + struct rte_ether_hdr *eth_pkt; + struct rte_arp_hdr *arp_pkt; int slave_idx, nb_pkts, pkt_idx; int retval = 0; - struct ether_addr bond_mac, client_mac; - struct ether_addr *slave_mac1, *slave_mac2; + struct rte_ether_addr bond_mac, client_mac; + struct rte_ether_addr *slave_mac1, *slave_mac2; TEST_ASSERT_SUCCESS( initialize_bonded_device_with_slaves(BONDING_MODE_ALB, @@ -4482,7 +4511,7 @@ test_alb_change_mac_in_reply_sent(void) MAX_PKT_BURST); } - ether_addr_copy( + rte_ether_addr_copy( rte_eth_devices[test_params->bonded_port_id].data->mac_addrs, &bond_mac); @@ -4491,43 +4520,47 @@ test_alb_change_mac_in_reply_sent(void) * them through the bonding port. */ pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client1, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client1, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client1, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); rte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client2, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client2, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client2, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); rte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client3, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client3, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client3, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); rte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client4, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client4, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client4, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); rte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1); slave_mac1 = @@ -4545,16 +4578,20 @@ test_alb_change_mac_in_reply_sent(void) MAX_PKT_BURST); for (pkt_idx = 0; pkt_idx < nb_pkts; pkt_idx++) { - eth_pkt = rte_pktmbuf_mtod(pkts_sent[pkt_idx], struct ether_hdr *); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + eth_pkt = rte_pktmbuf_mtod( + pkts_sent[pkt_idx], struct rte_ether_hdr *); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); if (slave_idx%2 == 0) { - if (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) { + if (!rte_is_same_ether_addr(slave_mac1, + &arp_pkt->arp_data.arp_sha)) { retval = -1; goto test_end; } } else { - if (!is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) { + if (!rte_is_same_ether_addr(slave_mac2, + &arp_pkt->arp_data.arp_sha)) { retval = -1; goto test_end; } @@ -4570,8 +4607,8 @@ test_end: static int test_alb_reply_from_client(void) { - struct ether_hdr *eth_pkt; - struct arp_hdr *arp_pkt; + struct rte_ether_hdr *eth_pkt; + struct rte_arp_hdr *arp_pkt; struct rte_mbuf *pkt; struct rte_mbuf *pkts_sent[MAX_PKT_BURST]; @@ -4579,8 +4616,8 @@ test_alb_reply_from_client(void) int slave_idx, nb_pkts, pkt_idx, nb_pkts_sum = 0; int retval = 0; - struct ether_addr bond_mac, client_mac; - struct ether_addr *slave_mac1, *slave_mac2; + struct rte_ether_addr bond_mac, client_mac; + struct rte_ether_addr *slave_mac1, *slave_mac2; TEST_ASSERT_SUCCESS( initialize_bonded_device_with_slaves(BONDING_MODE_ALB, @@ -4595,7 +4632,7 @@ test_alb_reply_from_client(void) MAX_PKT_BURST); } - ether_addr_copy( + rte_ether_addr_copy( rte_eth_devices[test_params->bonded_port_id].data->mac_addrs, &bond_mac); @@ -4604,46 +4641,50 @@ test_alb_reply_from_client(void) * them in the rx queue to be received by the bonding driver on rx_burst. */ pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client1, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client1, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client1, ip_host, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); virtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client2, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client2, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client2, ip_host, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); virtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client3, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client3, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client3, ip_host, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); virtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt, 1); pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client4, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0, - 0); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + memcpy(client_mac.addr_bytes, mac_client4, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_ARP, 0, 0); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); initialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client4, ip_host, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); virtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt, 1); @@ -4666,16 +4707,20 @@ test_alb_reply_from_client(void) nb_pkts_sum += nb_pkts; for (pkt_idx = 0; pkt_idx < nb_pkts; pkt_idx++) { - eth_pkt = rte_pktmbuf_mtod(pkts_sent[pkt_idx], struct ether_hdr *); - arp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr)); + eth_pkt = rte_pktmbuf_mtod( + pkts_sent[pkt_idx], struct rte_ether_hdr *); + arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + + sizeof(struct rte_ether_hdr)); if (slave_idx%2 == 0) { - if (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) { + if (!rte_is_same_ether_addr(slave_mac1, + &arp_pkt->arp_data.arp_sha)) { retval = -1; goto test_end; } } else { - if (!is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) { + if (!rte_is_same_ether_addr(slave_mac2, + &arp_pkt->arp_data.arp_sha)) { retval = -1; goto test_end; } @@ -4697,9 +4742,9 @@ test_end: static int test_alb_receive_vlan_reply(void) { - struct ether_hdr *eth_pkt; - struct vlan_hdr *vlan_pkt; - struct arp_hdr *arp_pkt; + struct rte_ether_hdr *eth_pkt; + struct rte_vlan_hdr *vlan_pkt; + struct rte_arp_hdr *arp_pkt; struct rte_mbuf *pkt; struct rte_mbuf *pkts_sent[MAX_PKT_BURST]; @@ -4707,7 +4752,7 @@ test_alb_receive_vlan_reply(void) int slave_idx, nb_pkts, pkt_idx; int retval = 0; - struct ether_addr bond_mac, client_mac; + struct rte_ether_addr bond_mac, client_mac; TEST_ASSERT_SUCCESS( initialize_bonded_device_with_slaves(BONDING_MODE_ALB, @@ -4722,7 +4767,7 @@ test_alb_receive_vlan_reply(void) MAX_PKT_BURST); } - ether_addr_copy( + rte_ether_addr_copy( rte_eth_devices[test_params->bonded_port_id].data->mac_addrs, &bond_mac); @@ -4730,19 +4775,19 @@ test_alb_receive_vlan_reply(void) * Generating packet with double VLAN header and placing it in the rx queue. */ pkt = rte_pktmbuf_alloc(test_params->mbuf_pool); - memcpy(client_mac.addr_bytes, mac_client1, ETHER_ADDR_LEN); - eth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - initialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_VLAN, 0, - 0); - vlan_pkt = (struct vlan_hdr *)((char *)(eth_pkt + 1)); + memcpy(client_mac.addr_bytes, mac_client1, RTE_ETHER_ADDR_LEN); + eth_pkt = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + initialize_eth_header(eth_pkt, &bond_mac, &client_mac, + RTE_ETHER_TYPE_VLAN, 0, 0); + vlan_pkt = (struct rte_vlan_hdr *)((char *)(eth_pkt + 1)); vlan_pkt->vlan_tci = rte_cpu_to_be_16(1); - vlan_pkt->eth_proto = rte_cpu_to_be_16(ETHER_TYPE_VLAN); + vlan_pkt->eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); vlan_pkt = vlan_pkt+1; vlan_pkt->vlan_tci = rte_cpu_to_be_16(2); - vlan_pkt->eth_proto = rte_cpu_to_be_16(ETHER_TYPE_ARP); - arp_pkt = (struct arp_hdr *)((char *)(vlan_pkt + 1)); + vlan_pkt->eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP); + arp_pkt = (struct rte_arp_hdr *)((char *)(vlan_pkt + 1)); initialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client1, ip_host, - ARP_OP_REPLY); + RTE_ARP_OP_REPLY); virtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt, 1); @@ -4758,13 +4803,16 @@ test_alb_receive_vlan_reply(void) MAX_PKT_BURST); for (pkt_idx = 0; pkt_idx < nb_pkts; pkt_idx++) { - eth_pkt = rte_pktmbuf_mtod(pkts_sent[pkt_idx], struct ether_hdr *); - vlan_pkt = (struct vlan_hdr *)((char *)(eth_pkt + 1)); + eth_pkt = rte_pktmbuf_mtod( + pkts_sent[pkt_idx], struct rte_ether_hdr *); + vlan_pkt = (struct rte_vlan_hdr *)( + (char *)(eth_pkt + 1)); if (vlan_pkt->vlan_tci != rte_cpu_to_be_16(1)) { retval = -1; goto test_end; } - if (vlan_pkt->eth_proto != rte_cpu_to_be_16(ETHER_TYPE_VLAN)) { + if (vlan_pkt->eth_proto != rte_cpu_to_be_16( + RTE_ETHER_TYPE_VLAN)) { retval = -1; goto test_end; } @@ -4773,7 +4821,8 @@ test_alb_receive_vlan_reply(void) retval = -1; goto test_end; } - if (vlan_pkt->eth_proto != rte_cpu_to_be_16(ETHER_TYPE_ARP)) { + if (vlan_pkt->eth_proto != rte_cpu_to_be_16( + RTE_ETHER_TYPE_ARP)) { retval = -1; goto test_end; }