X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmulti_process%2Fclient_server_mp%2Fmp_server%2Finit.c;h=c2ec07ac65843005d2424fa4d3c6bb7207c512e2;hb=c81e3f21d1ea05e5123278b15d9d5e1257b6ba99;hp=505ca6d30ce27d1ee56d0c127571020af5b93eef;hpb=32e7aa0b3a06f014e9aef647da039402fc629fda;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 505ca6d30c..c2ec07ac65 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,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 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 - * are met: - * - * * 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 - * distribution. - * * 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include @@ -43,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -58,68 +27,24 @@ #include #include #include -#include #include #include #include -#include #include #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 +#define RTE_MP_RX_DESC_DEFAULT 1024 +#define RTE_MP_TX_DESC_DEFAULT 1024 #define CLIENT_QUEUE_RINGSIZE 128 #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; @@ -136,19 +61,24 @@ struct port_info *ports; static int init_mbuf_pools(void) { - const unsigned num_mbufs = (num_clients * MBUFS_PER_CLIENT) \ - + (ports->num_ports * MBUFS_PER_PORT); + const unsigned int num_mbufs_server = + RTE_MP_RX_DESC_DEFAULT * ports->num_ports; + const unsigned int num_mbufs_client = + num_clients * (CLIENT_QUEUE_RINGSIZE + + RTE_MP_TX_DESC_DEFAULT * ports->num_ports); + const unsigned int num_mbufs_mp_cache = + (num_clients + 1) * MBUF_CACHE_SIZE; + const unsigned int num_mbufs = + num_mbufs_server + num_mbufs_client + num_mbufs_mp_cache; /* don't pass single-producer/single-consumer flags to mbuf create as it * 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 */ + return pktmbuf_pool == NULL; /* 0 on success */ } /** @@ -159,7 +89,7 @@ init_mbuf_pools(void) * - start the port and report its status to stdout */ static int -init_port(uint8_t port_num) +init_port(uint16_t port_num) { /* for port configuration all features are off by default */ const struct rte_eth_conf port_conf = { @@ -168,13 +98,13 @@ init_port(uint8_t port_num) } }; const uint16_t rx_rings = 1, tx_rings = num_clients; - const uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT; - const uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT; + uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT; + uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT; uint16_t q; int retval; - printf("Port %u init ... ", (unsigned)port_num); + printf("Port %u init ... ", port_num); fflush(stdout); /* Standard DPDK port initialisation - config port, then set up @@ -183,19 +113,28 @@ init_port(uint8_t port_num) &port_conf)) != 0) return retval; + retval = rte_eth_dev_adjust_nb_rx_tx_desc(port_num, &rx_ring_size, + &tx_ring_size); + if (retval != 0) + return retval; + 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; } - rte_eth_promiscuous_enable(port_num); + retval = rte_eth_promiscuous_enable(port_num); + if (retval < 0) + return retval; retval = rte_eth_dev_start(port_num); if (retval < 0) return retval; @@ -214,6 +153,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 +164,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); @@ -234,37 +177,46 @@ init_shm_rings(void) /* Check the link status of all ports in up to 9s, and print them finally */ static void -check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) +check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) { #define CHECK_INTERVAL 100 /* 100ms */ #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */ - uint8_t portid, count, all_ports_up, print_flag = 0; + uint16_t portid; + uint8_t count, all_ports_up, print_flag = 0; struct rte_eth_link link; + int ret; printf("\nChecking link status"); fflush(stdout); 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); + ret = rte_eth_link_get_nowait(ports->id[portid], &link); + if (ret < 0) { + all_ports_up = 0; + if (print_flag == 1) + printf("Port %u link get failed: %s\n", + portid, rte_strerror(-ret)); + continue; + } /* 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")); + ("full-duplex") : ("half-duplex")); 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 */ - if (link.link_status == 0) { + if (link.link_status == ETH_LINK_DOWN) { all_ports_up = 0; break; } @@ -296,7 +248,7 @@ init(int argc, char *argv[]) { int retval; const struct rte_memzone *mz; - uint8_t i, total_ports; + uint16_t i; /* init EAL, parsing EAL args */ retval = rte_eal_init(argc, argv); @@ -305,14 +257,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(); - /* set up array for port data */ mz = rte_memzone_reserve(MZ_PORT_INFO, sizeof(*ports), rte_socket_id(), NO_FLAGS); @@ -322,7 +266,7 @@ init(int argc, char *argv[]) ports = mz->addr; /* parse additional, application arguments */ - retval = parse_app_args(total_ports, argc, argv); + retval = parse_app_args(argc, argv); if (retval != 0) return -1;