[dts] [PATCH] nvgre: Added "L3_IPV4" flag for both nvgre and non-nvgre pks for cavium_a063.

[dts] [PATCH] nvgre: Added "L3_IPV4" flag for both nvgre and non-nvgre pks for cavium_a063.

[usurekha]

From: usurekha <usurekha@marvell.com>

As otx2 hw is capable of identifying pkt as "L3_IPV4" for both normal and
tunnelled pkts instead of "L3_IPV4_EXT_UNKNOWN" flag.
So added "L3_IPv4" flag to identify the pkt for cavium device.

Signed-off-by: usurekha <usurekha@marvell.com>
---
 tests/TestSuite_nvgre.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index c4da924..aea915c 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -158,11 +158,23 @@ class NvgreTestConfig(object):
         self.inner_l4_invalid = 0
         self.payload_size = 18
 
-    def packet_type(self):
+    def packet_type(self,nic = None):
         """
         Return nvgre packet type
         """
-        if self.outer_ip_proto != 47:
+        if "cavium_a063" in nic:
+            if self.outer_ip_proto !=47:
+                if self.outer_l3_type == 'IPv4':
+                    return 'L3_IPV4'
+                else:
+                    return 'L3_IPV6'
+            else:
+                if self.inner_l3_type == 'IPv4':
+                    return 'L3_IPV4'
+                else:
+                    return 'L3_IPV6'
+
+        elif self.outer_ip_proto != 47:
             if self.outer_l3_type == 'IPv4':
                 return 'L3_IPV4_EXT_UNKNOWN'
             else:
@@ -349,7 +361,7 @@ class TestNvgre(TestCase):
         nvgre Prerequisites
         """
         # this feature only enable in FVL now
-        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV"]:
+        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063"]:
             self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR'
         elif self.nic in ["sageville", "sagepond"]:
             self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR'
@@ -458,7 +470,7 @@ class TestNvgre(TestCase):
         # check whether detect nvgre type
         out = self.dut.get_session_output()
         print out
-        self.verify(config.packet_type() in out, "Nvgre Packet not detected")
+        self.verify(config.packet_type(self.nic) in out, "Nvgre Packet not detected")
         self.dut.send_expect("show port stats all", "testpmd>", 10)
         self.dut.send_expect("stop", "testpmd>", 10)
         self.dut.send_expect("quit", "#", 10)
-- 
2.7.4

Re: [dts] [PATCH] nvgre: Added "L3_IPV4" flag for both nvgre and non-nvgre pks for cavium_a063.

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of
> usurekha@marvell.com
> Sent: Tuesday, April 16, 2019 10:16 PM
> To: dts@dpdk.org
> Cc: fmasood@marvell.com; avijay@marvell.com; jerinj@marvell.com;
> usurekha <usurekha@marvell.com>
> Subject: [dts] [PATCH] nvgre: Added "L3_IPV4" flag for both nvgre and non-
> nvgre pks for cavium_a063.
> 
> From: usurekha <usurekha@marvell.com>
> 
> As otx2 hw is capable of identifying pkt as "L3_IPV4" for both normal and
> tunnelled pkts instead of "L3_IPV4_EXT_UNKNOWN" flag.
> So added "L3_IPv4" flag to identify the pkt for cavium device.
> 
> Signed-off-by: usurekha <usurekha@marvell.com>
> ---
>  tests/TestSuite_nvgre.py | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index
> c4da924..aea915c 100644
> --- a/tests/TestSuite_nvgre.py
> +++ b/tests/TestSuite_nvgre.py
> @@ -158,11 +158,23 @@ class NvgreTestConfig(object):
>          self.inner_l4_invalid = 0
>          self.payload_size = 18
> 
> -    def packet_type(self):
> +    def packet_type(self,nic = None):
>          """
>          Return nvgre packet type
>          """
> -        if self.outer_ip_proto != 47:
> +        if "cavium_a063" in nic:
> +            if self.outer_ip_proto !=47:
> +                if self.outer_l3_type == 'IPv4':
> +                    return 'L3_IPV4'
> +                else:
> +                    return 'L3_IPV6'
> +            else:
> +                if self.inner_l3_type == 'IPv4':
> +                    return 'L3_IPV4'
> +                else:
> +                    return 'L3_IPV6'
> +
> +        elif self.outer_ip_proto != 47:
>              if self.outer_l3_type == 'IPv4':
>                  return 'L3_IPV4_EXT_UNKNOWN'
>              else:
> @@ -349,7 +361,7 @@ class TestNvgre(TestCase):
>          nvgre Prerequisites
>          """
>          # this feature only enable in FVL now
> -        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g", "fortpark_TLV"]:
> +        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single",
> "fortville_25g", "fortpark_TLV", "cavium_a063"]:
>              self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR'
>          elif self.nic in ["sageville", "sagepond"]:
>              self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR'
> @@ -458,7 +470,7 @@ class TestNvgre(TestCase):
>          # check whether detect nvgre type
>          out = self.dut.get_session_output()
>          print out
> -        self.verify(config.packet_type() in out, "Nvgre Packet not detected")
> +        self.verify(config.packet_type(self.nic) in out, "Nvgre Packet
> + not detected")
>          self.dut.send_expect("show port stats all", "testpmd>", 10)
>          self.dut.send_expect("stop", "testpmd>", 10)
>          self.dut.send_expect("quit", "#", 10)
> --
> 2.7.4