X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmulti_process%2Fclient_server_mp%2Fmp_server%2Finit.c;h=7afd51af53f416f08217e90abbb82161e1137d2c;hb=824cb29c0e7b8a2b3ed285546c3a39a8e0b3cd44;hp=419194989e963e558dd4edc2b8a3201c6f9aa88d;hpb=d46989e0d3cbd43e9f6dc519cbceb7590b05dc32;p=dpdk.git diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c index 419194989e..7afd51af53 100644 --- a/examples/multi_process/client_server_mp/mp_server/init.c +++ b/examples/multi_process/client_server_mp/mp_server/init.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include @@ -43,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -67,17 +65,12 @@ #include #include "common.h" -#include "init_drivers.h" #include "args.h" #include "init.h" -#include "main.h" #define MBUFS_PER_CLIENT 1536 #define MBUFS_PER_PORT 1536 #define MBUF_CACHE_SIZE 512 -#define MBUF_OVERHEAD (sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) -#define RX_MBUF_DATA_SIZE 2048 -#define MBUF_SIZE (RX_MBUF_DATA_SIZE + MBUF_OVERHEAD) #define RTE_MP_RX_DESC_DEFAULT 512 #define RTE_MP_TX_DESC_DEFAULT 512 @@ -85,41 +78,6 @@ #define NO_FLAGS 0 -/* - * RX and TX Prefetch, Host, and Write-back threshold values should be - * carefully set for optimal performance. Consult the network - * controller's datasheet and supporting DPDK documentation for guidance - * on how these parameters should be set. - */ -/* Default configuration for rx and tx thresholds etc. */ -/* - * These default values are optimized for use with the Intel(R) 82599 10 GbE - * Controller and the DPDK ixgbe PMD. Consider using other values for other - * network controllers and/or network drivers. - */ -#define MP_DEFAULT_PTHRESH 36 -#define MP_DEFAULT_RX_HTHRESH 8 -#define MP_DEFAULT_TX_HTHRESH 0 -#define MP_DEFAULT_WTHRESH 0 - -static const struct rte_eth_rxconf rx_conf_default = { - .rx_thresh = { - .pthresh = MP_DEFAULT_PTHRESH, - .hthresh = MP_DEFAULT_RX_HTHRESH, - .wthresh = MP_DEFAULT_WTHRESH, - }, -}; - -static const struct rte_eth_txconf tx_conf_default = { - .tx_thresh = { - .pthresh = MP_DEFAULT_PTHRESH, - .hthresh = MP_DEFAULT_TX_HTHRESH, - .wthresh = MP_DEFAULT_WTHRESH, - }, - .tx_free_thresh = 0, /* Use PMD default values */ - .tx_rs_thresh = 0, /* Use PMD default values */ -}; - /* The mbuf pool for packet rx */ struct rte_mempool *pktmbuf_pool; @@ -143,10 +101,8 @@ init_mbuf_pools(void) * seems faster to use a cache instead */ printf("Creating mbuf pool '%s' [%u mbufs] ...\n", PKTMBUF_POOL_NAME, num_mbufs); - pktmbuf_pool = rte_mempool_create(PKTMBUF_POOL_NAME, num_mbufs, - MBUF_SIZE, MBUF_CACHE_SIZE, - sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init, - NULL, rte_pktmbuf_init, NULL, SOCKET0, NO_FLAGS ); + pktmbuf_pool = rte_pktmbuf_pool_create(PKTMBUF_POOL_NAME, num_mbufs, + MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id()); return (pktmbuf_pool == NULL); /* 0 on success */ } @@ -164,7 +120,7 @@ init_port(uint8_t port_num) /* for port configuration all features are off by default */ const struct rte_eth_conf port_conf = { .rxmode = { - .mq_mode = ETH_RSS + .mq_mode = ETH_MQ_RX_RSS } }; const uint16_t rx_rings = 1, tx_rings = num_clients; @@ -185,13 +141,15 @@ init_port(uint8_t port_num) for (q = 0; q < rx_rings; q++) { retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size, - SOCKET0, &rx_conf_default, pktmbuf_pool); + rte_eth_dev_socket_id(port_num), + NULL, pktmbuf_pool); if (retval < 0) return retval; } for ( q = 0; q < tx_rings; q ++ ) { retval = rte_eth_tx_queue_setup(port_num, q, tx_ring_size, - SOCKET0, &tx_conf_default); + rte_eth_dev_socket_id(port_num), + NULL); if (retval < 0) return retval; } @@ -214,6 +172,8 @@ static int init_shm_rings(void) { unsigned i; + unsigned socket_id; + const char * q_name; const unsigned ringsize = CLIENT_QUEUE_RINGSIZE; clients = rte_malloc("client details", @@ -223,8 +183,10 @@ init_shm_rings(void) for (i = 0; i < num_clients; i++) { /* Create an RX queue for each client */ - clients[i].rx_q = rte_ring_create(get_rx_queue_name(i), - ringsize, SOCKET0, + socket_id = rte_socket_id(); + q_name = get_rx_queue_name(i); + clients[i].rx_q = rte_ring_create(q_name, + ringsize, socket_id, RING_F_SP_ENQ | RING_F_SC_DEQ ); /* single prod, single cons */ if (clients[i].rx_q == NULL) rte_exit(EXIT_FAILURE, "Cannot create rx ring queue for client %u\n", i); @@ -246,21 +208,21 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) for (count = 0; count <= MAX_CHECK_TIME; count++) { all_ports_up = 1; for (portid = 0; portid < port_num; portid++) { - if ((port_mask & (1 << portid)) == 0) + if ((port_mask & (1 << ports->id[portid])) == 0) continue; memset(&link, 0, sizeof(link)); - rte_eth_link_get_nowait(portid, &link); + rte_eth_link_get_nowait(ports->id[portid], &link); /* print link status if flag set */ if (print_flag == 1) { if (link.link_status) printf("Port %d Link Up - speed %u " - "Mbps - %s\n", (uint8_t)portid, + "Mbps - %s\n", ports->id[portid], (unsigned)link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? ("full-duplex") : ("half-duplex\n")); else printf("Port %d Link Down\n", - (uint8_t)portid); + (uint8_t)ports->id[portid]); continue; } /* clear all_ports_up flag if any link down */ @@ -305,11 +267,6 @@ init(int argc, char *argv[]) argc -= retval; argv += retval; - /* initialise the nic drivers */ - retval = init_drivers(); - if (retval != 0) - rte_exit(EXIT_FAILURE, "Cannot initialise drivers\n"); - /* get total number of ports */ total_ports = rte_eth_dev_count();