#include <config.h>
#include <sys/types.h>
#include "flow.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
+#include <limits.h>
#include <netinet/in.h>
#include <netinet/icmp6.h>
#include <netinet/ip6.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "byte-order.h"
#include "csum.h"
#include "dynamic-string.h"
#include "hash.h"
+#include "jhash.h"
+#include "match.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "packets.h"
VLOG_DEFINE_THIS_MODULE(flow);
COVERAGE_DEFINE(flow_extract);
+COVERAGE_DEFINE(miniflow_malloc);
static struct arp_eth_header *
pull_arp(struct ofpbuf *packet)
}
-/* Initializes 'flow' members from 'packet', 'skb_priority', 'tun_id', and
+/* Initializes 'flow' members from 'packet', 'skb_priority', 'tnl', and
* 'ofp_in_port'.
*
* Initializes 'packet' header pointers as follows:
* present and has a correct length, and otherwise NULL.
*/
void
-flow_extract(struct ofpbuf *packet, uint32_t skb_priority, ovs_be64 tun_id,
- uint16_t ofp_in_port, struct flow *flow)
+flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t skb_mark,
+ const struct flow_tnl *tnl, uint16_t ofp_in_port,
+ struct flow *flow)
{
struct ofpbuf b = *packet;
struct eth_header *eth;
COVERAGE_INC(flow_extract);
memset(flow, 0, sizeof *flow);
- flow->tun_id = tun_id;
+
+ if (tnl) {
+ ovs_assert(tnl != &flow->tunnel);
+ flow->tunnel = *tnl;
+ }
flow->in_port = ofp_in_port;
flow->skb_priority = skb_priority;
+ flow->skb_mark = skb_mark;
packet->l2 = b.data;
packet->l3 = NULL;
}
flow->dl_type = parse_ethertype(&b);
- /* Network layer. */
packet->l3 = b.data;
- if (flow->dl_type == htons(ETH_TYPE_IP)) {
+ flow_extract_l3_onwards(packet, flow, flow->dl_type);
+}
+
+/* Initializes l3 and higher 'flow' members from 'packet'
+ *
+ * This should be called by or after flow_extract()
+ *
+ * Initializes 'packet' header pointers as follows:
+ *
+ * - packet->l4 to just past the IPv4 header, if one is present and has a
+ * correct length, and otherwise NULL.
+ *
+ * - packet->l7 to just past the TCP or UDP or ICMP header, if one is
+ * present and has a correct length, and otherwise NULL.
+ */
+void
+flow_extract_l3_onwards(struct ofpbuf *packet, struct flow *flow,
+ ovs_be16 dl_type)
+{
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, packet->l3, packet->size -
+ (size_t)((char *)packet->l3 - (char *)packet->l2));
+
+ /* Network layer. */
+ if (dl_type == htons(ETH_TYPE_IP)) {
const struct ip_header *nh = pull_ip(&b);
if (nh) {
packet->l4 = b.data;
}
}
}
- } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
+ } else if (dl_type == htons(ETH_TYPE_IPV6)) {
if (parse_ipv6(&b, flow)) {
return;
}
packet->l7 = b.data;
}
}
- } else if (flow->dl_type == htons(ETH_TYPE_ARP)) {
+ } else if (dl_type == htons(ETH_TYPE_ARP) ||
+ dl_type == htons(ETH_TYPE_RARP)) {
const struct arp_eth_header *arp = pull_arp(&b);
if (arp && arp->ar_hrd == htons(1)
&& arp->ar_pro == htons(ETH_TYPE_IP)
flow->nw_proto = ntohs(arp->ar_op);
}
- if ((flow->nw_proto == ARP_OP_REQUEST)
- || (flow->nw_proto == ARP_OP_REPLY)) {
- flow->nw_src = arp->ar_spa;
- flow->nw_dst = arp->ar_tpa;
- memcpy(flow->arp_sha, arp->ar_sha, ETH_ADDR_LEN);
- memcpy(flow->arp_tha, arp->ar_tha, ETH_ADDR_LEN);
- }
+ flow->nw_src = arp->ar_spa;
+ flow->nw_dst = arp->ar_tpa;
+ memcpy(flow->arp_sha, arp->ar_sha, ETH_ADDR_LEN);
+ memcpy(flow->arp_tha, arp->ar_tha, ETH_ADDR_LEN);
}
}
}
void
flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
{
- int i;
-
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
+ uint32_t *flow_u32 = (uint32_t *) flow;
+ const uint32_t *wc_u32 = (const uint32_t *) &wildcards->masks;
+ size_t i;
- for (i = 0; i < FLOW_N_REGS; i++) {
- flow->regs[i] &= wildcards->masks.regs[i];
+ for (i = 0; i < FLOW_U32S; i++) {
+ flow_u32[i] &= wc_u32[i];
}
- flow->tun_id &= wildcards->masks.tun_id;
- flow->metadata &= wildcards->masks.metadata;
- flow->nw_src &= wildcards->masks.nw_src;
- flow->nw_dst &= wildcards->masks.nw_dst;
- flow->in_port &= wildcards->masks.in_port;
- flow->vlan_tci &= wildcards->masks.vlan_tci;
- flow->dl_type &= wildcards->masks.dl_type;
- flow->tp_src &= wildcards->masks.tp_src;
- flow->tp_dst &= wildcards->masks.tp_dst;
- eth_addr_bitand(flow->dl_src, wildcards->masks.dl_src, flow->dl_src);
- eth_addr_bitand(flow->dl_dst, wildcards->masks.dl_dst, flow->dl_dst);
- flow->ipv6_label &= wildcards->masks.ipv6_label;
- flow->nw_proto &= wildcards->masks.nw_proto;
- flow->nw_tos &= wildcards->masks.nw_tos;
- flow->nw_ttl &= wildcards->masks.nw_ttl;
- flow->nw_frag &= wildcards->masks.nw_frag;
- eth_addr_bitand(flow->arp_sha, wildcards->masks.arp_sha, flow->arp_sha);
- eth_addr_bitand(flow->arp_tha, wildcards->masks.arp_tha, flow->arp_tha);
- flow->ipv6_src = ipv6_addr_bitand(&flow->ipv6_src,
- &wildcards->masks.ipv6_src);
- flow->ipv6_dst = ipv6_addr_bitand(&flow->ipv6_dst,
- &wildcards->masks.ipv6_dst);
- flow->nd_target = ipv6_addr_bitand(&flow->nd_target,
- &wildcards->masks.nd_target);
- flow->skb_priority = 0;
}
/* Initializes 'fmd' with the metadata found in 'flow'. */
void
flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 18);
- fmd->tun_id = flow->tun_id;
+ fmd->tun_id = flow->tunnel.tun_id;
fmd->metadata = flow->metadata;
memcpy(fmd->regs, flow->regs, sizeof fmd->regs);
fmd->in_port = flow->in_port;
return ds_cstr(&ds);
}
-void
-flow_format(struct ds *ds, const struct flow *flow)
+const char *
+flow_tun_flag_to_string(uint32_t flags)
{
- ds_put_format(ds, "priority:%"PRIu32
- ",tunnel:%#"PRIx64
- ",metadata:%#"PRIx64
- ",in_port:%04"PRIx16,
- flow->skb_priority,
- ntohll(flow->tun_id),
- ntohll(flow->metadata),
- flow->in_port);
-
- ds_put_format(ds, ",tci(");
- if (flow->vlan_tci) {
- ds_put_format(ds, "vlan:%"PRIu16",pcp:%d",
- vlan_tci_to_vid(flow->vlan_tci),
- vlan_tci_to_pcp(flow->vlan_tci));
- } else {
- ds_put_char(ds, '0');
- }
- ds_put_format(ds, ") mac("ETH_ADDR_FMT"->"ETH_ADDR_FMT
- ") type:%04"PRIx16,
- ETH_ADDR_ARGS(flow->dl_src),
- ETH_ADDR_ARGS(flow->dl_dst),
- ntohs(flow->dl_type));
-
- if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
- ds_put_format(ds, " label:%#"PRIx32" proto:%"PRIu8" tos:%#"PRIx8
- " ttl:%"PRIu8" ipv6(",
- ntohl(flow->ipv6_label), flow->nw_proto,
- flow->nw_tos, flow->nw_ttl);
- print_ipv6_addr(ds, &flow->ipv6_src);
- ds_put_cstr(ds, "->");
- print_ipv6_addr(ds, &flow->ipv6_dst);
- ds_put_char(ds, ')');
- } else {
- ds_put_format(ds, " proto:%"PRIu8" tos:%#"PRIx8" ttl:%"PRIu8
- " ip("IP_FMT"->"IP_FMT")",
- flow->nw_proto, flow->nw_tos, flow->nw_ttl,
- IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst));
+ switch (flags) {
+ case FLOW_TNL_F_DONT_FRAGMENT:
+ return "df";
+ case FLOW_TNL_F_CSUM:
+ return "csum";
+ case FLOW_TNL_F_KEY:
+ return "key";
+ default:
+ return NULL;
}
- if (flow->nw_frag) {
- ds_put_format(ds, " frag(%s)",
- flow->nw_frag == FLOW_NW_FRAG_ANY ? "first"
- : flow->nw_frag == (FLOW_NW_FRAG_ANY | FLOW_NW_FRAG_LATER)
- ? "later" : "<error>");
+}
+
+void
+format_flags(struct ds *ds, const char *(*bit_to_string)(uint32_t),
+ uint32_t flags, char del)
+{
+ uint32_t bad = 0;
+
+ if (!flags) {
+ return;
}
- if (flow->tp_src || flow->tp_dst) {
- ds_put_format(ds, " port(%"PRIu16"->%"PRIu16")",
- ntohs(flow->tp_src), ntohs(flow->tp_dst));
+ while (flags) {
+ uint32_t bit = rightmost_1bit(flags);
+ const char *s;
+
+ s = bit_to_string(bit);
+ if (s) {
+ ds_put_format(ds, "%s%c", s, del);
+ } else {
+ bad |= bit;
+ }
+
+ flags &= ~bit;
}
- if (!eth_addr_is_zero(flow->arp_sha) || !eth_addr_is_zero(flow->arp_tha)) {
- ds_put_format(ds, " arp_ha("ETH_ADDR_FMT"->"ETH_ADDR_FMT")",
- ETH_ADDR_ARGS(flow->arp_sha),
- ETH_ADDR_ARGS(flow->arp_tha));
+
+ if (bad) {
+ ds_put_format(ds, "0x%"PRIx32"%c", bad, del);
}
+ ds_chomp(ds, del);
+}
+
+void
+flow_format(struct ds *ds, const struct flow *flow)
+{
+ struct match match;
+
+ match_wc_init(&match, flow);
+ match_format(&match, ds, OFP_DEFAULT_PRIORITY);
}
void
void
flow_wildcards_init_catchall(struct flow_wildcards *wc)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- wc->masks.tun_id = htonll(0);
- wc->masks.nw_src = htonl(0);
- wc->masks.nw_dst = htonl(0);
- wc->masks.ipv6_src = in6addr_any;
- wc->masks.ipv6_dst = in6addr_any;
- wc->masks.ipv6_label = htonl(0);
- wc->masks.nd_target = in6addr_any;
- memset(wc->masks.regs, 0, sizeof wc->masks.regs);
- wc->masks.metadata = htonll(0);
- wc->masks.in_port = 0;
- wc->masks.vlan_tci = htons(0);
- wc->masks.nw_frag = 0;
- wc->masks.dl_type = htons(0);
- wc->masks.tp_src = htons(0);
- wc->masks.tp_dst = htons(0);
- memset(wc->masks.dl_src, 0, ETH_ADDR_LEN);
- memset(wc->masks.dl_dst, 0, ETH_ADDR_LEN);
- memset(wc->masks.arp_sha, 0, ETH_ADDR_LEN);
- memset(wc->masks.arp_tha, 0, ETH_ADDR_LEN);
- wc->masks.nw_proto = 0;
- wc->masks.nw_tos = 0;
- wc->masks.nw_ttl = 0;
- memset(wc->masks.zeros, 0, sizeof wc->masks.zeros);
+ memset(&wc->masks, 0, sizeof wc->masks);
}
/* Initializes 'wc' as an exact-match set of wildcards; that is, 'wc' does not
void
flow_wildcards_init_exact(struct flow_wildcards *wc)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- wc->masks.tun_id = htonll(UINT64_MAX);
- wc->masks.nw_src = htonl(UINT32_MAX);
- wc->masks.nw_dst = htonl(UINT32_MAX);
- wc->masks.ipv6_src = in6addr_exact;
- wc->masks.ipv6_dst = in6addr_exact;
- wc->masks.ipv6_label = htonl(UINT32_MAX);
- wc->masks.nd_target = in6addr_exact;
- memset(wc->masks.regs, 0xff, sizeof wc->masks.regs);
- wc->masks.metadata = htonll(UINT64_MAX);
- wc->masks.in_port = UINT16_MAX;
- wc->masks.vlan_tci = htons(UINT16_MAX);
- wc->masks.nw_frag = UINT8_MAX;
- wc->masks.dl_type = htons(UINT16_MAX);
- wc->masks.tp_src = htons(UINT16_MAX);
- wc->masks.tp_dst = htons(UINT16_MAX);
- memset(wc->masks.dl_src, 0xff, ETH_ADDR_LEN);
- memset(wc->masks.dl_dst, 0xff, ETH_ADDR_LEN);
- memset(wc->masks.arp_sha, 0xff, ETH_ADDR_LEN);
- memset(wc->masks.arp_tha, 0xff, ETH_ADDR_LEN);
- wc->masks.nw_proto = UINT8_MAX;
- wc->masks.nw_tos = UINT8_MAX;
- wc->masks.nw_ttl = UINT8_MAX;
+ memset(&wc->masks, 0xff, sizeof wc->masks);
memset(wc->masks.zeros, 0, sizeof wc->masks.zeros);
}
-/* Returns true if 'wc' is exact-match, false if 'wc' wildcards any bits or
- * fields. */
-bool
-flow_wildcards_is_exact(const struct flow_wildcards *wc)
-{
- int i;
-
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- if (wc->masks.tun_id != htonll(UINT64_MAX)
- || wc->masks.nw_src != htonl(UINT32_MAX)
- || wc->masks.nw_dst != htonl(UINT32_MAX)
- || wc->masks.tp_src != htons(UINT16_MAX)
- || wc->masks.tp_dst != htons(UINT16_MAX)
- || wc->masks.in_port != UINT16_MAX
- || wc->masks.vlan_tci != htons(UINT16_MAX)
- || wc->masks.metadata != htonll(UINT64_MAX)
- || wc->masks.dl_type != htons(UINT16_MAX)
- || !eth_mask_is_exact(wc->masks.dl_src)
- || !eth_mask_is_exact(wc->masks.dl_dst)
- || !eth_mask_is_exact(wc->masks.arp_sha)
- || !eth_mask_is_exact(wc->masks.arp_tha)
- || !ipv6_mask_is_exact(&wc->masks.ipv6_src)
- || !ipv6_mask_is_exact(&wc->masks.ipv6_dst)
- || wc->masks.ipv6_label != htonl(UINT32_MAX)
- || !ipv6_mask_is_exact(&wc->masks.nd_target)
- || wc->masks.nw_proto != UINT8_MAX
- || wc->masks.nw_frag != UINT8_MAX
- || wc->masks.nw_tos != UINT8_MAX
- || wc->masks.nw_ttl != UINT8_MAX) {
- return false;
- }
-
- for (i = 0; i < FLOW_N_REGS; i++) {
- if (wc->masks.regs[i] != UINT32_MAX) {
- return false;
- }
- }
-
- return true;
-}
-
/* Returns true if 'wc' matches every packet, false if 'wc' fixes any bits or
* fields. */
bool
flow_wildcards_is_catchall(const struct flow_wildcards *wc)
{
- int i;
-
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- if (wc->masks.tun_id != htonll(0)
- || wc->masks.nw_src != htonl(0)
- || wc->masks.nw_dst != htonl(0)
- || wc->masks.tp_src != htons(0)
- || wc->masks.tp_dst != htons(0)
- || wc->masks.in_port != 0
- || wc->masks.vlan_tci != htons(0)
- || wc->masks.metadata != htonll(0)
- || wc->masks.dl_type != htons(0)
- || !eth_addr_is_zero(wc->masks.dl_src)
- || !eth_addr_is_zero(wc->masks.dl_dst)
- || !eth_addr_is_zero(wc->masks.arp_sha)
- || !eth_addr_is_zero(wc->masks.arp_tha)
- || !ipv6_mask_is_any(&wc->masks.ipv6_src)
- || !ipv6_mask_is_any(&wc->masks.ipv6_dst)
- || wc->masks.ipv6_label != htonl(0)
- || !ipv6_mask_is_any(&wc->masks.nd_target)
- || wc->masks.nw_proto != 0
- || wc->masks.nw_frag != 0
- || wc->masks.nw_tos != 0
- || wc->masks.nw_ttl != 0) {
- return false;
- }
+ const uint32_t *wc_u32 = (const uint32_t *) &wc->masks;
+ size_t i;
- for (i = 0; i < FLOW_N_REGS; i++) {
- if (wc->masks.regs[i] != 0) {
+ for (i = 0; i < FLOW_U32S; i++) {
+ if (wc_u32[i]) {
return false;
}
}
-
return true;
}
const struct flow_wildcards *src1,
const struct flow_wildcards *src2)
{
- int i;
+ uint32_t *dst_u32 = (uint32_t *) &dst->masks;
+ const uint32_t *src1_u32 = (const uint32_t *) &src1->masks;
+ const uint32_t *src2_u32 = (const uint32_t *) &src2->masks;
+ size_t i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- dst->masks.tun_id = src1->masks.tun_id & src2->masks.tun_id;
- dst->masks.nw_src = src1->masks.nw_src & src2->masks.nw_src;
- dst->masks.nw_dst = src1->masks.nw_dst & src2->masks.nw_dst;
- dst->masks.ipv6_src = ipv6_addr_bitand(&src1->masks.ipv6_src,
- &src2->masks.ipv6_src);
- dst->masks.ipv6_dst = ipv6_addr_bitand(&src1->masks.ipv6_dst,
- &src2->masks.ipv6_dst);
- dst->masks.ipv6_label = src1->masks.ipv6_label & src2->masks.ipv6_label;
- dst->masks.nd_target = ipv6_addr_bitand(&src1->masks.nd_target,
- &src2->masks.nd_target);
- for (i = 0; i < FLOW_N_REGS; i++) {
- dst->masks.regs[i] = src1->masks.regs[i] & src2->masks.regs[i];
+ for (i = 0; i < FLOW_U32S; i++) {
+ dst_u32[i] = src1_u32[i] & src2_u32[i];
}
- dst->masks.metadata = src1->masks.metadata & src2->masks.metadata;
- dst->masks.in_port = src1->masks.in_port & src2->masks.in_port;
- dst->masks.vlan_tci = src1->masks.vlan_tci & src2->masks.vlan_tci;
- dst->masks.dl_type = src1->masks.dl_type & src2->masks.dl_type;
- dst->masks.tp_src = src1->masks.tp_src & src2->masks.tp_src;
- dst->masks.tp_dst = src1->masks.tp_dst & src2->masks.tp_dst;
- dst->masks.nw_frag = src1->masks.nw_frag & src2->masks.nw_frag;
- eth_addr_bitand(src1->masks.dl_src, src2->masks.dl_src, dst->masks.dl_src);
- eth_addr_bitand(src1->masks.dl_dst, src2->masks.dl_dst, dst->masks.dl_dst);
- eth_addr_bitand(src1->masks.arp_sha, src2->masks.arp_sha,
- dst->masks.arp_sha);
- eth_addr_bitand(src1->masks.arp_tha, src2->masks.arp_tha,
- dst->masks.arp_tha);
- dst->masks.nw_proto = src1->masks.nw_proto & src2->masks.nw_proto;
- dst->masks.nw_tos = src1->masks.nw_tos & src2->masks.nw_tos;
- dst->masks.nw_ttl = src1->masks.nw_ttl & src2->masks.nw_ttl;
}
/* Returns a hash of the wildcards in 'wc'. */
uint32_t
flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis)
{
- return hash_words((const uint32_t *) wc, sizeof *wc / 4, basis);
+ return flow_hash(&wc->masks, basis);
}
/* Returns true if 'a' and 'b' represent the same wildcards, false if they are
flow_wildcards_equal(const struct flow_wildcards *a,
const struct flow_wildcards *b)
{
- int i;
-
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- if (a->masks.tun_id != b->masks.tun_id
- || a->masks.nw_src != b->masks.nw_src
- || a->masks.nw_dst != b->masks.nw_dst
- || a->masks.in_port != b->masks.in_port
- || a->masks.vlan_tci != b->masks.vlan_tci
- || a->masks.metadata != b->masks.metadata
- || a->masks.dl_type != b->masks.dl_type
- || !ipv6_addr_equals(&a->masks.ipv6_src, &b->masks.ipv6_src)
- || !ipv6_addr_equals(&a->masks.ipv6_dst, &b->masks.ipv6_dst)
- || a->masks.ipv6_label != b->masks.ipv6_label
- || !ipv6_addr_equals(&a->masks.nd_target, &b->masks.nd_target)
- || a->masks.tp_src != b->masks.tp_src
- || a->masks.tp_dst != b->masks.tp_dst
- || a->masks.nw_frag != b->masks.nw_frag
- || !eth_addr_equals(a->masks.dl_src, b->masks.dl_src)
- || !eth_addr_equals(a->masks.dl_dst, b->masks.dl_dst)
- || !eth_addr_equals(a->masks.arp_sha, b->masks.arp_sha)
- || !eth_addr_equals(a->masks.arp_tha, b->masks.arp_tha)
- || a->masks.nw_proto != b->masks.nw_proto
- || a->masks.nw_tos != b->masks.nw_tos
- || a->masks.nw_ttl != b->masks.nw_ttl) {
- return false;
- }
-
- for (i = 0; i < FLOW_N_REGS; i++) {
- if (a->masks.regs[i] != b->masks.regs[i]) {
- return false;
- }
- }
-
- return true;
+ return flow_equal(&a->masks, &b->masks);
}
/* Returns true if at least one bit or field is wildcarded in 'a' but not in
flow_wildcards_has_extra(const struct flow_wildcards *a,
const struct flow_wildcards *b)
{
- int i;
- uint8_t eth_masked[ETH_ADDR_LEN];
- struct in6_addr ipv6_masked;
+ const uint32_t *a_u32 = (const uint32_t *) &a->masks;
+ const uint32_t *b_u32 = (const uint32_t *) &b->masks;
+ size_t i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 17);
-
- for (i = 0; i < FLOW_N_REGS; i++) {
- if ((a->masks.regs[i] & b->masks.regs[i]) != b->masks.regs[i]) {
+ for (i = 0; i < FLOW_U32S; i++) {
+ if ((a_u32[i] & b_u32[i]) != b_u32[i]) {
return true;
}
}
+ return false;
+}
- eth_addr_bitand(a->masks.dl_src, b->masks.dl_src, eth_masked);
- if (!eth_addr_equals(eth_masked, b->masks.dl_src)) {
- return true;
- }
-
- eth_addr_bitand(a->masks.dl_dst, b->masks.dl_dst, eth_masked);
- if (!eth_addr_equals(eth_masked, b->masks.dl_dst)) {
- return true;
- }
-
- eth_addr_bitand(a->masks.arp_sha, b->masks.arp_sha, eth_masked);
- if (!eth_addr_equals(eth_masked, b->masks.arp_sha)) {
- return true;
- }
-
- eth_addr_bitand(a->masks.arp_tha, b->masks.arp_tha, eth_masked);
- if (!eth_addr_equals(eth_masked, b->masks.arp_tha)) {
- return true;
- }
-
- ipv6_masked = ipv6_addr_bitand(&a->masks.ipv6_src, &b->masks.ipv6_src);
- if (!ipv6_addr_equals(&ipv6_masked, &b->masks.ipv6_src)) {
- return true;
- }
-
- ipv6_masked = ipv6_addr_bitand(&a->masks.ipv6_dst, &b->masks.ipv6_dst);
- if (!ipv6_addr_equals(&ipv6_masked, &b->masks.ipv6_dst)) {
- return true;
- }
+/* Returns true if 'a' and 'b' are equal, except that 0-bits (wildcarded bits)
+ * in 'wc' do not need to be equal in 'a' and 'b'. */
+bool
+flow_equal_except(const struct flow *a, const struct flow *b,
+ const struct flow_wildcards *wc)
+{
+ const uint32_t *a_u32 = (const uint32_t *) a;
+ const uint32_t *b_u32 = (const uint32_t *) b;
+ const uint32_t *wc_u32 = (const uint32_t *) &wc->masks;
+ size_t i;
- ipv6_masked = ipv6_addr_bitand(&a->masks.nd_target, &b->masks.nd_target);
- if (!ipv6_addr_equals(&ipv6_masked, &b->masks.nd_target)) {
- return true;
+ for (i = 0; i < FLOW_U32S; i++) {
+ if ((a_u32[i] ^ b_u32[i]) & wc_u32[i]) {
+ return false;
+ }
}
-
- return ((a->masks.tun_id & b->masks.tun_id) != b->masks.tun_id
- || (a->masks.nw_src & b->masks.nw_src) != b->masks.nw_src
- || (a->masks.nw_dst & b->masks.nw_dst) != b->masks.nw_dst
- || ((a->masks.ipv6_label & b->masks.ipv6_label)
- != b->masks.ipv6_label)
- || (a->masks.in_port & b->masks.in_port) != b->masks.in_port
- || (a->masks.vlan_tci & b->masks.vlan_tci) != b->masks.vlan_tci
- || (a->masks.metadata & b->masks.metadata) != b->masks.metadata
- || (a->masks.dl_type & b->masks.dl_type) != b->masks.dl_type
- || (a->masks.dl_type & b->masks.dl_type) != b->masks.dl_type
- || (a->masks.tp_src & b->masks.tp_src) != b->masks.tp_src
- || (a->masks.tp_dst & b->masks.tp_dst) != b->masks.tp_dst
- || (a->masks.nw_proto & b->masks.nw_proto) != b->masks.nw_proto
- || (a->masks.nw_frag & b->masks.nw_frag) != b->masks.nw_frag
- || (a->masks.nw_tos & b->masks.nw_tos) != b->masks.nw_tos
- || (a->masks.nw_ttl & b->masks.nw_ttl) != b->masks.nw_ttl);
+ return true;
}
/* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'.
fields.tp_port = flow->tp_src ^ flow->tp_dst;
}
}
- return hash_bytes(&fields, sizeof fields, basis);
+ return jhash_bytes(&fields, sizeof fields, basis);
}
/* Hashes the portions of 'flow' designated by 'fields'. */
switch (fields) {
case NX_HASH_FIELDS_ETH_SRC:
- return hash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
+ return jhash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
case NX_HASH_FIELDS_SYMMETRIC_L4:
return flow_hash_symmetric_l4(flow, basis);
b->l3 = ip = ofpbuf_put_zeros(b, sizeof *ip);
ip->ip_ihl_ver = IP_IHL_VER(5, 4);
ip->ip_tos = flow->nw_tos;
+ ip->ip_ttl = flow->nw_ttl;
ip->ip_proto = flow->nw_proto;
ip->ip_src = flow->nw_src;
ip->ip_dst = flow->nw_dst;
ip->ip_csum = csum(ip, sizeof *ip);
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
/* XXX */
- } else if (flow->dl_type == htons(ETH_TYPE_ARP)) {
+ } else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
+ flow->dl_type == htons(ETH_TYPE_RARP)) {
struct arp_eth_header *arp;
b->l3 = arp = ofpbuf_put_zeros(b, sizeof *arp);
}
}
}
+\f
+/* Compressed flow. */
+
+static int
+miniflow_n_values(const struct miniflow *flow)
+{
+ int n, i;
+
+ n = 0;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ n += popcount(flow->map[i]);
+ }
+ return n;
+}
+
+static uint32_t *
+miniflow_alloc_values(struct miniflow *flow, int n)
+{
+ if (n <= MINI_N_INLINE) {
+ return flow->inline_values;
+ } else {
+ COVERAGE_INC(miniflow_malloc);
+ return xmalloc(n * sizeof *flow->values);
+ }
+}
+
+/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
+ * with miniflow_destroy(). */
+void
+miniflow_init(struct miniflow *dst, const struct flow *src)
+{
+ const uint32_t *src_u32 = (const uint32_t *) src;
+ unsigned int ofs;
+ unsigned int i;
+ int n;
+
+ /* Initialize dst->map, counting the number of nonzero elements. */
+ n = 0;
+ memset(dst->map, 0, sizeof dst->map);
+ for (i = 0; i < FLOW_U32S; i++) {
+ if (src_u32[i]) {
+ dst->map[i / 32] |= 1u << (i % 32);
+ n++;
+ }
+ }
+
+ /* Initialize dst->values. */
+ dst->values = miniflow_alloc_values(dst, n);
+ ofs = 0;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = dst->map[i]; map; map = zero_rightmost_1bit(map)) {
+ dst->values[ofs++] = src_u32[raw_ctz(map) + i * 32];
+ }
+ }
+}
+
+/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
+ * with miniflow_destroy(). */
+void
+miniflow_clone(struct miniflow *dst, const struct miniflow *src)
+{
+ int n = miniflow_n_values(src);
+ memcpy(dst->map, src->map, sizeof dst->map);
+ dst->values = miniflow_alloc_values(dst, n);
+ memcpy(dst->values, src->values, n * sizeof *dst->values);
+}
+
+/* Frees any memory owned by 'flow'. Does not free the storage in which 'flow'
+ * itself resides; the caller is responsible for that. */
+void
+miniflow_destroy(struct miniflow *flow)
+{
+ if (flow->values != flow->inline_values) {
+ free(flow->values);
+ }
+}
+
+/* Initializes 'dst' as a copy of 'src'. */
+void
+miniflow_expand(const struct miniflow *src, struct flow *dst)
+{
+ uint32_t *dst_u32 = (uint32_t *) dst;
+ int ofs;
+ int i;
+
+ memset(dst_u32, 0, sizeof *dst);
+
+ ofs = 0;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = src->map[i]; map; map = zero_rightmost_1bit(map)) {
+ dst_u32[raw_ctz(map) + i * 32] = src->values[ofs++];
+ }
+ }
+}
+
+static const uint32_t *
+miniflow_get__(const struct miniflow *flow, unsigned int u32_ofs)
+{
+ if (!(flow->map[u32_ofs / 32] & (1u << (u32_ofs % 32)))) {
+ static const uint32_t zero = 0;
+ return &zero;
+ } else {
+ const uint32_t *p = flow->values;
+
+ BUILD_ASSERT(MINI_N_MAPS == 2);
+ if (u32_ofs < 32) {
+ p += popcount(flow->map[0] & ((1u << u32_ofs) - 1));
+ } else {
+ p += popcount(flow->map[0]);
+ p += popcount(flow->map[1] & ((1u << (u32_ofs - 32)) - 1));
+ }
+ return p;
+ }
+}
+
+/* Returns the uint32_t that would be at byte offset '4 * u32_ofs' if 'flow'
+ * were expanded into a "struct flow". */
+uint32_t
+miniflow_get(const struct miniflow *flow, unsigned int u32_ofs)
+{
+ return *miniflow_get__(flow, u32_ofs);
+}
+
+/* Returns the ovs_be16 that would be at byte offset 'u8_ofs' if 'flow' were
+ * expanded into a "struct flow". */
+static ovs_be16
+miniflow_get_be16(const struct miniflow *flow, unsigned int u8_ofs)
+{
+ const uint32_t *u32p = miniflow_get__(flow, u8_ofs / 4);
+ const ovs_be16 *be16p = (const ovs_be16 *) u32p;
+ return be16p[u8_ofs % 4 != 0];
+}
+
+/* Returns the VID within the vlan_tci member of the "struct flow" represented
+ * by 'flow'. */
+uint16_t
+miniflow_get_vid(const struct miniflow *flow)
+{
+ ovs_be16 tci = miniflow_get_be16(flow, offsetof(struct flow, vlan_tci));
+ return vlan_tci_to_vid(tci);
+}
+
+/* Returns true if 'a' and 'b' are the same flow, false otherwise. */
+bool
+miniflow_equal(const struct miniflow *a, const struct miniflow *b)
+{
+ int i;
+
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ if (a->map[i] != b->map[i]) {
+ return false;
+ }
+ }
+
+ return !memcmp(a->values, b->values,
+ miniflow_n_values(a) * sizeof *a->values);
+}
+
+/* Returns true if 'a' and 'b' are equal at the places where there are 1-bits
+ * in 'mask', false if they differ. */
+bool
+miniflow_equal_in_minimask(const struct miniflow *a, const struct miniflow *b,
+ const struct minimask *mask)
+{
+ const uint32_t *p;
+ int i;
+
+ p = mask->masks.values;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+
+ if ((miniflow_get(a, ofs) ^ miniflow_get(b, ofs)) & *p) {
+ return false;
+ }
+ p++;
+ }
+ }
+
+ return true;
+}
+
+/* Returns true if 'a' and 'b' are equal at the places where there are 1-bits
+ * in 'mask', false if they differ. */
+bool
+miniflow_equal_flow_in_minimask(const struct miniflow *a, const struct flow *b,
+ const struct minimask *mask)
+{
+ const uint32_t *b_u32 = (const uint32_t *) b;
+ const uint32_t *p;
+ int i;
+
+ p = mask->masks.values;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+
+ if ((miniflow_get(a, ofs) ^ b_u32[ofs]) & *p) {
+ return false;
+ }
+ p++;
+ }
+ }
+
+ return true;
+}
+
+/* Returns a hash value for 'flow', given 'basis'. */
+uint32_t
+miniflow_hash(const struct miniflow *flow, uint32_t basis)
+{
+ BUILD_ASSERT_DECL(MINI_N_MAPS == 2);
+ return hash_3words(flow->map[0], flow->map[1],
+ hash_words(flow->values, miniflow_n_values(flow),
+ basis));
+}
+
+/* Returns a hash value for the bits of 'flow' where there are 1-bits in
+ * 'mask', given 'basis'.
+ *
+ * The hash values returned by this function are the same as those returned by
+ * flow_hash_in_minimask(), only the form of the arguments differ. */
+uint32_t
+miniflow_hash_in_minimask(const struct miniflow *flow,
+ const struct minimask *mask, uint32_t basis)
+{
+ const uint32_t *p = mask->masks.values;
+ uint32_t hash;
+ int i;
+
+ hash = basis;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+
+ hash = mhash_add(hash, miniflow_get(flow, ofs) & *p);
+ p++;
+ }
+ }
+
+ return mhash_finish(hash, (p - mask->masks.values) * 4);
+}
+
+/* Returns a hash value for the bits of 'flow' where there are 1-bits in
+ * 'mask', given 'basis'.
+ *
+ * The hash values returned by this function are the same as those returned by
+ * miniflow_hash_in_minimask(), only the form of the arguments differ. */
+uint32_t
+flow_hash_in_minimask(const struct flow *flow, const struct minimask *mask,
+ uint32_t basis)
+{
+ const uint32_t *flow_u32 = (const uint32_t *) flow;
+ const uint32_t *p = mask->masks.values;
+ uint32_t hash;
+ int i;
+
+ hash = basis;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+
+ hash = mhash_add(hash, flow_u32[ofs] & *p);
+ p++;
+ }
+ }
+
+ return mhash_finish(hash, (p - mask->masks.values) * 4);
+}
+\f
+/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
+ * with minimask_destroy(). */
+void
+minimask_init(struct minimask *mask, const struct flow_wildcards *wc)
+{
+ miniflow_init(&mask->masks, &wc->masks);
+}
+
+/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
+ * with minimask_destroy(). */
+void
+minimask_clone(struct minimask *dst, const struct minimask *src)
+{
+ miniflow_clone(&dst->masks, &src->masks);
+}
+
+/* Initializes 'dst_' as the bit-wise "and" of 'a_' and 'b_'.
+ *
+ * The caller must provide room for FLOW_U32S "uint32_t"s in 'storage', for use
+ * by 'dst_'. The caller must *not* free 'dst_' with minimask_destroy(). */
+void
+minimask_combine(struct minimask *dst_,
+ const struct minimask *a_, const struct minimask *b_,
+ uint32_t storage[FLOW_U32S])
+{
+ struct miniflow *dst = &dst_->masks;
+ const struct miniflow *a = &a_->masks;
+ const struct miniflow *b = &b_->masks;
+ int i, n;
+
+ n = 0;
+ dst->values = storage;
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ dst->map[i] = 0;
+ for (map = a->map[i] & b->map[i]; map;
+ map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+ uint32_t mask = miniflow_get(a, ofs) & miniflow_get(b, ofs);
+
+ if (mask) {
+ dst->map[i] |= rightmost_1bit(map);
+ dst->values[n++] = mask;
+ }
+ }
+ }
+}
+
+/* Frees any memory owned by 'mask'. Does not free the storage in which 'mask'
+ * itself resides; the caller is responsible for that. */
+void
+minimask_destroy(struct minimask *mask)
+{
+ miniflow_destroy(&mask->masks);
+}
+
+/* Initializes 'dst' as a copy of 'src'. */
+void
+minimask_expand(const struct minimask *mask, struct flow_wildcards *wc)
+{
+ miniflow_expand(&mask->masks, &wc->masks);
+}
+
+/* Returns the uint32_t that would be at byte offset '4 * u32_ofs' if 'mask'
+ * were expanded into a "struct flow_wildcards". */
+uint32_t
+minimask_get(const struct minimask *mask, unsigned int u32_ofs)
+{
+ return miniflow_get(&mask->masks, u32_ofs);
+}
+
+/* Returns the VID mask within the vlan_tci member of the "struct
+ * flow_wildcards" represented by 'mask'. */
+uint16_t
+minimask_get_vid_mask(const struct minimask *mask)
+{
+ return miniflow_get_vid(&mask->masks);
+}
+
+/* Returns true if 'a' and 'b' are the same flow mask, false otherwise. */
+bool
+minimask_equal(const struct minimask *a, const struct minimask *b)
+{
+ return miniflow_equal(&a->masks, &b->masks);
+}
+
+/* Returns a hash value for 'mask', given 'basis'. */
+uint32_t
+minimask_hash(const struct minimask *mask, uint32_t basis)
+{
+ return miniflow_hash(&mask->masks, basis);
+}
+
+/* Returns true if at least one bit is wildcarded in 'a_' but not in 'b_',
+ * false otherwise. */
+bool
+minimask_has_extra(const struct minimask *a_, const struct minimask *b_)
+{
+ const struct miniflow *a = &a_->masks;
+ const struct miniflow *b = &b_->masks;
+ int i;
+
+ for (i = 0; i < MINI_N_MAPS; i++) {
+ uint32_t map;
+
+ for (map = a->map[i] | b->map[i]; map;
+ map = zero_rightmost_1bit(map)) {
+ int ofs = raw_ctz(map) + i * 32;
+ uint32_t a_u32 = miniflow_get(a, ofs);
+ uint32_t b_u32 = miniflow_get(b, ofs);
+
+ if ((a_u32 & b_u32) != b_u32) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+/* Returns true if 'mask' matches every packet, false if 'mask' fixes any bits
+ * or fields. */
+bool
+minimask_is_catchall(const struct minimask *mask_)
+{
+ const struct miniflow *mask = &mask_->masks;
+
+ BUILD_ASSERT(MINI_N_MAPS == 2);
+ return !(mask->map[0] | mask->map[1]);
+}