summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorJarno Rajahalme <jarno@ovn.org>2017-03-24 11:47:15 -0700
committerJarno Rajahalme <jarno@ovn.org>2017-03-24 11:47:15 -0700
commite75aad80e30119d5c981559e920b5428a54f4766 (patch)
tree8ad40905a58fa30b58f126e6dd4e14d5b55311a8 /build-aux
parent64fb5f82d94b7286888052609f7e3b247f2a58b8 (diff)
downloadopenvswitch-e75aad80e30119d5c981559e920b5428a54f4766.tar.gz
meta-flow: Remove metadata prerequisite on ether type.
Conntrack original direction tuple fields depend on the conntrack state and the type of the packet that was tracked. These dependencies were encoded as OpenFlow prerequisites in commit daf4d3c18da4 ("odp: Support conntrack orig tuple key."). However, having a prerequisite from a metadata field to a packet header turned out to be problematic, since sometimes we are decoding metadata fields alone, so that the packet type field is not available. The reason for the packet type dependency is that the IP addresses in the original direction tuple can be either IPv4 or IPv6 addresses, and it would be invalid to match on IPv4 original direction tuple addresses for an IPv6 packet and vica verca. Upon closer look, however, allowing this kind of mismatched match only causes the flow to never match anything, rather than causing more severe problems. This patch removes the formal prerequisite on the packet type, but replaces that with an explicit check for the mismatch on flow install. This way we can still return an error to the controller if it tries to install a mismatched flow. Reported-by: Dong Jun <dongj@dtdream.com> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-March/330052.html Fixes: 7befb20d0f70 ("nx-match: Fix oxm decode.") Fixes: daf4d3c18da4 ("odp: Support conntrack orig tuple key.") Suggested-by: Numan Siddique <nusiddiq@redhat.com> Suggested-by: Ben Pfaff <blp@ovn.org> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> Tested-by: Numan Siddique <nusiddiq@redhat.com> Acked-by: Numan Siddique <nusiddiq@redhat.com> Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/extract-ofp-fields2
1 files changed, 0 insertions, 2 deletions
diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
index a26d5587d..af7c69b22 100755
--- a/build-aux/extract-ofp-fields
+++ b/build-aux/extract-ofp-fields
@@ -45,8 +45,6 @@ PREREQS = {"none": "MFP_NONE",
"IPv6": "MFP_IPV6",
"IPv4/IPv6": "MFP_IP_ANY",
"CT": "MFP_CT_VALID",
- "CTv4": "MFP_CTV4_VALID",
- "CTv6": "MFP_CTV6_VALID",
"MPLS": "MFP_MPLS",
"TCP": "MFP_TCP",
"UDP": "MFP_UDP",