commit 5bec5f7860dafcef6aefd50b74de15d08910c6f4
author Chenmin Sun <chenmin.sun@intel.com> Fri Oct 11 00:28:13 2019 +0800
committer Damjan Marion <dmarion@me.com> Fri Nov 01 17:26:43 2019 +0000
tree df54bc624663762571d141cf91b41116685c7fec
parent f9d784b6b9d3acf141ccccf3faf51f409f405294

dpdk: fix tso not properly check the 'enable-tcp-udp-checksum' option issue

Type: fix

Fix tso did not properly check the 'enable-tcp-udp-checksum' option issue
Add description of 'tso' and 'enable-tcp-udp-checksum' in startup.conf

Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
Change-Id: Id659067a9fa9e1db6c3f8dc533a2e90351b86831

src/plugins/dpdk/device/init.c

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 1068e2e..4cf827c 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -748,22 +748,21 @@
 	if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL)
 	  hi->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
 
-    if (devconf->tso == DPDK_DEVICE_TSO_ON)
-    {
-      if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL)
-      {
-        /*tcp_udp checksum must be enabled*/
-        if (hi->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD)
-        {
-          hi->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
-          vnm->interface_main.gso_interface_count++;
-          xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_TSO |
-                                   DEV_TX_OFFLOAD_UDP_TSO;
-        }
-        else
-          return clib_error_return (0, "TSO: TCP/UDP checksum offload must be enabled");
-      }
-    }
+      if (devconf->tso == DPDK_DEVICE_TSO_ON && hi != NULL)
+	{
+	  /*tcp_udp checksum must be enabled*/
+	  if ((dm->conf->enable_tcp_udp_checksum) &&
+	      (hi->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD))
+	    {
+		hi->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
+		vnm->interface_main.gso_interface_count++;
+		xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_TSO |
+		  DEV_TX_OFFLOAD_UDP_TSO;
+	    }
+	  else
+	    clib_warning ("%s: TCP/UDP checksum offload must be enabled",
+	      hi->name);
+	}
 
       dpdk_device_setup (xd);
 

src/vpp/conf/startup.conf

diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index b61e451..3d83a13 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -100,6 +100,11 @@
 		## VLAN strip offload mode for interface
 		## Default is off
 		# vlan-strip-offload on
+
+		## TCP Segment Offload
+		## Default is off
+		## To enable TSO, 'enable-tcp-udp-checksum' must be set
+		# tso on
 	# }
 
 	## Whitelist specific interface by specifying PCI address
@@ -135,6 +140,10 @@
 	## Disables UDP / TCP TX checksum offload. Typically needed for use
 	## faster vector PMDs (together with no-multi-seg)
 	# no-tx-checksum-offload
+
+	## Enable UDP / TCP TX checksum offload
+	## This is the reversed option of 'no-tx-checksum-offload'
+	# enable-tcp-udp-checksum
 # }