X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.h;h=fc6222208650621551155b9298dc8d5000a9c303;hb=1db14c13e5a8b1009d97f603fa24fb7984547695;hp=3534fb485c61f4fccd2996150cedd97c0c347540;hpb=16c6d0c38406d860027c12d7da5138f35f6264b5;p=sliver-openvswitch.git diff --git a/lib/flow.h b/lib/flow.h index 3534fb485..fc6222208 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -29,6 +29,8 @@ struct dpif_flow_stats; struct ds; struct flow_wildcards; +struct miniflow; +struct minimask; struct ofpbuf; /* This sequence number should be incremented whenever anything involving flows @@ -79,6 +81,8 @@ struct flow { }; BUILD_ASSERT_DECL(sizeof(struct flow) % 8 == 0); +#define FLOW_U32S (sizeof(struct flow) / 4) + /* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */ BUILD_ASSERT_DECL(sizeof(struct flow) == 152 && FLOW_WC_SEQ == 17); @@ -126,42 +130,21 @@ flow_hash(const struct flow *flow, uint32_t basis) return hash_words((const uint32_t *) flow, sizeof *flow / 4, basis); } -/* Information on wildcards for a flow, as a supplement to "struct flow". */ +uint32_t flow_hash_in_minimask(const struct flow *, const struct minimask *, + uint32_t basis); + +/* Wildcards for a flow. + * + * 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. */ - 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. */ - uint16_t in_port_mask; /* 1-bit in each significant in_port bit. */ - ovs_be16 vlan_tci_mask; /* 1-bit in each significant vlan_tci bit. */ - ovs_be16 dl_type_mask; /* 1-bit in each significant dl_type 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_proto_mask; /* 1-bit in each significant nw_proto 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 nw_tos_mask; /* 1-bit in each significant nw_tos bit. */ - uint8_t nw_ttl_mask; /* 1-bit in each significant nw_ttl bit. */ - uint8_t zeros[6]; /* Padding field set to zero. */ + struct flow masks; }; -BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) % 8 == 0); - -/* Remember to update FLOW_WC_SEQ when updating struct flow_wildcards. */ -BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 152 && FLOW_WC_SEQ == 17); 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 *, @@ -183,4 +166,96 @@ uint32_t flow_hash_fields(const struct flow *, enum nx_hash_fields, 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 *); + +/* Compressed flow. */ + +#define MINI_N_INLINE (sizeof(void *) == 4 ? 7 : 8) +#define MINI_N_MAPS DIV_ROUND_UP(FLOW_U32S, 32) + +/* A sparse representation of a "struct flow". + * + * A "struct flow" is fairly large and tends to be mostly zeros. Sparse + * representation has two advantages. First, it saves memory. Second, it + * saves time when the goal is to iterate over only the nonzero parts of the + * struct. + * + * The 'map' member holds one bit for each uint32_t in a "struct flow". Each + * 0-bit indicates that the corresponding uint32_t is zero, each 1-bit that it + * is nonzero. + * + * 'values' points to the start of an array that has one element for each 1-bit + * in 'map'. The least-numbered 1-bit is in values[0], the next 1-bit is in + * values[1], and so on. + * + * 'values' may point to a few different locations: + * + * - If 'map' has MINI_N_INLINE or fewer 1-bits, it may point to + * 'inline_values'. One hopes that this is the common case. + * + * - If 'map' has more than MINI_N_INLINE 1-bits, it may point to memory + * allocated with malloc(). + * + * - The caller could provide storage on the stack for situations where + * that makes sense. So far that's only proved useful for + * minimask_combine(), but the principle works elsewhere. + * + * The implementation maintains and depends on the invariant that every element + * in 'values' is nonzero; that is, wherever a 1-bit appears in 'map', the + * corresponding element of 'values' must be nonzero. + */ +struct miniflow { + uint32_t *values; + uint32_t inline_values[MINI_N_INLINE]; + uint32_t map[MINI_N_MAPS]; +}; + +void miniflow_init(struct miniflow *, const struct flow *); +void miniflow_clone(struct miniflow *, const struct miniflow *); +void miniflow_destroy(struct miniflow *); + +void miniflow_expand(const struct miniflow *, struct flow *); + +uint32_t miniflow_get(const struct miniflow *, unsigned int u32_ofs); +uint16_t miniflow_get_vid(const struct miniflow *); + +bool miniflow_equal(const struct miniflow *a, const struct miniflow *b); +bool miniflow_equal_in_minimask(const struct miniflow *a, + const struct miniflow *b, + const struct minimask *); +bool miniflow_equal_flow_in_minimask(const struct miniflow *a, + const struct flow *b, + const struct minimask *); +uint32_t miniflow_hash(const struct miniflow *, uint32_t basis); +uint32_t miniflow_hash_in_minimask(const struct miniflow *, + const struct minimask *, uint32_t basis); + +/* Compressed flow wildcards. */ + +/* A sparse representation of a "struct flow_wildcards". + * + * See the large comment on struct miniflow for details. */ +struct minimask { + struct miniflow masks; +}; + +void minimask_init(struct minimask *, const struct flow_wildcards *); +void minimask_clone(struct minimask *, const struct minimask *); +void minimask_combine(struct minimask *dst, + const struct minimask *a, const struct minimask *b, + uint32_t storage[FLOW_U32S]); +void minimask_destroy(struct minimask *); + +void minimask_expand(const struct minimask *, struct flow_wildcards *); + +uint32_t minimask_get(const struct minimask *, unsigned int u32_ofs); +uint16_t minimask_get_vid_mask(const struct minimask *); + +bool minimask_equal(const struct minimask *a, const struct minimask *b); +uint32_t minimask_hash(const struct minimask *, uint32_t basis); + +bool minimask_has_extra(const struct minimask *, const struct minimask *); +bool minimask_is_catchall(const struct minimask *); + #endif /* flow.h */