X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmulti_process%2Fclient_server_mp%2Fmp_client%2Fclient.c;h=f8453e57ad83ced934451819ac2495a221a33ac3;hb=c5acbb5ea20e452e4d123a7562d1c46a72b8938a;hp=3d00dcadb39824f892c5ba02b29a5bd99ba23489;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c index 3d00dcadb3..f8453e57ad 100644 --- a/examples/multi_process/client_server_mp/mp_client/client.c +++ b/examples/multi_process/client_server_mp/mp_client/client.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2016 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,19 +42,17 @@ #include #include +#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -66,7 +63,6 @@ #include #include "common.h" -#include "init_drivers.h" /* Number of packets to attempt to read from queue */ #define PKT_READ_SIZE ((uint16_t)32) @@ -75,17 +71,13 @@ * queue to write to. */ static uint8_t client_id = 0; -struct mbuf_queue { #define MBQ_CAPACITY 32 - struct rte_mbuf *bufs[MBQ_CAPACITY]; - uint16_t top; -}; /* maps input ports to output ports for packets */ static uint8_t output_ports[RTE_MAX_ETHPORTS]; /* buffers up a set of packet that are ready to send */ -static struct mbuf_queue output_bufs[RTE_MAX_ETHPORTS]; +struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS]; /* shared data from server. We update statistics here */ static volatile struct tx_stats *tx_stats; @@ -151,12 +143,52 @@ parse_app_args(int argc, char *argv[]) return 0; } +/* + * Tx buffer error callback + */ +static void +flush_tx_error_callback(struct rte_mbuf **unsent, uint16_t count, + void *userdata) { + int i; + uint8_t port_id = (uintptr_t)userdata; + + tx_stats->tx_drop[port_id] += count; + + /* free the mbufs which failed from transmit */ + for (i = 0; i < count; i++) + rte_pktmbuf_free(unsent[i]); + +} + +static void +configure_tx_buffer(uint8_t port_id, uint16_t size) +{ + int ret; + + /* Initialize TX buffers */ + tx_buffer[port_id] = rte_zmalloc_socket("tx_buffer", + RTE_ETH_TX_BUFFER_SIZE(size), 0, + rte_eth_dev_socket_id(port_id)); + if (tx_buffer[port_id] == NULL) + rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n", + (unsigned) port_id); + + rte_eth_tx_buffer_init(tx_buffer[port_id], size); + + ret = rte_eth_tx_buffer_set_err_callback(tx_buffer[port_id], + flush_tx_error_callback, (void *)(intptr_t)port_id); + if (ret < 0) + rte_exit(EXIT_FAILURE, "Cannot set error callback for " + "tx buffer on port %u\n", (unsigned) port_id); +} + /* * set up output ports so that all traffic on port gets sent out * its paired port. Index using actual port numbers since that is * what comes in the mbuf structure. */ -static void configure_output_ports(const struct port_info *ports) +static void +configure_output_ports(const struct port_info *ports) { int i; if (ports->num_ports > RTE_MAX_ETHPORTS) @@ -167,41 +199,11 @@ static void configure_output_ports(const struct port_info *ports) uint8_t p2 = ports->id[i+1]; output_ports[p1] = p2; output_ports[p2] = p1; - } -} + configure_tx_buffer(p1, MBQ_CAPACITY); + configure_tx_buffer(p2, MBQ_CAPACITY); -static inline void -send_packets(uint8_t port) -{ - uint16_t i, sent; - struct mbuf_queue *mbq = &output_bufs[port]; - - if (unlikely(mbq->top == 0)) - return; - - sent = rte_eth_tx_burst(port, client_id, mbq->bufs, mbq->top); - if (unlikely(sent < mbq->top)){ - for (i = sent; i < mbq->top; i++) - rte_pktmbuf_free(mbq->bufs[i]); - tx_stats->tx_drop[port] += (mbq->top - sent); } - tx_stats->tx[port] += sent; - mbq->top = 0; -} - -/* - * Enqueue a packet to be sent on a particular port, but - * don't send it yet. Only when the buffer is full. - */ -static inline void -enqueue_packet(struct rte_mbuf *buf, uint8_t port) -{ - struct mbuf_queue *mbq = &output_bufs[port]; - mbq->bufs[mbq->top++] = buf; - - if (mbq->top == MBQ_CAPACITY) - send_packets(port); } /* @@ -212,10 +214,15 @@ enqueue_packet(struct rte_mbuf *buf, uint8_t port) static void handle_packet(struct rte_mbuf *buf) { - const uint8_t in_port = buf->pkt.in_port; + int sent; + const uint8_t in_port = buf->port; const uint8_t out_port = output_ports[in_port]; + struct rte_eth_dev_tx_buffer *buffer = tx_buffer[out_port]; + + sent = rte_eth_tx_buffer(out_port, client_id, buffer, buf); + if (sent) + tx_stats->tx[out_port] += sent; - enqueue_packet(buf, out_port); } /* @@ -232,6 +239,7 @@ main(int argc, char *argv[]) int need_flush = 0; /* indicates whether we have unsent packets */ int retval; void *pkts[PKT_READ_SIZE]; + uint16_t sent; if ((retval = rte_eal_init(argc, argv)) < 0) return -1; @@ -241,8 +249,6 @@ main(int argc, char *argv[]) if (parse_app_args(argc, argv) < 0) rte_exit(EXIT_FAILURE, "Invalid command-line arguments\n"); - if (init_drivers() < 0) - rte_exit(EXIT_FAILURE, "Cannot get NIC ports\n"); if (rte_eth_dev_count() == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); @@ -268,19 +274,20 @@ main(int argc, char *argv[]) printf("[Press Ctrl-C to quit ...]\n"); for (;;) { - uint16_t i, rx_pkts = PKT_READ_SIZE; + uint16_t i, rx_pkts; uint8_t port; - /* try dequeuing max possible packets first, if that fails, get the - * most we can. Loop body should only execute once, maximum */ - while (rx_pkts > 0 && - unlikely(rte_ring_dequeue_bulk(rx_ring, pkts, rx_pkts) != 0)) - rx_pkts = (uint16_t)RTE_MIN(rte_ring_count(rx_ring), PKT_READ_SIZE); + rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts, + PKT_READ_SIZE, NULL); if (unlikely(rx_pkts == 0)){ if (need_flush) - for (port = 0; port < ports->num_ports; port++) - send_packets(ports->id[port]); + for (port = 0; port < ports->num_ports; port++) { + sent = rte_eth_tx_buffer_flush(ports->id[port], client_id, + tx_buffer[port]); + if (unlikely(sent)) + tx_stats->tx[port] += sent; + } need_flush = 0; continue; }