app/testpmd: convert to new Tx offloads API

Ethdev Tx offloads API has changed since:

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

Convert the application to use the new API.

This patch mandates the port to be stopped when configure the Tx
offloads. This is because the PMD must be aware to the offloads changes
on the device and queue configuration.

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 91b1aa2..f5835c1 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -3456,7 +3456,14 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_set(res->port_id, res->vlan_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_tx_vlan =
@@ -3503,7 +3510,14 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_qinq_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_qinq_set(res->port_id, res->vlan_id, res->vlan_id_outer);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_tx_vlan =
@@ -3609,7 +3623,14 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_reset_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_reset(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_reset_tx_vlan =
@@ -3702,11 +3723,16 @@ cmd_csum_parsed(void *parsed_result,
        struct cmd_csum_result *res = parsed_result;
        int hw = 0;
        uint16_t mask = 0;
+       uint64_t csum_offloads = 0;
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN)) {
                printf("invalid port %d\n", res->port_id);
                return;
        }
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set")) {
 
@@ -3715,22 +3741,34 @@ cmd_csum_parsed(void *parsed_result,
 
                if (!strcmp(res->proto, "ip")) {
                        mask = TESTPMD_TX_OFFLOAD_IP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM;
                } else if (!strcmp(res->proto, "udp")) {
                        mask = TESTPMD_TX_OFFLOAD_UDP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
                } else if (!strcmp(res->proto, "tcp")) {
                        mask = TESTPMD_TX_OFFLOAD_TCP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
                } else if (!strcmp(res->proto, "sctp")) {
                        mask = TESTPMD_TX_OFFLOAD_SCTP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM;
                } else if (!strcmp(res->proto, "outer-ip")) {
                        mask = TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
                }
 
-               if (hw)
+               if (hw) {
                        ports[res->port_id].tx_ol_flags |= mask;
-               else
+                       ports[res->port_id].dev_conf.txmode.offloads |=
+                                                       csum_offloads;
+               } else {
                        ports[res->port_id].tx_ol_flags &= (~mask);
+                       ports[res->port_id].dev_conf.txmode.offloads &=
+                                                       (~csum_offloads);
+               }
        }
        csum_show(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_csum_csum =
@@ -3854,15 +3892,24 @@ cmd_tso_set_parsed(void *parsed_result,
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set"))
                ports[res->port_id].tso_segsz = res->tso_segsz;
 
-       if (ports[res->port_id].tso_segsz == 0)
+       if (ports[res->port_id].tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                                               ~DEV_TX_OFFLOAD_TCP_TSO;
                printf("TSO for non-tunneled packets is disabled\n");
-       else
+       } else {
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_TCP_TSO;
                printf("TSO segment size for non-tunneled packets is %d\n",
                        ports[res->port_id].tso_segsz);
+       }
 
        /* display warnings if configuration is not supported by the NIC */
        rte_eth_dev_info_get(res->port_id, &dev_info);
@@ -3871,6 +3918,8 @@ cmd_tso_set_parsed(void *parsed_result,
                printf("Warning: TSO enabled but not "
                        "supported by port %d\n", res->port_id);
        }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tso_set_tso =
@@ -3956,13 +4005,27 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set"))
                ports[res->port_id].tunnel_tso_segsz = res->tso_segsz;
 
-       if (ports[res->port_id].tunnel_tso_segsz == 0)
+       if (ports[res->port_id].tunnel_tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                       ~(DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                         DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                         DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                         DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
                printf("TSO for tunneled packets is disabled\n");
-       else {
+       } else {
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                       (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                        DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                        DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                        DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
                printf("TSO segment size for tunneled packets is %d\n",
                        ports[res->port_id].tunnel_tso_segsz);
 
@@ -3988,6 +4051,8 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
                        printf("Warning: csum set outer-ip must be set to hw "
                                "if outer L3 is IPv4; not necessary for IPv6\n");
        }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tunnel_tso_set_tso =
@@ -13029,8 +13094,13 @@ cmd_set_macsec_offload_on_parsed(
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
 
        ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_MACSEC;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_MACSEC_INSERT;
 #ifdef RTE_LIBRTE_IXGBE_PMD
        ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
 #endif
@@ -13039,6 +13109,7 @@ cmd_set_macsec_offload_on_parsed(
 
        switch (ret) {
        case 0:
+               cmd_reconfig_device_queue(port_id, 1, 1);
                break;
        case -ENODEV:
                printf("invalid port_id %d\n", port_id);
@@ -13113,14 +13184,21 @@ cmd_set_macsec_offload_off_parsed(
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
 
        ports[port_id].tx_ol_flags &= ~TESTPMD_TX_OFFLOAD_MACSEC;
+       ports[port_id].dev_conf.txmode.offloads &=
+                                       ~DEV_TX_OFFLOAD_MACSEC_INSERT;
 #ifdef RTE_LIBRTE_IXGBE_PMD
        ret = rte_pmd_ixgbe_macsec_disable(port_id);
 #endif
 
        switch (ret) {
        case 0:
+               cmd_reconfig_device_queue(port_id, 1, 1);
                break;
        case -ENODEV:
                printf("invalid port_id %d\n", port_id);

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 5571cfe..9d7ddcc 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -627,8 +627,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VLAN_INSERT) {
                printf("VLAN insert:                   ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_INSERT_VLAN)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VLAN_INSERT)
                        printf("on\n");
                else
                        printf("off\n");
@@ -645,8 +645,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) {
                printf("Double VLANs insert:           ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_INSERT_QINQ)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_QINQ_INSERT)
                        printf("on\n");
                else
                        printf("off\n");
@@ -654,7 +654,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) {
                printf("TX IPv4 checksum:              ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPV4_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -662,7 +663,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) {
                printf("TX UDP checksum:               ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -670,7 +672,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) {
                printf("TX TCP checksum:               ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -678,7 +681,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) {
                printf("TX SCTP checksum:              ");
-               if (ports[port_id].tx_ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_SCTP_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -686,8 +690,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) {
                printf("TX Outer IPv4 checksum:        ");
-               if (ports[port_id].tx_ol_flags &
-                   TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
                        printf("on\n");
                else
                        printf("off\n");
@@ -695,7 +699,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) {
                printf("TX TCP segmentation:           ");
-               if (ports[port_id].tso_segsz != 0)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_TCP_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -703,7 +708,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_TSO) {
                printf("TX UDP segmentation:           ");
-               if (ports[port_id].tso_segsz != 0)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_UDP_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -711,7 +717,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO) {
                printf("TSO for VXLAN tunnel packet:   ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_VXLAN_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -719,7 +726,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GRE_TNL_TSO) {
                printf("TSO for GRE tunnel packet:     ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GRE_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -727,7 +735,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPIP_TNL_TSO) {
                printf("TSO for IPIP tunnel packet:    ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_IPIP_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -735,7 +744,8 @@ port_offload_cap_display(portid_t port_id)
 
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_GENEVE_TNL_TSO) {
                printf("TSO for GENEVE tunnel packet:  ");
-               if (ports[port_id].tunnel_tso_segsz)
+               if (ports[port_id].dev_conf.txmode.offloads &
+                   DEV_TX_OFFLOAD_GENEVE_TNL_TSO)
                        printf("on\n");
                else
                        printf("off\n");
@@ -1714,8 +1724,10 @@ rxtx_config_display(void)
                                tx_conf->tx_thresh.pthresh,
                                tx_conf->tx_thresh.hthresh,
                                tx_conf->tx_thresh.wthresh);
-               printf("  TX RS bit threshold=%d - TXQ flags=0x%"PRIx32"\n",
-                               tx_conf->tx_rs_thresh, tx_conf->txq_flags);
+               printf("  TX RS bit threshold=%d - TXQ flags=0x%"PRIx32""
+                      " - TXQ offloads=0x%"PRIx64"\n",
+                               tx_conf->tx_rs_thresh, tx_conf->txq_flags,
+                               tx_conf->offloads);
        }
 }
 
@@ -2793,6 +2805,7 @@ void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
        int vlan_offload;
+
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (vlan_id_is_invalid(vlan_id))
@@ -2806,6 +2819,7 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 
        tx_vlan_reset(port_id);
        ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_INSERT_VLAN;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_VLAN_INSERT;
        ports[port_id].tx_vlan_id = vlan_id;
 }
 
@@ -2813,6 +2827,7 @@ void
 tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 {
        int vlan_offload;
+
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
        if (vlan_id_is_invalid(vlan_id))
@@ -2828,6 +2843,7 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 
        tx_vlan_reset(port_id);
        ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_INSERT_QINQ;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_QINQ_INSERT;
        ports[port_id].tx_vlan_id = vlan_id;
        ports[port_id].tx_vlan_id_outer = vlan_id_outer;
 }
@@ -2839,6 +2855,9 @@ tx_vlan_reset(portid_t port_id)
                return;
        ports[port_id].tx_ol_flags &= ~(TESTPMD_TX_OFFLOAD_INSERT_VLAN |
                                TESTPMD_TX_OFFLOAD_INSERT_QINQ);
+       ports[port_id].dev_conf.txmode.offloads &=
+                               ~(DEV_TX_OFFLOAD_VLAN_INSERT |
+                                 DEV_TX_OFFLOAD_QINQ_INSERT);
        ports[port_id].tx_vlan_id = 0;
        ports[port_id].tx_vlan_id_outer = 0;
 }

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 27268f1..2d5e470 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1470,6 +1470,9 @@ start_port(portid_t pid)
                }
                if (port->need_reconfig_queues > 0) {
                        port->need_reconfig_queues = 0;
+                       port->tx_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
+                       /* Apply Tx offloads configuration */
+                       port->tx_conf.offloads = port->dev_conf.txmode.offloads;
                        /* setup tx queues */
                        for (qi = 0; qi < nb_txq; qi++) {
                                if ((numa_support) &&