/* This sequence number should be incremented whenever anything involving flows
* or the wildcarding of flows changes. This will cause build assertion
* failures in places which likely need to be updated. */
-#define FLOW_WC_SEQ 14
+#define FLOW_WC_SEQ 17
#define FLOW_N_REGS 8
BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS);
uint8_t arp_tha[6]; /* ARP/ND target hardware address. */
uint8_t nw_ttl; /* IP TTL/Hop Limit. */
uint8_t nw_frag; /* FLOW_FRAG_* flags. */
- uint8_t reserved[2]; /* Reserved for 64-bit packing. */
+ uint8_t zeros[2]; /* Must be zero. */
};
+BUILD_ASSERT_DECL(sizeof(struct flow) % 8 == 0);
-/* Represents the metadata fields of struct flow. The masks are used to
- * indicate which metadata fields are relevant in a given context. Typically
- * they will be all 1 or all 0. */
-struct flow_metadata {
- ovs_be64 tun_id; /* Encapsulating tunnel ID. */
- ovs_be64 tun_id_mask; /* 1-bit in each significant tun_id bit.*/
+#define FLOW_U32S (sizeof(struct flow) / 4)
- ovs_be64 metadata;
- ovs_be64 metadata_mask;
+/* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */
+BUILD_ASSERT_DECL(sizeof(struct flow) == 152 && FLOW_WC_SEQ == 17);
+/* Represents the metadata fields of struct flow. */
+struct flow_metadata {
+ ovs_be64 tun_id; /* Encapsulating tunnel ID. */
+ ovs_be64 metadata; /* OpenFlow 1.1+ metadata field. */
uint32_t regs[FLOW_N_REGS]; /* Registers. */
- uint32_t reg_masks[FLOW_N_REGS]; /* 1-bit in each significant regs bit. */
-
uint16_t in_port; /* OpenFlow port or zero. */
};
-/* Assert that there are FLOW_SIG_SIZE bytes of significant data in "struct
- * flow", followed by FLOW_PAD_SIZE bytes of padding. */
-#define FLOW_SIG_SIZE (118 + FLOW_N_REGS * 4)
-#define FLOW_PAD_SIZE 2
-BUILD_ASSERT_DECL(offsetof(struct flow, nw_frag) == FLOW_SIG_SIZE - 1);
-BUILD_ASSERT_DECL(sizeof(((struct flow *)0)->nw_frag) == 1);
-BUILD_ASSERT_DECL(sizeof(struct flow) == FLOW_SIG_SIZE + FLOW_PAD_SIZE);
-
-/* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */
-BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 150 && FLOW_WC_SEQ == 14);
-
void flow_extract(struct ofpbuf *, uint32_t priority, ovs_be64 tun_id,
uint16_t in_port, struct flow *);
void flow_zero_wildcards(struct flow *, const struct flow_wildcards *);
static inline int
flow_compare_3way(const struct flow *a, const struct flow *b)
{
- return memcmp(a, b, FLOW_SIG_SIZE);
+ return memcmp(a, b, sizeof *a);
}
static inline bool
static inline size_t
flow_hash(const struct flow *flow, uint32_t basis)
{
- return hash_bytes(flow, FLOW_SIG_SIZE, basis);
+ return hash_words((const uint32_t *) flow, sizeof *flow / 4, basis);
}
-
-/* Open vSwitch flow wildcard bits.
+\f
+/* Wildcards for a flow.
*
- * These are used only internally to Open vSwitch, in the 'wildcards' member of
- * struct flow_wildcards. They never appear in the wire protocol in this
- * form. */
-
-typedef unsigned int OVS_BITWISE flow_wildcards_t;
-
-/* Same values and meanings as corresponding OFPFW10_* bits. */
-#define FWW_IN_PORT ((OVS_FORCE flow_wildcards_t) (1 << 0))
-#define FWW_DL_TYPE ((OVS_FORCE flow_wildcards_t) (1 << 4))
-#define FWW_NW_PROTO ((OVS_FORCE flow_wildcards_t) (1 << 5))
-/* No corresponding OFPFW10_* bits. */
-#define FWW_NW_DSCP ((OVS_FORCE flow_wildcards_t) (1 << 1))
-#define FWW_NW_ECN ((OVS_FORCE flow_wildcards_t) (1 << 2))
-#define FWW_NW_TTL ((OVS_FORCE flow_wildcards_t) (1 << 3))
-#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 6)) - 1))
-
-/* Remember to update FLOW_WC_SEQ when adding or removing FWW_*. */
-BUILD_ASSERT_DECL(FWW_ALL == ((1 << 6) - 1) && FLOW_WC_SEQ == 14);
-
-/* Information on wildcards for a flow, as a supplement to "struct flow".
- *
- * Note that the meaning of 1-bits in 'wildcards' is opposite that of 1-bits in
- * the rest of the members. */
+ * A 1-bit in each bit in 'masks' indicates that the corresponding bit of
+ * the flow is significant (must match). A 0-bit indicates that the
+ * corresponding bit of the flow is wildcarded (need not match). */
struct flow_wildcards {
- ovs_be64 tun_id_mask; /* 1-bit in each significant tun_id bit. */
- ovs_be64 metadata_mask; /* 1-bit in each significant metadata bit. */
- flow_wildcards_t wildcards; /* 1-bit in each FWW_* wildcarded field. */
- uint32_t reg_masks[FLOW_N_REGS]; /* 1-bit in each significant regs bit. */
- ovs_be32 nw_src_mask; /* 1-bit in each significant nw_src bit. */
- ovs_be32 nw_dst_mask; /* 1-bit in each significant nw_dst bit. */
- struct in6_addr ipv6_src_mask; /* 1-bit in each signficant ipv6_src bit. */
- struct in6_addr ipv6_dst_mask; /* 1-bit in each signficant ipv6_dst bit. */
- struct in6_addr nd_target_mask; /* 1-bit in each significant
- nd_target bit. */
- ovs_be32 ipv6_label_mask; /* 1 bit in each significant ipv6_label bit. */
- ovs_be16 vlan_tci_mask; /* 1-bit in each significant vlan_tci bit. */
- ovs_be16 tp_src_mask; /* 1-bit in each significant tp_src bit. */
- ovs_be16 tp_dst_mask; /* 1-bit in each significant tp_dst bit. */
- uint8_t nw_frag_mask; /* 1-bit in each significant nw_frag bit. */
- uint8_t dl_src_mask[6]; /* 1-bit in each significant dl_src bit. */
- uint8_t dl_dst_mask[6]; /* 1-bit in each significant dl_dst bit. */
- uint8_t arp_sha_mask[6]; /* 1-bit in each significant dl_dst bit. */
- uint8_t arp_tha_mask[6]; /* 1-bit in each significant dl_dst bit. */
- uint8_t zeros[1]; /* Padding field set to zero. */
+ struct flow masks;
};
-/* Remember to update FLOW_WC_SEQ when updating struct flow_wildcards. */
-BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 144 && FLOW_WC_SEQ == 14);
-
void flow_wildcards_init_catchall(struct flow_wildcards *);
void flow_wildcards_init_exact(struct flow_wildcards *);
-bool flow_wildcards_is_exact(const struct flow_wildcards *);
bool flow_wildcards_is_catchall(const struct flow_wildcards *);
void flow_wildcards_set_reg_mask(struct flow_wildcards *,
const struct flow_wildcards *);
uint32_t flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis);
-const uint8_t *flow_wildcards_to_dl_dst_mask(flow_wildcards_t);
-bool flow_wildcards_is_dl_dst_mask_valid(const uint8_t[6]);
-flow_wildcards_t flow_wildcards_set_dl_dst_mask(flow_wildcards_t,
- const uint8_t mask[6]);
uint32_t flow_hash_fields(const struct flow *, enum nx_hash_fields,
uint16_t basis);
const char *flow_hash_fields_to_str(enum nx_hash_fields);
bool flow_hash_fields_valid(enum nx_hash_fields);
+bool flow_equal_except(const struct flow *a, const struct flow *b,
+ const struct flow_wildcards *);
+
#endif /* flow.h */
projects / openvswitch / blobdiff