diff mbox series

[RFC,net-next,4/7] selftests: openvswitch: Add support for tunnel() key.

Message ID 20240613181333.984810-5-aconole@redhat.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series selftests: net: Switch pmtu.sh to use the internal ovs script. | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 188 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Aaron Conole June 13, 2024, 6:13 p.m. UTC 
This will be used when setting details about the tunnel to use as
transport.  There is a difference between the ODP format between tunnel():
the 'key' flag is not actually a flag field, so we don't support it in the
same way that the vswitchd userspace supports displaying it.

Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 .../selftests/net/openvswitch/ovs-dpctl.py    | 164 +++++++++++++++++-
 1 file changed, 162 insertions(+), 2 deletions(-)

Comments

Simon Horman June 16, 2024, 4:27 p.m. UTC | #1 
On Thu, Jun 13, 2024 at 02:13:30PM -0400, Aaron Conole wrote:
> This will be used when setting details about the tunnel to use as
> transport.  There is a difference between the ODP format between tunnel():
> the 'key' flag is not actually a flag field, so we don't support it in the
> same way that the vswitchd userspace supports displaying it.
> 
> Signed-off-by: Aaron Conole <aconole@redhat.com>

...

> @@ -1265,6 +1265,165 @@ class ovskey(nla):
>                  init=init,
>              )
>  
> +    class ovs_key_tunnel(nla):
> +        nla_flags = NLA_F_NESTED
> +
> +        nla_map = (
> +            ("OVS_TUNNEL_KEY_ATTR_ID", "be64"),
> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "ipaddr"),
> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_DST", "ipaddr"),
> +            ("OVS_TUNNEL_KEY_ATTR_TOS", "uint8"),
> +            ("OVS_TUNNEL_KEY_ATTR_TTL", "uint8"),
> +            ("OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT", "flag"),
> +            ("OVS_TUNNEL_KEY_ATTR_CSUM", "flag"),
> +            ("OVS_TUNNEL_KEY_ATTR_OAM", "flag"),
> +            ("OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS", "array(uint32)"),
> +            ("OVS_TUNNEL_KEY_ATTR_TP_SRC", "be16"),
> +            ("OVS_TUNNEL_KEY_ATTR_TP_DST", "be16"),
> +            ("OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS", "none"),
> +            ("OVS_TUNNEL_KEY_ATTR_IPV6_SRC", "ipaddr"),
> +            ("OVS_TUNNEL_KEY_ATTR_IPV6_DST", "ipaddr"),
> +            ("OVS_TUNNEL_KEY_ATTR_PAD", "none"),
> +            ("OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS", "none"),
> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_INFO_BRIDGE", "flag"),
> +        )
> +
> +        def parse(self, flowstr, mask=None):
> +            if not flowstr.startswith("tunnel("):
> +                return None, None
> +
> +            k = ovskey.ovs_key_tunnel()
> +            if mask is not None:
> +                mask = ovskey.ovs_key_tunnel()
> +
> +            flowstr = flowstr[len("tunnel("):]
> +
> +            v6_address = None
> +
> +            fields = [
> +                ("tun_id=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_ID",
> +                 0xffffffffffffffff, None, None),
> +
> +                ("src=", r"([0-9a-fA-F\.]+)", str,
> +                 "OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "255.255.255.255", "0.0.0.0",
> +                 False),
> +                ("dst=", r"([0-9a-fA-F\.]+)", str,
> +                 "OVS_TUNNEL_KEY_ATTR_IPV4_DST", "255.255.255.255", "0.0.0.0",
> +                 False),
> +
> +                ("ipv6_src=", r"([0-9a-fA-F:]+)", str,
> +                 "OVS_TUNNEL_KEY_ATTR_IPV6_SRC",
> +                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
> +                ("ipv6_dst=", r"([0-9a-fA-F:]+)", str,
> +                 "OVS_TUNNEL_KEY_ATTR_IPV6_DST",
> +                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
> +
> +                ("tos=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TOS", 255, 0,
> +                 None),
> +                ("ttl=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TTL", 255, 0,
> +                 None),
> +
> +                ("tp_src=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_SRC",
> +                 65535, 0, None),
> +                ("tp_dst=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_DST",
> +                 65535, 0, None),
> +            ]
> +
> +            forced_include = ["OVS_TUNNEL_KEY_ATTR_TTL"]
> +
> +            for prefix, regex, typ, attr_name, mask_val, default_val, v46_flag in fields:
> +                flowstr, value = parse_extract_field(flowstr, prefix, regex, typ, False)
> +                if not attr_name:
> +                    raise Exception("Bad list value in tunnel fields")
> +
> +                if value is None and attr_name in forced_include:
> +                    value = default_val
> +                    mask_val = default_val
> +
> +                if value is not None:
> +                    if v6_address is None and v46_flag is not None:
> +                        v6_address = v46_flag

By my reading, at this point v6_address will only be None if v46_flag is
not None.  IF so, the condition below seems excessive.

> +                    if v6_address is not None and v46_flag is not None \
> +                       and v46_flag != v6_address:
> +                        raise ValueError("Cannot mix v6 and v4 addresses")

I wonder if we can instead express this as (completely untested!):

                    if v46_flag is not None:
                        if v6_address is None:
                            v6_address = v46_flag
                        if v46_flag != v6_address:
                            raise ValueError("Cannot mix v6 and v4 addresses")

> +                    k["attrs"].append([attr_name, value])
> +                    if mask is not None:
> +                        mask["attrs"].append([attr_name, mask_val])
> +                else:
> +                    if v6_address is not None and v46_flag is not None \
> +                       and v46_flag != v6_address:
> +                        continue
> +                    if v6_address is None and v46_flag is not None:
> +                        continue

And I wonder if this is a bit easier on the eyes (also completely untested):

                    if v46_flag is not None:
                        if v6_address is None or v46_flag != v6_address:
                            continue

> +                    if mask is not None:
> +                        mask["attrs"].append([attr_name, default_val])
> +
> +            if k["attrs"][0][0] != "OVS_TUNNEL_KEY_ATTR_ID":
> +                raise ValueError("Needs a tunid set")

...

> @@ -1745,7 +1905,7 @@ class OvsVport(GenericNetlinkSocket):
>          )
>  
>          TUNNEL_DEFAULTS = [("geneve", 6081),
> -                           ("vxlan", 4798)]
> +                           ("vxlan", 4789)]
>  
>          for tnl in TUNNEL_DEFAULTS:
>              if ptype == tnl[0]:

As noted in my response to PATCH 1/7, I think that the
change in the hunk above belongs there rather than here.
Aaron Conole June 17, 2024, 5:56 p.m. UTC | #2 
Simon Horman <horms@kernel.org> writes:

> On Thu, Jun 13, 2024 at 02:13:30PM -0400, Aaron Conole wrote:
>> This will be used when setting details about the tunnel to use as
>> transport.  There is a difference between the ODP format between tunnel():
>> the 'key' flag is not actually a flag field, so we don't support it in the
>> same way that the vswitchd userspace supports displaying it.
>> 
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>
> ...
>
>> @@ -1265,6 +1265,165 @@ class ovskey(nla):
>>                  init=init,
>>              )
>>  
>> +    class ovs_key_tunnel(nla):
>> +        nla_flags = NLA_F_NESTED
>> +
>> +        nla_map = (
>> +            ("OVS_TUNNEL_KEY_ATTR_ID", "be64"),
>> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "ipaddr"),
>> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_DST", "ipaddr"),
>> +            ("OVS_TUNNEL_KEY_ATTR_TOS", "uint8"),
>> +            ("OVS_TUNNEL_KEY_ATTR_TTL", "uint8"),
>> +            ("OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT", "flag"),
>> +            ("OVS_TUNNEL_KEY_ATTR_CSUM", "flag"),
>> +            ("OVS_TUNNEL_KEY_ATTR_OAM", "flag"),
>> +            ("OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS", "array(uint32)"),
>> +            ("OVS_TUNNEL_KEY_ATTR_TP_SRC", "be16"),
>> +            ("OVS_TUNNEL_KEY_ATTR_TP_DST", "be16"),
>> +            ("OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS", "none"),
>> +            ("OVS_TUNNEL_KEY_ATTR_IPV6_SRC", "ipaddr"),
>> +            ("OVS_TUNNEL_KEY_ATTR_IPV6_DST", "ipaddr"),
>> +            ("OVS_TUNNEL_KEY_ATTR_PAD", "none"),
>> +            ("OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS", "none"),
>> +            ("OVS_TUNNEL_KEY_ATTR_IPV4_INFO_BRIDGE", "flag"),
>> +        )
>> +
>> +        def parse(self, flowstr, mask=None):
>> +            if not flowstr.startswith("tunnel("):
>> +                return None, None
>> +
>> +            k = ovskey.ovs_key_tunnel()
>> +            if mask is not None:
>> +                mask = ovskey.ovs_key_tunnel()
>> +
>> +            flowstr = flowstr[len("tunnel("):]
>> +
>> +            v6_address = None
>> +
>> +            fields = [
>> +                ("tun_id=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_ID",
>> +                 0xffffffffffffffff, None, None),
>> +
>> +                ("src=", r"([0-9a-fA-F\.]+)", str,
>> +                 "OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "255.255.255.255", "0.0.0.0",
>> +                 False),
>> +                ("dst=", r"([0-9a-fA-F\.]+)", str,
>> +                 "OVS_TUNNEL_KEY_ATTR_IPV4_DST", "255.255.255.255", "0.0.0.0",
>> +                 False),
>> +
>> +                ("ipv6_src=", r"([0-9a-fA-F:]+)", str,
>> +                 "OVS_TUNNEL_KEY_ATTR_IPV6_SRC",
>> +                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
>> +                ("ipv6_dst=", r"([0-9a-fA-F:]+)", str,
>> +                 "OVS_TUNNEL_KEY_ATTR_IPV6_DST",
>> +                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
>> +
>> +                ("tos=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TOS", 255, 0,
>> +                 None),
>> +                ("ttl=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TTL", 255, 0,
>> +                 None),
>> +
>> +                ("tp_src=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_SRC",
>> +                 65535, 0, None),
>> +                ("tp_dst=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_DST",
>> +                 65535, 0, None),
>> +            ]
>> +
>> +            forced_include = ["OVS_TUNNEL_KEY_ATTR_TTL"]
>> +
>> +            for prefix, regex, typ, attr_name, mask_val, default_val, v46_flag in fields:
>> +                flowstr, value = parse_extract_field(flowstr, prefix, regex, typ, False)
>> +                if not attr_name:
>> +                    raise Exception("Bad list value in tunnel fields")
>> +
>> +                if value is None and attr_name in forced_include:
>> +                    value = default_val
>> +                    mask_val = default_val
>> +
>> +                if value is not None:
>> +                    if v6_address is None and v46_flag is not None:
>> +                        v6_address = v46_flag
>
> By my reading, at this point v6_address will only be None if v46_flag is
> not None.  IF so, the condition below seems excessive.

Agreed - thanks for the suggestions.

>> +                    if v6_address is not None and v46_flag is not None \
>> +                       and v46_flag != v6_address:
>> +                        raise ValueError("Cannot mix v6 and v4 addresses")
>
> I wonder if we can instead express this as (completely untested!):
>
>                     if v46_flag is not None:
>                         if v6_address is None:
>                             v6_address = v46_flag
>                         if v46_flag != v6_address:
>                             raise ValueError("Cannot mix v6 and v4 addresses")
>
>> +                    k["attrs"].append([attr_name, value])
>> +                    if mask is not None:
>> +                        mask["attrs"].append([attr_name, mask_val])
>> +                else:
>> +                    if v6_address is not None and v46_flag is not None \
>> +                       and v46_flag != v6_address:
>> +                        continue
>> +                    if v6_address is None and v46_flag is not None:
>> +                        continue
>
> And I wonder if this is a bit easier on the eyes (also completely untested):
>
>                     if v46_flag is not None:
>                         if v6_address is None or v46_flag != v6_address:
>                             continue

I folded both of these in and did some quick testing.  Thanks Simon!

>> +                    if mask is not None:
>> +                        mask["attrs"].append([attr_name, default_val])
>> +
>> +            if k["attrs"][0][0] != "OVS_TUNNEL_KEY_ATTR_ID":
>> +                raise ValueError("Needs a tunid set")
>
> ...
>
>> @@ -1745,7 +1905,7 @@ class OvsVport(GenericNetlinkSocket):
>>          )
>>  
>>          TUNNEL_DEFAULTS = [("geneve", 6081),
>> -                           ("vxlan", 4798)]
>> +                           ("vxlan", 4789)]
>>  
>>          for tnl in TUNNEL_DEFAULTS:
>>              if ptype == tnl[0]:
>
> As noted in my response to PATCH 1/7, I think that the
> change in the hunk above belongs there rather than here.
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
index fee64c31d4d4..5545e5cab1d6 100644
--- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
+++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
@@ -705,7 +705,7 @@  class ovskey(nla):
         ("OVS_KEY_ATTR_ARP", "ovs_key_arp"),
         ("OVS_KEY_ATTR_ND", "ovs_key_nd"),
         ("OVS_KEY_ATTR_SKB_MARK", "uint32"),
-        ("OVS_KEY_ATTR_TUNNEL", "none"),
+        ("OVS_KEY_ATTR_TUNNEL", "ovs_key_tunnel"),
         ("OVS_KEY_ATTR_SCTP", "ovs_key_sctp"),
         ("OVS_KEY_ATTR_TCP_FLAGS", "be16"),
         ("OVS_KEY_ATTR_DP_HASH", "uint32"),
@@ -1265,6 +1265,165 @@  class ovskey(nla):
                 init=init,
             )
 
+    class ovs_key_tunnel(nla):
+        nla_flags = NLA_F_NESTED
+
+        nla_map = (
+            ("OVS_TUNNEL_KEY_ATTR_ID", "be64"),
+            ("OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "ipaddr"),
+            ("OVS_TUNNEL_KEY_ATTR_IPV4_DST", "ipaddr"),
+            ("OVS_TUNNEL_KEY_ATTR_TOS", "uint8"),
+            ("OVS_TUNNEL_KEY_ATTR_TTL", "uint8"),
+            ("OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT", "flag"),
+            ("OVS_TUNNEL_KEY_ATTR_CSUM", "flag"),
+            ("OVS_TUNNEL_KEY_ATTR_OAM", "flag"),
+            ("OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS", "array(uint32)"),
+            ("OVS_TUNNEL_KEY_ATTR_TP_SRC", "be16"),
+            ("OVS_TUNNEL_KEY_ATTR_TP_DST", "be16"),
+            ("OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS", "none"),
+            ("OVS_TUNNEL_KEY_ATTR_IPV6_SRC", "ipaddr"),
+            ("OVS_TUNNEL_KEY_ATTR_IPV6_DST", "ipaddr"),
+            ("OVS_TUNNEL_KEY_ATTR_PAD", "none"),
+            ("OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS", "none"),
+            ("OVS_TUNNEL_KEY_ATTR_IPV4_INFO_BRIDGE", "flag"),
+        )
+
+        def parse(self, flowstr, mask=None):
+            if not flowstr.startswith("tunnel("):
+                return None, None
+
+            k = ovskey.ovs_key_tunnel()
+            if mask is not None:
+                mask = ovskey.ovs_key_tunnel()
+
+            flowstr = flowstr[len("tunnel("):]
+
+            v6_address = None
+
+            fields = [
+                ("tun_id=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_ID",
+                 0xffffffffffffffff, None, None),
+
+                ("src=", r"([0-9a-fA-F\.]+)", str,
+                 "OVS_TUNNEL_KEY_ATTR_IPV4_SRC", "255.255.255.255", "0.0.0.0",
+                 False),
+                ("dst=", r"([0-9a-fA-F\.]+)", str,
+                 "OVS_TUNNEL_KEY_ATTR_IPV4_DST", "255.255.255.255", "0.0.0.0",
+                 False),
+
+                ("ipv6_src=", r"([0-9a-fA-F:]+)", str,
+                 "OVS_TUNNEL_KEY_ATTR_IPV6_SRC",
+                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
+                ("ipv6_dst=", r"([0-9a-fA-F:]+)", str,
+                 "OVS_TUNNEL_KEY_ATTR_IPV6_DST",
+                 "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "::", True),
+
+                ("tos=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TOS", 255, 0,
+                 None),
+                ("ttl=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TTL", 255, 0,
+                 None),
+
+                ("tp_src=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_SRC",
+                 65535, 0, None),
+                ("tp_dst=", r"(\d+)", int, "OVS_TUNNEL_KEY_ATTR_TP_DST",
+                 65535, 0, None),
+            ]
+
+            forced_include = ["OVS_TUNNEL_KEY_ATTR_TTL"]
+
+            for prefix, regex, typ, attr_name, mask_val, default_val, v46_flag in fields:
+                flowstr, value = parse_extract_field(flowstr, prefix, regex, typ, False)
+                if not attr_name:
+                    raise Exception("Bad list value in tunnel fields")
+
+                if value is None and attr_name in forced_include:
+                    value = default_val
+                    mask_val = default_val
+
+                if value is not None:
+                    if v6_address is None and v46_flag is not None:
+                        v6_address = v46_flag
+                    if v6_address is not None and v46_flag is not None \
+                       and v46_flag != v6_address:
+                        raise ValueError("Cannot mix v6 and v4 addresses")
+                    k["attrs"].append([attr_name, value])
+                    if mask is not None:
+                        mask["attrs"].append([attr_name, mask_val])
+                else:
+                    if v6_address is not None and v46_flag is not None \
+                       and v46_flag != v6_address:
+                        continue
+                    if v6_address is None and v46_flag is not None:
+                        continue
+                    if mask is not None:
+                        mask["attrs"].append([attr_name, default_val])
+
+            if k["attrs"][0][0] != "OVS_TUNNEL_KEY_ATTR_ID":
+                raise ValueError("Needs a tunid set")
+
+            if flowstr.startswith("flags("):
+                flowstr = flowstr[len("flags("):]
+                flagspos = flowstr.find(")")
+                flags = flowstr[:flagspos]
+                flowstr = flowstr[flagspos + 1:]
+
+                flag_attrs = {
+                    "df": "OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT",
+                    "csum": "OVS_TUNNEL_KEY_ATTR_CSUM",
+                    "oam": "OVS_TUNNEL_KEY_ATTR_OAM"
+                }
+
+                for flag in flags.split("|"):
+                    if flag in flag_attrs:
+                        k["attrs"].append([flag_attrs[flag], True])
+                        if mask is not None:
+                            mask["attrs"].append([flag_attrs[flag], True])
+
+            flowstr = flowstr[strspn(flowstr, ", ") :]
+            return flowstr, k, mask
+
+        def dpstr(self, mask=None, more=False):
+            printstr = "tunnel("
+
+            flagsattrs = []
+            for k in self["attrs"]:
+                noprint = False
+                if k[0] == "OVS_TUNNEL_KEY_ATTR_ID":
+                    print_str += "tun_id=%d" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_IPV4_SRC":
+                    print_str += "src=%s" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_IPV4_DST":
+                    print_str += "dst=%s" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_IPV6_SRC":
+                    print_str += "ipv6_src=%s" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_IPV6_DST":
+                    print_str += "ipv6_dst=%s" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_TOS":
+                    print_str += "tos=%d" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_TTL":
+                    print_str += "ttl=%d" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_TP_SRC":
+                    print_str += "tp_src=%d" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_TP_DST":
+                    print_str += "tp_dst=%d" % k[1]
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT":
+                    noprint = True
+                    flagsattrs.append("df")
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_CSUM":
+                    noprint = True
+                    flagsattrs.append("csum")
+                elif k[0] == "OVS_TUNNEL_KEY_ATTR_OAM":
+                    noprint = True
+                    flagsattrs.append("oam")
+
+                if not noprint:
+                    print_str += ","
+
+            if len(flagsattrs):
+                printstr += "flags(" + "|".join(flagsattrs) + ")"
+            printstr += ")"
+            return printstr
+
     class ovs_key_mpls(nla):
         fields = (("lse", ">I"),)
 
@@ -1273,6 +1432,7 @@  class ovskey(nla):
             ("OVS_KEY_ATTR_PRIORITY", "skb_priority", intparse),
             ("OVS_KEY_ATTR_SKB_MARK", "skb_mark", intparse),
             ("OVS_KEY_ATTR_RECIRC_ID", "recirc_id", intparse),
+            ("OVS_KEY_ATTR_TUNNEL", "tunnel", ovskey.ovs_key_tunnel),
             ("OVS_KEY_ATTR_DP_HASH", "dp_hash", intparse),
             ("OVS_KEY_ATTR_CT_STATE", "ct_state", parse_ct_state),
             ("OVS_KEY_ATTR_CT_ZONE", "ct_zone", intparse),
@@ -1745,7 +1905,7 @@  class OvsVport(GenericNetlinkSocket):
         )
 
         TUNNEL_DEFAULTS = [("geneve", 6081),
-                           ("vxlan", 4798)]
+                           ("vxlan", 4789)]
 
         for tnl in TUNNEL_DEFAULTS:
             if ptype == tnl[0]: