X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fvmdq%2Fmain.c;h=7596bac3ceabac1aa0a246e0d70290b1cd5e658f;hb=ea0c20ea95fd5d71a10757e6598ac66233ea1495;hp=5a2305f831e496a6be0067878c3135f965b849b7;hpb=2a13a5a08d0d968cb8b2297cea10149c6f24266e;p=dpdk.git diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c index 5a2305f831..7596bac3ce 100644 --- a/examples/vmdq/main.c +++ b/examples/vmdq/main.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -70,8 +69,6 @@ #include #include -#include "main.h" - #define MAX_QUEUES 128 /* * For 10 GbE, 128 queues require roughly @@ -79,7 +76,7 @@ */ #define NUM_MBUFS_PER_PORT (128*512) #define MBUF_CACHE_SIZE 64 -#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) +#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM) #define MAX_PKT_BURST 32 @@ -92,7 +89,7 @@ #define INVALID_PORT_ID 0xFF /* mask of enabled ports */ -static uint32_t enabled_port_mask = 0; +static uint32_t enabled_port_mask; /* number of pools (if user does not specify any, 8 by default */ static uint32_t num_queues = 8; @@ -129,10 +126,10 @@ static const struct rte_eth_conf vmdq_conf_default = { static unsigned lcore_ids[RTE_MAX_LCORE]; static uint8_t ports[RTE_MAX_ETHPORTS]; -static unsigned num_ports = 0; /**< The number of ports specified in command line */ +static unsigned num_ports; /**< The number of ports specified in command line */ /* array used for printing out statistics */ -volatile unsigned long rxPackets[ MAX_QUEUES ] = {0}; +volatile unsigned long rxPackets[MAX_QUEUES] = {0}; const uint16_t vlan_tags[] = { 0, 1, 2, 3, 4, 5, 6, 7, @@ -161,8 +158,11 @@ static struct ether_addr vmdq_ports_eth_addr[RTE_MAX_ETHPORTS]; #define MAX_POOL_MAP_NUM_1G 32 #define MAX_POOL_NUM_10G 64 #define MAX_POOL_NUM_1G 8 -/* Builds up the correct configuration for vmdq based on the vlan tags array - * given above, and determine the queue number and pool map number according to valid pool number */ +/* + * Builds up the correct configuration for vmdq based on the vlan tags array + * given above, and determine the queue number and pool map number according to + * valid pool number + */ static inline int get_eth_conf(struct rte_eth_conf *eth_conf, uint32_t num_pools) { @@ -174,8 +174,8 @@ get_eth_conf(struct rte_eth_conf *eth_conf, uint32_t num_pools) conf.enable_default_pool = 0; conf.default_pool = 0; /* set explicit value, even if not used */ - for (i = 0; i < conf.nb_pool_maps; i++){ - conf.pool_map[i].vlan_id = vlan_tags[ i ]; + for (i = 0; i < conf.nb_pool_maps; i++) { + conf.pool_map[i].vlan_id = vlan_tags[i]; conf.pool_map[i].pools = (1UL << (i % num_pools)); } @@ -202,8 +202,11 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) uint16_t queues_per_pool; uint32_t max_nb_pools; - /* The max pool number from dev_info will be used to validate the pool number specified in cmd line */ - rte_eth_dev_info_get (port, &dev_info); + /* + * The max pool number from dev_info will be used to validate the pool + * number specified in cmd line + */ + rte_eth_dev_info_get(port, &dev_info); max_nb_pools = (uint32_t)dev_info.max_vmdq_pools; /* * We allow to process part of VMDQ pools specified by num_pools in @@ -234,7 +237,8 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) num_pf_queues, num_pools, queues_per_pool); printf("vmdq queue base: %d pool base %d\n", vmdq_queue_base, vmdq_pool_base); - if (port >= rte_eth_dev_count()) return -1; + if (port >= rte_eth_dev_count()) + return -1; /* * Though in this example, we only receive packets from the first queue @@ -253,7 +257,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) rte_eth_dev_info_get(port, &dev_info); rxconf = &dev_info.default_rxconf; rxconf->rx_drop_en = 1; - for (q = 0; q < rxRings; q ++) { + for (q = 0; q < rxRings; q++) { retval = rte_eth_rx_queue_setup(port, q, rxRingSize, rte_eth_dev_socket_id(port), rxconf, @@ -264,7 +268,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) } } - for (q = 0; q < txRings; q ++) { + for (q = 0; q < txRings; q++) { retval = rte_eth_tx_queue_setup(port, q, txRingSize, rte_eth_dev_socket_id(port), NULL); @@ -380,7 +384,8 @@ vmdq_parse_args(int argc, char **argv) }; /* Parse command line */ - while ((opt = getopt_long(argc, argv, "p:",long_option,&option_index)) != EOF) { + while ((opt = getopt_long(argc, argv, "p:", long_option, + &option_index)) != EOF) { switch (opt) { /* portmask */ case 'p': @@ -392,7 +397,7 @@ vmdq_parse_args(int argc, char **argv) } break; case 0: - if (vmdq_parse_num_pools(optarg) == -1){ + if (vmdq_parse_num_pools(optarg) == -1) { printf("invalid number of pools\n"); vmdq_usage(prgname); return -1; @@ -405,14 +410,14 @@ vmdq_parse_args(int argc, char **argv) } } - for(i = 0; i < RTE_MAX_ETHPORTS; i++) { + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { if (enabled_port_mask & (1 << i)) ports[num_ports++] = (uint8_t)i; } if (num_ports < 2 || num_ports % 2) { printf("Current enabled port number is %u," - "but it should be even and at least 2\n",num_ports); + "but it should be even and at least 2\n", num_ports); return -1; } @@ -435,27 +440,25 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); } -#ifndef RTE_EXEC_ENV_BAREMETAL /* When we receive a HUP signal, print out our stats */ static void sighup_handler(int signum) { unsigned q; - for (q = 0; q < num_queues; q ++) { + for (q = 0; q < num_queues; q++) { if (q % (num_queues/num_pools) == 0) printf("\nPool %u: ", q/(num_queues/num_pools)); - printf("%lu ", rxPackets[ q ]); + printf("%lu ", rxPackets[q]); } printf("\nFinished handling signal %d\n", signum); } -#endif /* * Main thread that does the work, reading from INPUT_PORT * and writing to OUTPUT_PORT */ static int -lcore_main(__attribute__((__unused__)) void* dummy) +lcore_main(__attribute__((__unused__)) void *dummy) { const uint16_t lcore_id = (uint16_t)rte_lcore_id(); const uint16_t num_cores = (uint16_t)rte_lcore_count(); @@ -464,7 +467,7 @@ lcore_main(__attribute__((__unused__)) void* dummy) uint16_t q, i, p; const uint16_t remainder = (uint16_t)(num_vmdq_queues % num_cores); - for (i = 0; i < num_cores; i ++) + for (i = 0; i < num_cores; i++) if (lcore_ids[i] == lcore_id) { core_id = i; break; @@ -498,7 +501,7 @@ lcore_main(__attribute__((__unused__)) void* dummy) if (startQueue == endQueue) { printf("lcore %u has nothing to do\n", lcore_id); - return (0); + return 0; } for (;;) { @@ -507,8 +510,8 @@ lcore_main(__attribute__((__unused__)) void* dummy) for (p = 0; p < num_ports; p++) { const uint8_t sport = ports[p]; - const uint8_t dport = ports[p ^ 1]; /* 0 <-> 1, 2 <-> 3 etc */ - + /* 0 <-> 1, 2 <-> 3 etc */ + const uint8_t dport = ports[p ^ 1]; if ((sport == INVALID_PORT_ID) || (dport == INVALID_PORT_ID)) continue; @@ -553,12 +556,12 @@ static unsigned check_ports_num(unsigned nb_ports) num_ports = nb_ports; } - for (portid = 0; portid < num_ports; portid ++) { + for (portid = 0; portid < num_ports; portid++) { if (ports[portid] >= nb_ports) { printf("\nSpecified port ID(%u) exceeds max system port ID(%u)\n", ports[portid], (nb_ports - 1)); ports[portid] = INVALID_PORT_ID; - valid_num_ports --; + valid_num_ports--; } } return valid_num_ports; @@ -566,7 +569,7 @@ static unsigned check_ports_num(unsigned nb_ports) /* Main function, does initialisation and calls the per-lcore functions */ int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { struct rte_mempool *mbuf_pool; unsigned lcore_id, core_id = 0; @@ -574,9 +577,7 @@ MAIN(int argc, char *argv[]) unsigned nb_ports, valid_num_ports; uint8_t portid; -#ifndef RTE_EXEC_ENV_BAREMETAL signal(SIGHUP, sighup_handler); -#endif /* init EAL */ ret = rte_eal_init(argc, argv); @@ -590,12 +591,12 @@ MAIN(int argc, char *argv[]) if (ret < 0) rte_exit(EXIT_FAILURE, "Invalid VMDQ argument\n"); - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++) + for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) if (rte_lcore_is_enabled(lcore_id)) - lcore_ids[core_id ++] = lcore_id; + lcore_ids[core_id++] = lcore_id; if (rte_lcore_count() > RTE_MAX_LCORE) - rte_exit(EXIT_FAILURE,"Not enough cores\n"); + rte_exit(EXIT_FAILURE, "Not enough cores\n"); nb_ports = rte_eth_dev_count(); if (nb_ports > RTE_MAX_ETHPORTS) @@ -612,12 +613,9 @@ MAIN(int argc, char *argv[]) rte_exit(EXIT_FAILURE, "Error with valid ports number is not even or less than 2\n"); } - mbuf_pool = rte_mempool_create("MBUF_POOL", NUM_MBUFS_PER_PORT * nb_ports, - MBUF_SIZE, MBUF_CACHE_SIZE, - sizeof(struct rte_pktmbuf_pool_private), - rte_pktmbuf_pool_init, NULL, - rte_pktmbuf_init, NULL, - rte_socket_id(), 0); + mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", + NUM_MBUFS_PER_PORT * nb_ports, MBUF_CACHE_SIZE, + 0, MBUF_DATA_SIZE, rte_socket_id()); if (mbuf_pool == NULL) rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");