datapath: Remove 5-tuple optimization.

[sliver-openvswitch.git] / datapath / flow_netlink.c

diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
index 515a9f6..3024a61 100644 (file)
--- a/datapath/flow_netlink.c
+++ b/datapath/flow_netlink.c
@@ -16,6 +16,8 @@
  * 02110-1301, USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "flow.h"
 #include "datapath.h"
 #include <linux/uaccess.h>
@@ -114,6 +116,7 @@ static bool match_validate(const struct sw_flow_match *match,
        mask_allowed &= ~((1ULL << OVS_KEY_ATTR_IPV4)
                        | (1ULL << OVS_KEY_ATTR_IPV6)
                        | (1ULL << OVS_KEY_ATTR_TCP)
+                       | (1ULL << OVS_KEY_ATTR_TCP_FLAGS)
                        | (1ULL << OVS_KEY_ATTR_UDP)
                        | (1ULL << OVS_KEY_ATTR_SCTP)
                        | (1ULL << OVS_KEY_ATTR_ICMP)
@@ -154,8 +157,11 @@ static bool match_validate(const struct sw_flow_match *match,
 
                        if (match->key->ip.proto == IPPROTO_TCP) {
                                key_expected |= 1ULL << OVS_KEY_ATTR_TCP;
-                               if (match->mask && (match->mask->key.ip.proto == 0xff))
+                               key_expected |= 1ULL << OVS_KEY_ATTR_TCP_FLAGS;
+                               if (match->mask && (match->mask->key.ip.proto == 0xff)) {
                                        mask_allowed |= 1ULL << OVS_KEY_ATTR_TCP;
+                                       mask_allowed |= 1ULL << OVS_KEY_ATTR_TCP_FLAGS;
+                               }
                        }
 
                        if (match->key->ip.proto == IPPROTO_ICMP) {
@@ -186,8 +192,11 @@ static bool match_validate(const struct sw_flow_match *match,
 
                        if (match->key->ip.proto == IPPROTO_TCP) {
                                key_expected |= 1ULL << OVS_KEY_ATTR_TCP;
-                               if (match->mask && (match->mask->key.ip.proto == 0xff))
+                               key_expected |= 1ULL << OVS_KEY_ATTR_TCP_FLAGS;
+                               if (match->mask && (match->mask->key.ip.proto == 0xff)) {
                                        mask_allowed |= 1ULL << OVS_KEY_ATTR_TCP;
+                                       mask_allowed |= 1ULL << OVS_KEY_ATTR_TCP_FLAGS;
+                               }
                        }
 
                        if (match->key->ip.proto == IPPROTO_ICMPV6) {
@@ -209,14 +218,14 @@ static bool match_validate(const struct sw_flow_match *match,
        if ((key_attrs & key_expected) != key_expected) {
                /* Key attributes check failed. */
                OVS_NLERR("Missing expected key attributes (key_attrs=%llx, expected=%llx).\n",
-                               key_attrs, key_expected);
+                               (unsigned long long)key_attrs, (unsigned long long)key_expected);
                return false;
        }
 
        if ((mask_attrs & mask_allowed) != mask_attrs) {
                /* Mask attributes check failed. */
                OVS_NLERR("Contain more than allowed mask fields (mask_attrs=%llx, mask_allowed=%llx).\n",
-                               mask_attrs, mask_allowed);
+                               (unsigned long long)mask_attrs, (unsigned long long)mask_allowed);
                return false;
        }
 
@@ -235,6 +244,7 @@ static const int ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = {
        [OVS_KEY_ATTR_IPV4] = sizeof(struct ovs_key_ipv4),
        [OVS_KEY_ATTR_IPV6] = sizeof(struct ovs_key_ipv6),
        [OVS_KEY_ATTR_TCP] = sizeof(struct ovs_key_tcp),
+       [OVS_KEY_ATTR_TCP_FLAGS] = sizeof(__be16),
        [OVS_KEY_ATTR_UDP] = sizeof(struct ovs_key_udp),
        [OVS_KEY_ATTR_SCTP] = sizeof(struct ovs_key_sctp),
        [OVS_KEY_ATTR_ICMP] = sizeof(struct ovs_key_icmp),
@@ -479,7 +489,7 @@ static int metadata_from_nlattrs(struct sw_flow_match *match,  u64 *attrs,
        return 0;
 }
 
-static int ovs_key_from_nlattrs(struct sw_flow_match *match,  u64 attrs,
+static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs,
                                const struct nlattr **a, bool is_mask)
 {
        int err;
@@ -634,6 +644,19 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match,  u64 attrs,
                attrs &= ~(1ULL << OVS_KEY_ATTR_TCP);
        }
 
+       if (attrs & (1ULL << OVS_KEY_ATTR_TCP_FLAGS)) {
+               if (orig_attrs & (1ULL << OVS_KEY_ATTR_IPV4)) {
+                       SW_FLOW_KEY_PUT(match, ipv4.tp.flags,
+                                       nla_get_be16(a[OVS_KEY_ATTR_TCP_FLAGS]),
+                                       is_mask);
+               } else {
+                       SW_FLOW_KEY_PUT(match, ipv6.tp.flags,
+                                       nla_get_be16(a[OVS_KEY_ATTR_TCP_FLAGS]),
+                                       is_mask);
+               }
+               attrs &= ~(1ULL << OVS_KEY_ATTR_TCP_FLAGS);
+       }
+
        if (attrs & (1ULL << OVS_KEY_ATTR_UDP)) {
                const struct ovs_key_udp *udp_key;
 
@@ -1004,9 +1027,15 @@ int ovs_nla_put_flow(const struct sw_flow_key *swkey,
                        if (swkey->eth.type == htons(ETH_P_IP)) {
                                tcp_key->tcp_src = output->ipv4.tp.src;
                                tcp_key->tcp_dst = output->ipv4.tp.dst;
+                               if (nla_put_be16(skb, OVS_KEY_ATTR_TCP_FLAGS,
+                                                output->ipv4.tp.flags))
+                                       goto nla_put_failure;
                        } else if (swkey->eth.type == htons(ETH_P_IPV6)) {
                                tcp_key->tcp_src = output->ipv6.tp.src;
                                tcp_key->tcp_dst = output->ipv6.tp.dst;
+                               if (nla_put_be16(skb, OVS_KEY_ATTR_TCP_FLAGS,
+                                                output->ipv6.tp.flags))
+                                       goto nla_put_failure;
                        }
                } else if (swkey->ip.proto == IPPROTO_UDP) {
                        struct ovs_key_udp *udp_key;