X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fbond%2Fmain.c;h=f48400e21156ee25cc6ea11a0c01b26a58116eb0;hb=9847fd125d329a4097bea9276d9bbf5f37859948;hp=24479649e245359b580af40595ebe21603701d77;hpb=f2745bfebc2b5d35bd8cdd3504d5b832abefca83;p=dpdk.git diff --git a/examples/bond/main.c b/examples/bond/main.c index 24479649e2..f48400e211 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -41,6 +41,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -53,13 +57,6 @@ #include "main.h" -#include - - -#include "rte_byteorder.h" -#include "rte_cpuflags.h" -#include "rte_eth_bond.h" - #define RTE_LOGTYPE_DCB RTE_LOGTYPE_USER1 #define NB_MBUF (1024*8) @@ -120,7 +117,7 @@ static struct rte_mempool *mbuf_pool; static struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_NONE, - .max_rx_pkt_len = ETHER_MAX_LEN, + .max_rx_pkt_len = RTE_ETHER_MAX_LEN, .split_hdr_size = 0, }, .rx_adv_conf = { @@ -148,7 +145,12 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool) if (!rte_eth_dev_is_valid_port(portid)) rte_exit(EXIT_FAILURE, "Invalid port\n"); - rte_eth_dev_info_get(portid, &dev_info); + retval = rte_eth_dev_info_get(portid, &dev_info); + if (retval != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) info: %s\n", + portid, strerror(-retval)); + if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) local_port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; @@ -201,9 +203,14 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool) "Start port %d failed (res=%d)", portid, retval); - struct ether_addr addr; + struct rte_ether_addr addr; + + retval = rte_eth_macaddr_get(portid, &addr); + if (retval != 0) + rte_exit(retval, + "Mac address get port %d failed (res=%d)", + portid, retval); - rte_eth_macaddr_get(portid, &addr); printf("Port %u MAC: ", portid); PRINT_MAC(addr); printf("\n"); @@ -230,7 +237,12 @@ bond_port_init(struct rte_mempool *mbuf_pool) BOND_PORT = retval; - rte_eth_dev_info_get(BOND_PORT, &dev_info); + retval = rte_eth_dev_info_get(BOND_PORT, &dev_info); + if (retval != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) info: %s\n", + BOND_PORT, strerror(-retval)); + if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) local_port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; @@ -289,32 +301,43 @@ bond_port_init(struct rte_mempool *mbuf_pool) rte_exit(-1, "\nFailed to activate slaves\n"); } - rte_eth_promiscuous_enable(BOND_PORT); + retval = rte_eth_promiscuous_enable(BOND_PORT); + if (retval != 0) { + rte_exit(EXIT_FAILURE, + "port %u: promiscuous mode enable failed: %s\n", + BOND_PORT, rte_strerror(-retval)); + return; + } - struct ether_addr addr; + struct rte_ether_addr 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); - rte_eth_macaddr_get(BOND_PORT, &addr); printf("Port %u MAC: ", (unsigned)BOND_PORT); PRINT_MAC(addr); printf("\n"); } static inline size_t -get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto) +get_vlan_offset(struct rte_ether_hdr *eth_hdr, uint16_t *proto) { size_t vlan_offset = 0; - if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto) { - struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1); + if (rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN) == *proto) { + struct rte_vlan_hdr *vlan_hdr = + (struct rte_vlan_hdr *)(eth_hdr + 1); - vlan_offset = sizeof(struct vlan_hdr); + vlan_offset = sizeof(struct rte_vlan_hdr); *proto = vlan_hdr->eth_proto; - if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto) { + if (rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN) == *proto) { vlan_hdr = vlan_hdr + 1; *proto = vlan_hdr->eth_proto; - vlan_offset += sizeof(struct vlan_hdr); + vlan_offset += sizeof(struct rte_vlan_hdr); } } return vlan_offset; @@ -333,20 +356,22 @@ 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 ether_addr d_addr; + struct rte_ether_addr d_addr; - struct ether_hdr *eth_hdr; + struct rte_ether_addr bond_mac_addr; + struct rte_ether_hdr *eth_hdr; struct rte_arp_hdr *arp_hdr; - struct ipv4_hdr *ipv4_hdr; + struct rte_ipv4_hdr *ipv4_hdr; uint16_t ether_type, offset; uint16_t rx_cnt; 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); @@ -364,20 +389,30 @@ 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) { global_flag_stru_p->port_packets[0]++; rte_spinlock_unlock(&global_flag_stru_p->lock); } - eth_hdr = rte_pktmbuf_mtod(pkts[i], struct ether_hdr *); + eth_hdr = rte_pktmbuf_mtod(pkts[i], + struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; - if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) printf("VLAN taged frame, offset:"); offset = get_vlan_offset(eth_hdr, ðer_type); if (offset > 0) printf("%d\n", offset); - if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_ARP)) { + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP)) { if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1) { global_flag_stru_p->port_packets[1]++; rte_spinlock_unlock(&global_flag_stru_p->lock); @@ -385,15 +420,16 @@ static int lcore_main(__attribute__((unused)) void *arg1) arp_hdr = (struct rte_arp_hdr *)( (char *)(eth_hdr + 1) + offset); if (arp_hdr->arp_data.arp_tip == bond_ip) { - 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); + if (arp_hdr->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REQUEST)) { + arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); /* Switch src and dst data and set bonding MAC */ - ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_eth_macaddr_get(BOND_PORT, ð_hdr->s_addr); - ether_addr_copy(&arp_hdr->arp_data.arp_sha, &arp_hdr->arp_data.arp_tha); + rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); + rte_ether_addr_copy(&bond_mac_addr, ð_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); - ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha); + 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); is_free = 1; @@ -401,15 +437,15 @@ static int lcore_main(__attribute__((unused)) void *arg1) rte_eth_tx_burst(BOND_PORT, 0, NULL, 0); } } - } else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) { + } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1) { global_flag_stru_p->port_packets[2]++; rte_spinlock_unlock(&global_flag_stru_p->lock); } - ipv4_hdr = (struct ipv4_hdr *)((char *)(eth_hdr + 1) + offset); + ipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset); if (ipv4_hdr->dst_addr == bond_ip) { - ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_eth_macaddr_get(BOND_PORT, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); + rte_ether_addr_copy(&bond_mac_addr, ð_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); @@ -442,19 +478,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 ether_hdr *eth_hdr; + 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); @@ -464,32 +502,39 @@ 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"); return; } - pkt_size = sizeof(struct ether_hdr) + sizeof(struct rte_arp_hdr); + pkt_size = sizeof(struct rte_ether_hdr) + sizeof(struct rte_arp_hdr); created_pkt->data_len = pkt_size; created_pkt->pkt_len = pkt_size; - eth_hdr = rte_pktmbuf_mtod(created_pkt, struct ether_hdr *); - rte_eth_macaddr_get(BOND_PORT, ð_hdr->s_addr); - memset(ð_hdr->d_addr, 0xFF, ETHER_ADDR_LEN); - eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP); + eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); + rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); + memset(ð_hdr->d_addr, 0xFF, RTE_ETHER_ADDR_LEN); + eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP); 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; + (char *)eth_hdr + sizeof(struct rte_ether_hdr)); + arp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER); + arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + arp_hdr->arp_hlen = RTE_ETHER_ADDR_LEN; arp_hdr->arp_plen = sizeof(uint32_t); - arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REQUEST); + 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, ETHER_ADDR_LEN); + memset(&arp_hdr->arp_data.arp_tha, 0, RTE_ETHER_ADDR_LEN); arp_hdr->arp_data.arp_tip = ((unsigned char *)&res->ip.addr.ipv4)[0] | (((unsigned char *)&res->ip.addr.ipv4)[1] << 8) | @@ -521,15 +566,16 @@ 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(); + int worker_core_id = rte_lcore_id(); rte_spinlock_trylock(&global_flag_stru_p->lock); - if (global_flag_stru_p->LcoreMainIsRunning == 0) { - if (lcore_config[global_flag_stru_p->LcoreMainCore].state != WAIT) { + if (global_flag_stru_p->LcoreMainIsRunning == 0) { + if (rte_eal_get_lcore_state(global_flag_stru_p->LcoreMainCore) + != WAIT) { rte_spinlock_unlock(&global_flag_stru_p->lock); return; } @@ -541,9 +587,9 @@ static void cmd_start_parsed(__attribute__((unused)) void *parsed_result, return; } - /* start lcore main on core != master_core - ARP response thread */ - slave_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0); - if ((slave_core_id >= RTE_MAX_LCORE) || (slave_core_id == 0)) + /* start lcore main on core != main_core - ARP response thread */ + worker_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0); + if ((worker_core_id >= RTE_MAX_LCORE) || (worker_core_id == 0)) return; rte_spinlock_trylock(&global_flag_stru_p->lock); @@ -552,8 +598,8 @@ static void cmd_start_parsed(__attribute__((unused)) void *parsed_result, cmdline_printf(cl, "Starting lcore_main on core %d:%d " "Our IP:%d.%d.%d.%d\n", - slave_core_id, - rte_eal_remote_launch(lcore_main, NULL, slave_core_id), + worker_core_id, + rte_eal_remote_launch(lcore_main, NULL, worker_core_id), BOND_IP_1, BOND_IP_2, BOND_IP_3, @@ -578,9 +624,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" @@ -610,9 +656,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) { @@ -651,9 +697,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) { @@ -694,20 +740,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 ether_addr addr; - uint16_t i = 0; + struct rte_ether_addr addr; + 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); @@ -746,8 +799,8 @@ cmdline_parse_ctx_t main_ctx[] = { NULL, }; -/* prompt function, called from main on MASTER lcore */ -static void prompt(__attribute__((unused)) void *arg1) +/* prompt function, called from main on MAIN lcore */ +static void prompt(__rte_unused void *arg1) { struct cmdline *cl; @@ -762,7 +815,7 @@ static void prompt(__attribute__((unused)) void *arg1) int main(int argc, char *argv[]) { - int ret; + int ret, worker_core_id; uint16_t nb_ports, i; /* init EAL */ @@ -794,25 +847,25 @@ main(int argc, char *argv[]) bond_port_init(mbuf_pool); rte_spinlock_init(&global_flag_stru_p->lock); - int slave_core_id = rte_lcore_id(); /* check state of lcores */ - RTE_LCORE_FOREACH_SLAVE(slave_core_id) { - if (lcore_config[slave_core_id].state != WAIT) - return -EBUSY; + RTE_LCORE_FOREACH_WORKER(worker_core_id) { + if (rte_eal_get_lcore_state(worker_core_id) != WAIT) + return -EBUSY; } - /* start lcore main on core != master_core - ARP response thread */ - slave_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0); - if ((slave_core_id >= RTE_MAX_LCORE) || (slave_core_id == 0)) + + /* start lcore main on core != main_core - ARP response thread */ + worker_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0); + if ((worker_core_id >= RTE_MAX_LCORE) || (worker_core_id == 0)) return -EPERM; global_flag_stru_p->LcoreMainIsRunning = 1; - global_flag_stru_p->LcoreMainCore = slave_core_id; + global_flag_stru_p->LcoreMainCore = worker_core_id; printf("Starting lcore_main on core %d:%d Our IP:%d.%d.%d.%d\n", - slave_core_id, + worker_core_id, rte_eal_remote_launch((lcore_function_t *)lcore_main, NULL, - slave_core_id), + worker_core_id), BOND_IP_1, BOND_IP_2, BOND_IP_3, @@ -823,5 +876,9 @@ main(int argc, char *argv[]) prompt(NULL); rte_delay_ms(100); + + /* clean up the EAL */ + rte_eal_cleanup(); + return 0; }