examples/multi_process: convert to new ethdev offloads API

Ethdev offloads API has changed since:

commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
commit cba7f53b717d ("ethdev: introduce Tx queue offloads API")

This commit support the new API.

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/examples/multi_process/l2fwd_fork/main.c b/examples/multi_process/l2fwd_fork/main.c
index d17eb5b..2e56cc4 100644 (file)
--- a/examples/multi_process/l2fwd_fork/main.c
+++ b/examples/multi_process/l2fwd_fork/main.c
@@ -127,11 +127,8 @@ struct cpu_aff_arg{
 static const struct rte_eth_conf port_conf = {
        .rxmode = {
                .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .hw_ip_checksum = 0, /**< IP checksum offload disabled */
-               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-               .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
+               .ignore_offload_bitfield = 1,
+               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -1032,6 +1029,10 @@ main(int argc, char **argv)
 
        /* Initialise each port */
        for (portid = 0; portid < nb_ports; portid++) {
+               struct rte_eth_rxconf rxq_conf;
+               struct rte_eth_txconf txq_conf;
+               struct rte_eth_conf local_port_conf = port_conf;
+
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
                        printf("Skipping disabled port %u\n", (unsigned) portid);
@@ -1041,7 +1042,11 @@ main(int argc, char **argv)
                /* init port */
                printf("Initializing port %u... ", (unsigned) portid);
                fflush(stdout);
-               ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
+               rte_eth_dev_info_get(portid, &dev_info);
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       local_port_conf.txmode.offloads |=
+                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+               ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
                                  ret, (unsigned) portid);
@@ -1057,9 +1062,11 @@ main(int argc, char **argv)
 
                /* init one RX queue */
                fflush(stdout);
+               rxq_conf = dev_info.default_rxconf;
+               rxq_conf.offloads = local_port_conf.rxmode.offloads;
                ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
                                             rte_eth_dev_socket_id(portid),
-                                            NULL,
+                                            &rxq_conf,
                                             l2fwd_pktmbuf_pool[portid]);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
@@ -1067,9 +1074,12 @@ main(int argc, char **argv)
 
                /* init one TX queue on each port */
                fflush(stdout);
+               txq_conf = dev_info.default_txconf;
+               txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
+               txq_conf.tx_offloads = local_port_conf.txmode.offloads;
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid),
-                               NULL);
+                               &txq_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
                                ret, (unsigned) portid);

diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index d99c563..1c77205 100644 (file)
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -178,11 +178,9 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
                        .rxmode = {
                                .mq_mode        = ETH_MQ_RX_RSS,
                                .split_hdr_size = 0,
-                               .header_split   = 0, /**< Header Split disabled */
-                               .hw_ip_checksum = 1, /**< IP checksum offload enabled */
-                               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-                               .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-                               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
+                               .ignore_offload_bitfield = 1,
+                               .offloads = (DEV_RX_OFFLOAD_CHECKSUM |
+                                            DEV_RX_OFFLOAD_CRC_STRIP),
                        },
                        .rx_adv_conf = {
                                .rss_conf = {
@@ -196,6 +194,8 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
        };
        const uint16_t rx_rings = num_queues, tx_rings = num_queues;
        struct rte_eth_dev_info info;
+       struct rte_eth_rxconf rxq_conf;
+       struct rte_eth_txconf txq_conf;
        int retval;
        uint16_t q;
        uint16_t nb_rxd = RX_RING_SIZE;
@@ -213,6 +213,9 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
        rte_eth_dev_info_get(port, &info);
        info.default_rxconf.rx_drop_en = 1;
 
+       if (info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+               port_conf.txmode.offloads |=
+                       DEV_TX_OFFLOAD_MBUF_FAST_FREE;
        retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
        if (retval < 0)
                return retval;
@@ -221,19 +224,24 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
        if (retval < 0)
                return retval;
 
+       rxq_conf = info.default_rxconf;
+       rxq_conf.offloads = port_conf.rxmode.offloads;
        for (q = 0; q < rx_rings; q ++) {
                retval = rte_eth_rx_queue_setup(port, q, nb_rxd,
                                rte_eth_dev_socket_id(port),
-                               &info.default_rxconf,
+                               &rxq_conf,
                                mbuf_pool);
                if (retval < 0)
                        return retval;
        }
 
+       txq_conf = info.default_txconf;
+       txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
+       txq_conf.offloads = port_conf.txmode.offloads;
        for (q = 0; q < tx_rings; q ++) {
                retval = rte_eth_tx_queue_setup(port, q, nb_txd,
                                rte_eth_dev_socket_id(port),
-                               NULL);
+                               &txq_conf);
                if (retval < 0)
                        return retval;
        }