examples: use factorized default Rx/Tx configuration

[dpdk.git] / examples / ip_reassembly / main.c

diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 1b60e41..0d92b3c 100644 (file)
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -114,25 +114,6 @@
 static uint32_t max_flow_num = DEF_FLOW_NUM;
 static uint32_t max_flow_ttl = DEF_FLOW_TTL;
 
-/*
- * 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.
- */
-#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
-#define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
-#define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */
-
-/*
- * 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 TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
-#define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
-#define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
-
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 
 #define NB_SOCKETS 8
@@ -236,26 +217,6 @@ static struct rte_eth_conf port_conf = {
        },
 };
 
-static const struct rte_eth_rxconf rx_conf = {
-       .rx_thresh = {
-               .pthresh = RX_PTHRESH,
-               .hthresh = RX_HTHRESH,
-               .wthresh = RX_WTHRESH,
-       },
-       .rx_free_thresh = 32,
-};
-
-static const struct rte_eth_txconf tx_conf = {
-       .tx_thresh = {
-               .pthresh = TX_PTHRESH,
-               .hthresh = TX_HTHRESH,
-               .wthresh = TX_WTHRESH,
-       },
-       .tx_free_thresh = 0, /* Use PMD default values */
-       .tx_rs_thresh = 0, /* Use PMD default values */
-       .txq_flags = 0x0,
-};
-
 /*
  * IPv4 forwarding table
  */
@@ -412,8 +373,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
                        dr = &qconf->death_row;
 
                        /* prepare mbuf: setup l2_len/l3_len. */
-                       m->pkt.vlan_macip.f.l2_len = sizeof(*eth_hdr);
-                       m->pkt.vlan_macip.f.l3_len = sizeof(*ip_hdr);
+                       m->l2_len = sizeof(*eth_hdr);
+                       m->l3_len = sizeof(*ip_hdr);
 
                        /* process this fragment. */
                        mo = rte_ipv4_frag_reassemble_packet(tbl, dr, m, tms, ip_hdr);
@@ -455,8 +416,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue,
                        dr  = &qconf->death_row;
 
                        /* prepare mbuf: setup l2_len/l3_len. */
-                       m->pkt.vlan_macip.f.l2_len = sizeof(*eth_hdr);
-                       m->pkt.vlan_macip.f.l3_len = sizeof(*ip_hdr) + sizeof(*frag_hdr);
+                       m->l2_len = sizeof(*eth_hdr);
+                       m->l3_len = sizeof(*ip_hdr) + sizeof(*frag_hdr);
 
                        mo = rte_ipv6_frag_reassemble_packet(tbl, dr, m, tms, ip_hdr, frag_hdr);
                        if (mo == NULL)
@@ -954,7 +915,7 @@ setup_queue_tbl(struct rx_queue *rxq, uint32_t lcore, uint32_t queue)
 
        nb_mbuf = RTE_MAX(nb_mbuf, (uint32_t)NB_MBUF);
 
-       rte_snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
+       snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
 
        if ((rxq->pool = rte_mempool_create(buf, nb_mbuf, MBUF_SIZE, 0,
                        sizeof(struct rte_pktmbuf_pool_private),
@@ -990,7 +951,7 @@ init_mem(void)
 
                if (socket_lpm[socket] == NULL) {
                        RTE_LOG(INFO, IP_RSMBL, "Creating LPM table on socket %i\n", socket);
-                       rte_snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
+                       snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
 
                        lpm = rte_lpm_create(buf, socket, LPM_MAX_RULES, 0);
                        if (lpm == NULL) {
@@ -1002,7 +963,7 @@ init_mem(void)
 
                if (socket_lpm6[socket] == NULL) {
                        RTE_LOG(INFO, IP_RSMBL, "Creating LPM6 table on socket %i\n", socket);
-                       rte_snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
+                       snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
 
                        lpm6 = rte_lpm6_create("IP_RSMBL_LPM6", socket, &lpm6_config);
                        if (lpm6 == NULL) {
@@ -1058,6 +1019,8 @@ int
 MAIN(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_txconf *txconf;
        struct rx_queue *rxq;
        int ret, socket;
        unsigned nb_ports;
@@ -1078,9 +1041,6 @@ MAIN(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid IP reassembly parameters\n");
 
-       if (rte_eal_pci_probe() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
-
        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
@@ -1149,7 +1109,7 @@ MAIN(int argc, char **argv)
 
                /* init one RX queue */
                ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
-                                            socket, &rx_conf,
+                                            socket, NULL,
                                             rxq->pool);
                if (ret < 0) {
                        printf("\n");
@@ -1172,8 +1132,13 @@ MAIN(int argc, char **argv)
 
                        printf("txq=%u,%d,%d ", lcore_id, queueid, socket);
                        fflush(stdout);
+
+                       rte_eth_dev_info_get(portid, &dev_info);
+                       txconf = &dev_info.default_txconf;
+                       txconf->txq_flags = 0;
+
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
-                                       socket, &tx_conf);
+                                       socket, txconf);
                        if (ret < 0)
                                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, "
                                        "port=%d\n", ret, portid);