/* Context for pushing data to a miniflow. */
struct mf_ctx {
- uint64_t map;
+ struct flowmap map;
uint64_t *data;
uint64_t * const end;
};
* away. Some GCC versions gave warnings on ALWAYS_INLINE, so these are
* defined as macros. */
-#if (FLOW_WC_SEQ != 32)
+#if (FLOW_WC_SEQ != 35)
#define MINIFLOW_ASSERT(X) ovs_assert(X)
BUILD_MESSAGE("FLOW_WC_SEQ changed: miniflow_extract() will have runtime "
"assertions enabled. Consider updating FLOW_WC_SEQ after "
#define MINIFLOW_ASSERT(X)
#endif
-#define miniflow_push_uint64_(MF, OFS, VALUE) \
-{ \
- MINIFLOW_ASSERT(MF.data < MF.end && (OFS) % 8 == 0 \
- && !(MF.map & (UINT64_MAX << (OFS) / 8))); \
- *MF.data++ = VALUE; \
- MF.map |= UINT64_C(1) << (OFS) / 8; \
+/* True if 'IDX' and higher bits are not set. */
+#define ASSERT_FLOWMAP_NOT_SET(FM, IDX) \
+{ \
+ MINIFLOW_ASSERT(!((FM)->bits[(IDX) / MAP_T_BITS] & \
+ (MAP_MAX << ((IDX) % MAP_T_BITS)))); \
+ for (size_t i = (IDX) / MAP_T_BITS + 1; i < FLOWMAP_UNITS; i++) { \
+ MINIFLOW_ASSERT(!(FM)->bits[i]); \
+ } \
}
-#define miniflow_push_be64_(MF, OFS, VALUE) \
+#define miniflow_set_map(MF, OFS) \
+ { \
+ ASSERT_FLOWMAP_NOT_SET(&MF.map, (OFS)); \
+ flowmap_set(&MF.map, (OFS), 1); \
+}
+
+#define miniflow_assert_in_map(MF, OFS) \
+ MINIFLOW_ASSERT(flowmap_is_set(&MF.map, (OFS))); \
+ ASSERT_FLOWMAP_NOT_SET(&MF.map, (OFS) + 1)
+
+#define miniflow_push_uint64_(MF, OFS, VALUE) \
+{ \
+ MINIFLOW_ASSERT(MF.data < MF.end && (OFS) % 8 == 0); \
+ *MF.data++ = VALUE; \
+ miniflow_set_map(MF, OFS / 8); \
+}
+
+#define miniflow_push_be64_(MF, OFS, VALUE) \
miniflow_push_uint64_(MF, OFS, (OVS_FORCE uint64_t)(VALUE))
-#define miniflow_push_uint32_(MF, OFS, VALUE) \
-{ \
- MINIFLOW_ASSERT(MF.data < MF.end && \
- (((OFS) % 8 == 0 && !(MF.map & (UINT64_MAX << (OFS) / 8))) \
- || ((OFS) % 8 == 4 && MF.map & (UINT64_C(1) << (OFS) / 8) \
- && !(MF.map & (UINT64_MAX << ((OFS) / 8 + 1)))))); \
- \
- if ((OFS) % 8 == 0) { \
- *(uint32_t *)MF.data = VALUE; \
- MF.map |= UINT64_C(1) << (OFS) / 8; \
- } else if ((OFS) % 8 == 4) { \
- *((uint32_t *)MF.data + 1) = VALUE; \
- MF.data++; \
- } \
+#define miniflow_push_uint32_(MF, OFS, VALUE) \
+ { \
+ MINIFLOW_ASSERT(MF.data < MF.end); \
+ \
+ if ((OFS) % 8 == 0) { \
+ miniflow_set_map(MF, OFS / 8); \
+ *(uint32_t *)MF.data = VALUE; \
+ } else if ((OFS) % 8 == 4) { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint32_t *)MF.data + 1) = VALUE; \
+ MF.data++; \
+ } \
}
#define miniflow_push_be32_(MF, OFS, VALUE) \
miniflow_push_uint32_(MF, OFS, (OVS_FORCE uint32_t)(VALUE))
-#define miniflow_push_uint16_(MF, OFS, VALUE) \
-{ \
- MINIFLOW_ASSERT(MF.data < MF.end && \
- (((OFS) % 8 == 0 && !(MF.map & (UINT64_MAX << (OFS) / 8))) \
- || ((OFS) % 2 == 0 && MF.map & (UINT64_C(1) << (OFS) / 8) \
- && !(MF.map & (UINT64_MAX << ((OFS) / 8 + 1)))))); \
- \
- if ((OFS) % 8 == 0) { \
- *(uint16_t *)MF.data = VALUE; \
- MF.map |= UINT64_C(1) << (OFS) / 8; \
- } else if ((OFS) % 8 == 2) { \
- *((uint16_t *)MF.data + 1) = VALUE; \
- } else if ((OFS) % 8 == 4) { \
- *((uint16_t *)MF.data + 2) = VALUE; \
- } else if ((OFS) % 8 == 6) { \
- *((uint16_t *)MF.data + 3) = VALUE; \
- MF.data++; \
- } \
+#define miniflow_push_uint16_(MF, OFS, VALUE) \
+{ \
+ MINIFLOW_ASSERT(MF.data < MF.end); \
+ \
+ if ((OFS) % 8 == 0) { \
+ miniflow_set_map(MF, OFS / 8); \
+ *(uint16_t *)MF.data = VALUE; \
+ } else if ((OFS) % 8 == 2) { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint16_t *)MF.data + 1) = VALUE; \
+ } else if ((OFS) % 8 == 4) { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint16_t *)MF.data + 2) = VALUE; \
+ } else if ((OFS) % 8 == 6) { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint16_t *)MF.data + 3) = VALUE; \
+ MF.data++; \
+ } \
+}
+
+#define miniflow_push_uint8_(MF, OFS, VALUE) \
+{ \
+ MINIFLOW_ASSERT(MF.data < MF.end); \
+ \
+ if ((OFS) % 8 == 0) { \
+ miniflow_set_map(MF, OFS / 8); \
+ *(uint8_t *)MF.data = VALUE; \
+ } else if ((OFS) % 8 == 7) { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint8_t *)MF.data + 7) = VALUE; \
+ MF.data++; \
+ } else { \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ *((uint8_t *)MF.data + ((OFS) % 8)) = VALUE; \
+ } \
+}
+
+#define miniflow_pad_to_64_(MF, OFS) \
+{ \
+ MINIFLOW_ASSERT((OFS) % 8 != 0); \
+ miniflow_assert_in_map(MF, OFS / 8); \
+ \
+ memset((uint8_t *)MF.data + (OFS) % 8, 0, 8 - (OFS) % 8); \
+ MF.data++; \
}
-#define miniflow_pad_to_64_(MF, OFS) \
-{ \
- MINIFLOW_ASSERT((OFS) % 8 != 0); \
- MINIFLOW_ASSERT(MF.map & (UINT64_C(1) << (OFS) / 8)); \
- MINIFLOW_ASSERT(!(MF.map & (UINT64_MAX << ((OFS) / 8 + 1)))); \
- \
- memset((uint8_t *)MF.data + (OFS) % 8, 0, 8 - (OFS) % 8); \
- MF.data++; \
+#define miniflow_pad_from_64_(MF, OFS) \
+{ \
+ MINIFLOW_ASSERT(MF.data < MF.end); \
+ \
+ MINIFLOW_ASSERT((OFS) % 8 != 0); \
+ miniflow_set_map(MF, OFS / 8); \
+ \
+ memset((uint8_t *)MF.data, 0, (OFS) % 8); \
}
#define miniflow_push_be16_(MF, OFS, VALUE) \
miniflow_push_uint16_(MF, OFS, (OVS_FORCE uint16_t)VALUE);
+#define miniflow_push_be8_(MF, OFS, VALUE) \
+ miniflow_push_uint8_(MF, OFS, (OVS_FORCE uint8_t)VALUE);
+
+#define miniflow_set_maps(MF, OFS, N_WORDS) \
+{ \
+ size_t ofs = (OFS); \
+ size_t n_words = (N_WORDS); \
+ \
+ MINIFLOW_ASSERT(n_words && MF.data + n_words <= MF.end); \
+ ASSERT_FLOWMAP_NOT_SET(&MF.map, ofs); \
+ flowmap_set(&MF.map, ofs, n_words); \
+}
+
/* Data at 'valuep' may be unaligned. */
#define miniflow_push_words_(MF, OFS, VALUEP, N_WORDS) \
{ \
- int ofs64 = (OFS) / 8; \
- \
- MINIFLOW_ASSERT(MF.data + (N_WORDS) <= MF.end && (OFS) % 8 == 0 \
- && !(MF.map & (UINT64_MAX << ofs64))); \
- \
- memcpy(MF.data, (VALUEP), (N_WORDS) * sizeof *MF.data); \
- MF.data += (N_WORDS); \
- MF.map |= ((UINT64_MAX >> (64 - (N_WORDS))) << ofs64); \
+ MINIFLOW_ASSERT((OFS) % 8 == 0); \
+ miniflow_set_maps(MF, (OFS) / 8, (N_WORDS)); \
+ memcpy(MF.data, (VALUEP), (N_WORDS) * sizeof *MF.data); \
+ MF.data += (N_WORDS); \
}
/* Push 32-bit words padded to 64-bits. */
#define miniflow_push_words_32_(MF, OFS, VALUEP, N_WORDS) \
{ \
- int ofs64 = (OFS) / 8; \
- \
- MINIFLOW_ASSERT(MF.data + DIV_ROUND_UP(N_WORDS, 2) <= MF.end \
- && (OFS) % 8 == 0 \
- && !(MF.map & (UINT64_MAX << ofs64))); \
- \
+ miniflow_set_maps(MF, (OFS) / 8, DIV_ROUND_UP(N_WORDS, 2)); \
memcpy(MF.data, (VALUEP), (N_WORDS) * sizeof(uint32_t)); \
MF.data += DIV_ROUND_UP(N_WORDS, 2); \
- MF.map |= ((UINT64_MAX >> (64 - DIV_ROUND_UP(N_WORDS, 2))) << ofs64); \
if ((N_WORDS) & 1) { \
*((uint32_t *)MF.data - 1) = 0; \
} \
/* MACs start 64-aligned, and must be followed by other data or padding. */
#define miniflow_push_macs_(MF, OFS, VALUEP) \
{ \
- int ofs64 = (OFS) / 8; \
- \
- MINIFLOW_ASSERT(MF.data + 2 <= MF.end && (OFS) % 8 == 0 \
- && !(MF.map & (UINT64_MAX << ofs64))); \
- \
+ miniflow_set_maps(MF, (OFS) / 8, 2); \
memcpy(MF.data, (VALUEP), 2 * ETH_ADDR_LEN); \
MF.data += 1; /* First word only. */ \
- MF.map |= UINT64_C(3) << ofs64; /* Both words. */ \
}
#define miniflow_push_uint32(MF, FIELD, VALUE) \
#define miniflow_push_be16(MF, FIELD, VALUE) \
miniflow_push_be16_(MF, offsetof(struct flow, FIELD), VALUE)
+#define miniflow_push_uint8(MF, FIELD, VALUE) \
+ miniflow_push_uint8_(MF, offsetof(struct flow, FIELD), VALUE)
+
#define miniflow_pad_to_64(MF, FIELD) \
- miniflow_pad_to_64_(MF, offsetof(struct flow, FIELD))
+ miniflow_pad_to_64_(MF, OFFSETOFEND(struct flow, FIELD))
+
+#define miniflow_pad_from_64(MF, FIELD) \
+ miniflow_pad_from_64_(MF, offsetof(struct flow, FIELD))
#define miniflow_push_words(MF, FIELD, VALUEP, N_WORDS) \
miniflow_push_words_(MF, offsetof(struct flow, FIELD), VALUEP, N_WORDS)
return htons(FLOW_DL_TYPE_NONE);
}
-static inline bool
+static inline void
parse_icmpv6(const void **datap, size_t *sizep, const struct icmp6_hdr *icmp,
const struct in6_addr **nd_target,
- uint8_t arp_buf[2][ETH_ADDR_LEN])
+ struct eth_addr arp_buf[2])
{
if (icmp->icmp6_code == 0 &&
(icmp->icmp6_type == ND_NEIGHBOR_SOLICIT ||
*nd_target = data_try_pull(datap, sizep, sizeof **nd_target);
if (OVS_UNLIKELY(!*nd_target)) {
- return false;
+ return;
}
while (*sizep >= 8) {
/* The minimum size of an option is 8 bytes, which also is
* the size of Ethernet link-layer options. */
- const struct nd_opt_hdr *nd_opt = *datap;
- int opt_len = nd_opt->nd_opt_len * 8;
+ const struct ovs_nd_opt *nd_opt = *datap;
+ int opt_len = nd_opt->nd_opt_len * ND_OPT_LEN;
if (!opt_len || opt_len > *sizep) {
- goto invalid;
+ return;
}
/* Store the link layer address if the appropriate option is
* provided. It is considered an error if the same link
* layer option is specified twice. */
if (nd_opt->nd_opt_type == ND_OPT_SOURCE_LINKADDR
- && opt_len == 8) {
+ && opt_len == 8) {
if (OVS_LIKELY(eth_addr_is_zero(arp_buf[0]))) {
- memcpy(arp_buf[0], nd_opt + 1, ETH_ADDR_LEN);
+ arp_buf[0] = nd_opt->nd_opt_mac;
} else {
goto invalid;
}
} else if (nd_opt->nd_opt_type == ND_OPT_TARGET_LINKADDR
- && opt_len == 8) {
+ && opt_len == 8) {
if (OVS_LIKELY(eth_addr_is_zero(arp_buf[1]))) {
- memcpy(arp_buf[1], nd_opt + 1, ETH_ADDR_LEN);
+ arp_buf[1] = nd_opt->nd_opt_mac;
} else {
goto invalid;
}
}
if (OVS_UNLIKELY(!data_try_pull(datap, sizep, opt_len))) {
- goto invalid;
+ return;
}
}
}
- return true;
+ return;
invalid:
- return false;
+ *nd_target = NULL;
+ arp_buf[0] = eth_addr_zero;
+ arp_buf[1] = eth_addr_zero;
}
/* Initializes 'flow' members from 'packet' and 'md'
COVERAGE_INC(flow_extract);
- miniflow_initialize(&m.mf, m.buf);
miniflow_extract(packet, &m.mf);
miniflow_expand(&m.mf, flow);
}
const void *data = dp_packet_data(packet);
size_t size = dp_packet_size(packet);
uint64_t *values = miniflow_values(dst);
- struct mf_ctx mf = { 0, values, values + FLOW_U64S };
+ struct mf_ctx mf = { FLOWMAP_EMPTY_INITIALIZER, values,
+ values + FLOW_U64S };
const char *l2;
ovs_be16 dl_type;
uint8_t nw_frag, nw_tos, nw_ttl, nw_proto;
/* Metadata. */
- if (md->tunnel.ip_dst) {
+ if (flow_tnl_dst_is_set(&md->tunnel)) {
miniflow_push_words(mf, tunnel, &md->tunnel,
offsetof(struct flow_tnl, metadata) /
sizeof(uint64_t));
- if (md->tunnel.metadata.opt_map) {
- miniflow_push_words(mf, tunnel.metadata, &md->tunnel.metadata,
- sizeof md->tunnel.metadata / sizeof(uint64_t));
+
+ if (!(md->tunnel.flags & FLOW_TNL_F_UDPIF)) {
+ if (md->tunnel.metadata.present.map) {
+ miniflow_push_words(mf, tunnel.metadata, &md->tunnel.metadata,
+ sizeof md->tunnel.metadata /
+ sizeof(uint64_t));
+ }
+ } else {
+ if (md->tunnel.metadata.present.len) {
+ miniflow_push_words(mf, tunnel.metadata.present,
+ &md->tunnel.metadata.present, 1);
+ miniflow_push_words(mf, tunnel.metadata.opts.gnv,
+ md->tunnel.metadata.opts.gnv,
+ DIV_ROUND_UP(md->tunnel.metadata.present.len,
+ sizeof(uint64_t)));
+ }
}
}
if (md->skb_priority || md->pkt_mark) {
}
miniflow_push_uint32(mf, dp_hash, md->dp_hash);
miniflow_push_uint32(mf, in_port, odp_to_u32(md->in_port.odp_port));
- if (md->recirc_id) {
+ if (md->recirc_id || md->ct_state) {
miniflow_push_uint32(mf, recirc_id, md->recirc_id);
- miniflow_pad_to_64(mf, conj_id);
+ miniflow_push_uint16(mf, ct_state, md->ct_state);
+ miniflow_push_uint16(mf, ct_zone, md->ct_zone);
+ }
+
+ if (md->ct_state) {
+ miniflow_push_uint32(mf, ct_mark, md->ct_mark);
+ miniflow_pad_to_64(mf, ct_mark);
+
+ if (!ovs_u128_is_zero(&md->ct_label)) {
+ miniflow_push_words(mf, ct_label, &md->ct_label,
+ sizeof md->ct_label / sizeof(uint64_t));
+ }
}
/* Initialize packet's layer pointer and offsets. */
} else {
if (dl_type == htons(ETH_TYPE_ARP) ||
dl_type == htons(ETH_TYPE_RARP)) {
- uint8_t arp_buf[2][ETH_ADDR_LEN];
+ struct eth_addr arp_buf[2];
const struct arp_eth_header *arp = (const struct arp_eth_header *)
data_try_pull(&data, &size, ARP_ETH_HEADER_LEN);
/* Must be adjacent. */
ASSERT_SEQUENTIAL(arp_sha, arp_tha);
- memcpy(arp_buf[0], arp->ar_sha, ETH_ADDR_LEN);
- memcpy(arp_buf[1], arp->ar_tha, ETH_ADDR_LEN);
+ arp_buf[0] = arp->ar_sha;
+ arp_buf[1] = arp->ar_tha;
miniflow_push_macs(mf, arp_sha, arp_buf);
- miniflow_pad_to_64(mf, tcp_flags);
+ miniflow_pad_to_64(mf, arp_tha);
}
}
goto out;
if (OVS_LIKELY(size >= TCP_HEADER_LEN)) {
const struct tcp_header *tcp = data;
- miniflow_push_be32(mf, arp_tha[2], 0);
+ miniflow_push_be32(mf, arp_tha.ea[2], 0);
miniflow_push_be32(mf, tcp_flags,
TCP_FLAGS_BE32(tcp->tcp_ctl));
miniflow_push_be16(mf, tp_src, tcp->tcp_src);
miniflow_push_be16(mf, tp_dst, tcp->tcp_dst);
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ miniflow_pad_to_64(mf, tp_dst);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_UDP)) {
if (OVS_LIKELY(size >= UDP_HEADER_LEN)) {
miniflow_push_be16(mf, tp_src, udp->udp_src);
miniflow_push_be16(mf, tp_dst, udp->udp_dst);
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ miniflow_pad_to_64(mf, tp_dst);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_SCTP)) {
if (OVS_LIKELY(size >= SCTP_HEADER_LEN)) {
miniflow_push_be16(mf, tp_src, sctp->sctp_src);
miniflow_push_be16(mf, tp_dst, sctp->sctp_dst);
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ miniflow_pad_to_64(mf, tp_dst);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_ICMP)) {
if (OVS_LIKELY(size >= ICMP_HEADER_LEN)) {
miniflow_push_be16(mf, tp_src, htons(icmp->icmp_type));
miniflow_push_be16(mf, tp_dst, htons(icmp->icmp_code));
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ miniflow_pad_to_64(mf, tp_dst);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_IGMP)) {
if (OVS_LIKELY(size >= IGMP_HEADER_LEN)) {
} else if (OVS_LIKELY(nw_proto == IPPROTO_ICMPV6)) {
if (OVS_LIKELY(size >= sizeof(struct icmp6_hdr))) {
const struct in6_addr *nd_target = NULL;
- uint8_t arp_buf[2][ETH_ADDR_LEN];
+ struct eth_addr arp_buf[2] = { { { { 0 } } } };
const struct icmp6_hdr *icmp = data_pull(&data, &size,
sizeof *icmp);
- memset(arp_buf, 0, sizeof arp_buf);
- if (OVS_LIKELY(parse_icmpv6(&data, &size, icmp, &nd_target,
- arp_buf))) {
- if (nd_target) {
- miniflow_push_words(mf, nd_target, nd_target,
- sizeof *nd_target / 8);
- }
- miniflow_push_macs(mf, arp_sha, arp_buf);
- miniflow_pad_to_64(mf, tcp_flags);
- miniflow_push_be16(mf, tp_src, htons(icmp->icmp6_type));
- miniflow_push_be16(mf, tp_dst, htons(icmp->icmp6_code));
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ parse_icmpv6(&data, &size, icmp, &nd_target, arp_buf);
+ if (nd_target) {
+ miniflow_push_words(mf, nd_target, nd_target,
+ sizeof *nd_target / sizeof(uint64_t));
}
+ miniflow_push_macs(mf, arp_sha, arp_buf);
+ miniflow_pad_to_64(mf, arp_tha);
+ miniflow_push_be16(mf, tp_src, htons(icmp->icmp6_type));
+ miniflow_push_be16(mf, tp_dst, htons(icmp->icmp6_code));
+ miniflow_pad_to_64(mf, tp_dst);
}
}
}
{
int i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 32);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
match_init_catchall(flow_metadata);
if (flow->tunnel.tun_id != htonll(0)) {
match_set_tun_id(flow_metadata, flow->tunnel.tun_id);
}
- if (flow->tunnel.ip_src != htonl(0)) {
+ if (flow->tunnel.flags & FLOW_TNL_PUB_F_MASK) {
+ match_set_tun_flags(flow_metadata,
+ flow->tunnel.flags & FLOW_TNL_PUB_F_MASK);
+ }
+ if (flow->tunnel.ip_src) {
match_set_tun_src(flow_metadata, flow->tunnel.ip_src);
}
- if (flow->tunnel.ip_dst != htonl(0)) {
+ if (flow->tunnel.ip_dst) {
match_set_tun_dst(flow_metadata, flow->tunnel.ip_dst);
}
+ if (ipv6_addr_is_set(&flow->tunnel.ipv6_src)) {
+ match_set_tun_ipv6_src(flow_metadata, &flow->tunnel.ipv6_src);
+ }
+ if (ipv6_addr_is_set(&flow->tunnel.ipv6_dst)) {
+ match_set_tun_ipv6_dst(flow_metadata, &flow->tunnel.ipv6_dst);
+ }
if (flow->tunnel.gbp_id != htons(0)) {
match_set_tun_gbp_id(flow_metadata, flow->tunnel.gbp_id);
}
if (flow->tunnel.gbp_flags) {
match_set_tun_gbp_flags(flow_metadata, flow->tunnel.gbp_flags);
}
- tun_metadata_get_fmd(&flow->tunnel.metadata, flow_metadata);
+ tun_metadata_get_fmd(&flow->tunnel, flow_metadata);
if (flow->metadata != htonll(0)) {
match_set_metadata(flow_metadata, flow->metadata);
}
}
match_set_in_port(flow_metadata, flow->in_port.ofp_port);
+ if (flow->ct_state != 0) {
+ match_set_ct_state(flow_metadata, flow->ct_state);
+ }
+ if (flow->ct_zone != 0) {
+ match_set_ct_zone(flow_metadata, flow->ct_zone);
+ }
+ if (flow->ct_mark != 0) {
+ match_set_ct_mark(flow_metadata, flow->ct_mark);
+ }
+ if (!ovs_u128_is_zero(&flow->ct_label)) {
+ match_set_ct_label(flow_metadata, flow->ct_label);
+ }
+}
+
+const char *ct_state_to_string(uint32_t state)
+{
+ switch (state) {
+ case CS_REPLY_DIR:
+ return "rpl";
+ case CS_TRACKED:
+ return "trk";
+ case CS_NEW:
+ return "new";
+ case CS_ESTABLISHED:
+ return "est";
+ case CS_RELATED:
+ return "rel";
+ case CS_INVALID:
+ return "inv";
+ case CS_SRC_NAT:
+ return "snat";
+ case CS_DST_NAT:
+ return "dnat";
+ default:
+ return NULL;
+ }
}
char *
uint32_t bad = 0;
if (!flags) {
+ ds_put_char(ds, '0');
return;
}
while (flags) {
void
format_flags_masked(struct ds *ds, const char *name,
const char *(*bit_to_string)(uint32_t), uint32_t flags,
- uint32_t mask)
+ uint32_t mask, uint32_t max_mask)
{
if (name) {
ds_put_format(ds, "%s=", name);
}
+
+ if (mask == max_mask) {
+ format_flags(ds, bit_to_string, flags, '|');
+ return;
+ }
+
+ if (!mask) {
+ ds_put_cstr(ds, "0/0");
+ return;
+ }
+
while (mask) {
uint32_t bit = rightmost_1bit(mask);
const char *s = bit_to_string(bit);
}
}
+/* Scans a string 's' of flags to determine their numerical value and
+ * returns the number of characters parsed using 'bit_to_string' to
+ * lookup flag names. Scanning continues until the character 'end' is
+ * reached.
+ *
+ * In the event of a failure, a negative error code will be returned. In
+ * addition, if 'res_string' is non-NULL then a descriptive string will
+ * be returned incorporating the identifying string 'field_name'. This
+ * error string must be freed by the caller.
+ *
+ * Upon success, the flag values will be stored in 'res_flags' and
+ * optionally 'res_mask', if it is non-NULL (if it is NULL then any masks
+ * present in the original string will be considered an error). The
+ * caller may restrict the acceptable set of values through the mask
+ * 'allowed'. */
+int
+parse_flags(const char *s, const char *(*bit_to_string)(uint32_t),
+ char end, const char *field_name, char **res_string,
+ uint32_t *res_flags, uint32_t allowed, uint32_t *res_mask)
+{
+ uint32_t result = 0;
+ int n;
+
+ /* Parse masked flags in numeric format? */
+ if (res_mask && ovs_scan(s, "%"SCNi32"/%"SCNi32"%n",
+ res_flags, res_mask, &n) && n > 0) {
+ if (*res_flags & ~allowed || *res_mask & ~allowed) {
+ goto unknown;
+ }
+ return n;
+ }
+
+ n = 0;
+
+ if (res_mask && (*s == '+' || *s == '-')) {
+ uint32_t flags = 0, mask = 0;
+
+ /* Parse masked flags. */
+ while (s[0] != end) {
+ bool set;
+ uint32_t bit;
+ size_t len;
+
+ if (s[0] == '+') {
+ set = true;
+ } else if (s[0] == '-') {
+ set = false;
+ } else {
+ if (res_string) {
+ *res_string = xasprintf("%s: %s must be preceded by '+' "
+ "(for SET) or '-' (NOT SET)", s,
+ field_name);
+ }
+ return -EINVAL;
+ }
+ s++;
+ n++;
+
+ for (bit = 1; bit; bit <<= 1) {
+ const char *fname = bit_to_string(bit);
+
+ if (!fname) {
+ continue;
+ }
+
+ len = strlen(fname);
+ if (strncmp(s, fname, len) ||
+ (s[len] != '+' && s[len] != '-' && s[len] != end)) {
+ continue;
+ }
+
+ if (mask & bit) {
+ /* bit already set. */
+ if (res_string) {
+ *res_string = xasprintf("%s: Each %s flag can be "
+ "specified only once", s,
+ field_name);
+ }
+ return -EINVAL;
+ }
+ if (!(bit & allowed)) {
+ goto unknown;
+ }
+ if (set) {
+ flags |= bit;
+ }
+ mask |= bit;
+ break;
+ }
+
+ if (!bit) {
+ goto unknown;
+ }
+ s += len;
+ n += len;
+ }
+
+ *res_flags = flags;
+ *res_mask = mask;
+ return n;
+ }
+
+ /* Parse unmasked flags. If a flag is present, it is set, otherwise
+ * it is not set. */
+ while (s[n] != end) {
+ unsigned long long int flags;
+ uint32_t bit;
+ int n0;
+
+ if (ovs_scan(&s[n], "%lli%n", &flags, &n0)) {
+ if (flags & ~allowed) {
+ goto unknown;
+ }
+ n += n0 + (s[n + n0] == '|');
+ result |= flags;
+ continue;
+ }
+
+ for (bit = 1; bit; bit <<= 1) {
+ const char *name = bit_to_string(bit);
+ size_t len;
+
+ if (!name) {
+ continue;
+ }
+
+ len = strlen(name);
+ if (!strncmp(s + n, name, len) &&
+ (s[n + len] == '|' || s[n + len] == end)) {
+ if (!(bit & allowed)) {
+ goto unknown;
+ }
+ result |= bit;
+ n += len + (s[n + len] == '|');
+ break;
+ }
+ }
+
+ if (!bit) {
+ goto unknown;
+ }
+ }
+
+ *res_flags = result;
+ if (res_mask) {
+ *res_mask = UINT32_MAX;
+ }
+ if (res_string) {
+ *res_string = NULL;
+ }
+ return n;
+
+unknown:
+ if (res_string) {
+ *res_string = xasprintf("%s: unknown %s flag(s)", s, field_name);
+ }
+ return -EINVAL;
+}
+
void
flow_format(struct ds *ds, const struct flow *flow)
{
if (!flow->dp_hash) {
WC_UNMASK_FIELD(wc, dp_hash);
}
+ if (!flow->ct_state) {
+ WC_UNMASK_FIELD(wc, ct_state);
+ }
+ if (!flow->ct_zone) {
+ WC_UNMASK_FIELD(wc, ct_zone);
+ }
+ if (!flow->ct_mark) {
+ WC_UNMASK_FIELD(wc, ct_mark);
+ }
+ if (ovs_u128_is_zero(&flow->ct_label)) {
+ WC_UNMASK_FIELD(wc, ct_label);
+ }
for (int i = 0; i < FLOW_N_REGS; i++) {
if (!flow->regs[i]) {
WC_UNMASK_FIELD(wc, regs[i]);
memset(&wc->masks, 0x0, sizeof wc->masks);
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 32);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
- if (flow->tunnel.ip_dst) {
+ if (flow_tnl_dst_is_set(&flow->tunnel)) {
if (flow->tunnel.flags & FLOW_TNL_F_KEY) {
WC_MASK_FIELD(wc, tunnel.tun_id);
}
WC_MASK_FIELD(wc, tunnel.ip_src);
WC_MASK_FIELD(wc, tunnel.ip_dst);
+ WC_MASK_FIELD(wc, tunnel.ipv6_src);
+ WC_MASK_FIELD(wc, tunnel.ipv6_dst);
WC_MASK_FIELD(wc, tunnel.flags);
WC_MASK_FIELD(wc, tunnel.ip_tos);
WC_MASK_FIELD(wc, tunnel.ip_ttl);
WC_MASK_FIELD(wc, tunnel.gbp_id);
WC_MASK_FIELD(wc, tunnel.gbp_flags);
- if (flow->tunnel.metadata.opt_map) {
- wc->masks.tunnel.metadata.opt_map = flow->tunnel.metadata.opt_map;
- WC_MASK_FIELD(wc, tunnel.metadata.opts);
+ if (!(flow->tunnel.flags & FLOW_TNL_F_UDPIF)) {
+ if (flow->tunnel.metadata.present.map) {
+ wc->masks.tunnel.metadata.present.map =
+ flow->tunnel.metadata.present.map;
+ WC_MASK_FIELD(wc, tunnel.metadata.opts.u8);
+ }
+ } else {
+ WC_MASK_FIELD(wc, tunnel.metadata.present.len);
+ memset(wc->masks.tunnel.metadata.opts.gnv, 0xff,
+ flow->tunnel.metadata.present.len);
}
} else if (flow->tunnel.tun_id) {
WC_MASK_FIELD(wc, tunnel.tun_id);
WC_MASK_FIELD(wc, skb_priority);
WC_MASK_FIELD(wc, pkt_mark);
+ WC_MASK_FIELD(wc, ct_state);
+ WC_MASK_FIELD(wc, ct_zone);
+ WC_MASK_FIELD(wc, ct_mark);
+ WC_MASK_FIELD(wc, ct_label);
WC_MASK_FIELD(wc, recirc_id);
WC_MASK_FIELD(wc, dp_hash);
WC_MASK_FIELD(wc, in_port);
* optimal.
*
* This is a less precise version of flow_wildcards_init_for_packet() above. */
-uint64_t
-flow_wc_map(const struct flow *flow)
+void
+flow_wc_map(const struct flow *flow, struct flowmap *map)
{
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 32);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
+
+ flowmap_init(map);
- uint64_t map = (flow->tunnel.ip_dst) ? MINIFLOW_MAP(tunnel) : 0;
+ if (flow_tnl_dst_is_set(&flow->tunnel)) {
+ FLOWMAP_SET__(map, tunnel, offsetof(struct flow_tnl, metadata));
+ if (!(flow->tunnel.flags & FLOW_TNL_F_UDPIF)) {
+ if (flow->tunnel.metadata.present.map) {
+ FLOWMAP_SET(map, tunnel.metadata);
+ }
+ } else {
+ FLOWMAP_SET(map, tunnel.metadata.present.len);
+ FLOWMAP_SET__(map, tunnel.metadata.opts.gnv,
+ flow->tunnel.metadata.present.len);
+ }
+ }
/* Metadata fields that can appear on packet input. */
- map |= MINIFLOW_MAP(skb_priority) | MINIFLOW_MAP(pkt_mark)
- | MINIFLOW_MAP(recirc_id) | MINIFLOW_MAP(dp_hash)
- | MINIFLOW_MAP(in_port)
- | MINIFLOW_MAP(dl_dst) | MINIFLOW_MAP(dl_src)
- | MINIFLOW_MAP(dl_type) | MINIFLOW_MAP(vlan_tci);
+ FLOWMAP_SET(map, skb_priority);
+ FLOWMAP_SET(map, pkt_mark);
+ FLOWMAP_SET(map, recirc_id);
+ FLOWMAP_SET(map, dp_hash);
+ FLOWMAP_SET(map, in_port);
+ FLOWMAP_SET(map, dl_dst);
+ FLOWMAP_SET(map, dl_src);
+ FLOWMAP_SET(map, dl_type);
+ FLOWMAP_SET(map, vlan_tci);
+ FLOWMAP_SET(map, ct_state);
+ FLOWMAP_SET(map, ct_zone);
+ FLOWMAP_SET(map, ct_mark);
+ FLOWMAP_SET(map, ct_label);
/* Ethertype-dependent fields. */
if (OVS_LIKELY(flow->dl_type == htons(ETH_TYPE_IP))) {
- map |= MINIFLOW_MAP(nw_src) | MINIFLOW_MAP(nw_dst)
- | MINIFLOW_MAP(nw_proto) | MINIFLOW_MAP(nw_frag)
- | MINIFLOW_MAP(nw_tos) | MINIFLOW_MAP(nw_ttl);
+ FLOWMAP_SET(map, nw_src);
+ FLOWMAP_SET(map, nw_dst);
+ FLOWMAP_SET(map, nw_proto);
+ FLOWMAP_SET(map, nw_frag);
+ FLOWMAP_SET(map, nw_tos);
+ FLOWMAP_SET(map, nw_ttl);
+
if (OVS_UNLIKELY(flow->nw_proto == IPPROTO_IGMP)) {
- map |= MINIFLOW_MAP(igmp_group_ip4);
+ FLOWMAP_SET(map, igmp_group_ip4);
} else {
- map |= MINIFLOW_MAP(tcp_flags)
- | MINIFLOW_MAP(tp_src) | MINIFLOW_MAP(tp_dst);
+ FLOWMAP_SET(map, tcp_flags);
+ FLOWMAP_SET(map, tp_src);
+ FLOWMAP_SET(map, tp_dst);
}
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
- map |= MINIFLOW_MAP(ipv6_src) | MINIFLOW_MAP(ipv6_dst)
- | MINIFLOW_MAP(ipv6_label)
- | MINIFLOW_MAP(nw_proto) | MINIFLOW_MAP(nw_frag)
- | MINIFLOW_MAP(nw_tos) | MINIFLOW_MAP(nw_ttl);
+ FLOWMAP_SET(map, ipv6_src);
+ FLOWMAP_SET(map, ipv6_dst);
+ FLOWMAP_SET(map, ipv6_label);
+ FLOWMAP_SET(map, nw_proto);
+ FLOWMAP_SET(map, nw_frag);
+ FLOWMAP_SET(map, nw_tos);
+ FLOWMAP_SET(map, nw_ttl);
+
if (OVS_UNLIKELY(flow->nw_proto == IPPROTO_ICMPV6)) {
- map |= MINIFLOW_MAP(nd_target)
- | MINIFLOW_MAP(arp_sha) | MINIFLOW_MAP(arp_tha);
+ FLOWMAP_SET(map, nd_target);
+ FLOWMAP_SET(map, arp_sha);
+ FLOWMAP_SET(map, arp_tha);
} else {
- map |= MINIFLOW_MAP(tcp_flags)
- | MINIFLOW_MAP(tp_src) | MINIFLOW_MAP(tp_dst);
+ FLOWMAP_SET(map, tcp_flags);
+ FLOWMAP_SET(map, tp_src);
+ FLOWMAP_SET(map, tp_dst);
}
} else if (eth_type_mpls(flow->dl_type)) {
- map |= MINIFLOW_MAP(mpls_lse);
+ FLOWMAP_SET(map, mpls_lse);
} else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
flow->dl_type == htons(ETH_TYPE_RARP)) {
- map |= MINIFLOW_MAP(nw_src) | MINIFLOW_MAP(nw_dst)
- | MINIFLOW_MAP(nw_proto)
- | MINIFLOW_MAP(arp_sha) | MINIFLOW_MAP(arp_tha);
+ FLOWMAP_SET(map, nw_src);
+ FLOWMAP_SET(map, nw_dst);
+ FLOWMAP_SET(map, nw_proto);
+ FLOWMAP_SET(map, arp_sha);
+ FLOWMAP_SET(map, arp_tha);
}
-
- return map;
}
/* Clear the metadata and register wildcard masks. They are not packet
flow_wildcards_clear_non_packet_fields(struct flow_wildcards *wc)
{
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 32);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
memset(&wc->masks.metadata, 0, sizeof wc->masks.metadata);
memset(&wc->masks.regs, 0, sizeof wc->masks.regs);
/* Separate loops for better optimization. */
if (dl_type == htons(ETH_TYPE_IPV6)) {
- uint64_t map = MINIFLOW_MAP(ipv6_src) | MINIFLOW_MAP(ipv6_dst);
+ struct flowmap map = FLOWMAP_EMPTY_INITIALIZER;
uint64_t value;
- MINIFLOW_FOR_EACH_IN_MAP(value, flow, map) {
+ FLOWMAP_SET(&map, ipv6_src);
+ FLOWMAP_SET(&map, ipv6_dst);
+
+ MINIFLOW_FOR_EACH_IN_FLOWMAP(value, flow, map) {
hash = hash_add64(hash, value);
}
} else {
ovs_be16 eth_type;
ovs_be16 vlan_tci;
ovs_be16 tp_port;
- uint8_t eth_addr[ETH_ADDR_LEN];
+ struct eth_addr eth_addr;
uint8_t ip_proto;
} fields;
int i;
memset(&fields, 0, sizeof fields);
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- fields.eth_addr[i] = flow->dl_src[i] ^ flow->dl_dst[i];
+ for (i = 0; i < ARRAY_SIZE(fields.eth_addr.be16); i++) {
+ fields.eth_addr.be16[i] = flow->dl_src.be16[i] ^ flow->dl_dst.be16[i];
}
fields.vlan_tci = flow->vlan_tci & htons(VLAN_VID_MASK);
fields.eth_type = flow->dl_type;
/* Initialize to all zeros. */
memset(flow, 0, sizeof *flow);
- eth_addr_random(flow->dl_src);
- eth_addr_random(flow->dl_dst);
+ eth_addr_random(&flow->dl_src);
+ eth_addr_random(&flow->dl_dst);
flow->vlan_tci = (OVS_FORCE ovs_be16) (random_uint16() & VLAN_VID_MASK);
switch (fields) {
case NX_HASH_FIELDS_ETH_SRC:
- return jhash_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);
flow->mpls_lse[0] = set_mpls_lse_values(ttl, tc, 1, htonl(label));
/* Clear all L3 and L4 fields and dp_hash. */
- BUILD_ASSERT(FLOW_WC_SEQ == 32);
+ BUILD_ASSERT(FLOW_WC_SEQ == 35);
memset((char *) flow + FLOW_SEGMENT_2_ENDS_AT, 0,
sizeof(struct flow) - FLOW_SEGMENT_2_ENDS_AT);
flow->dp_hash = 0;
(icmp->icmp6_type == ND_NEIGHBOR_SOLICIT ||
icmp->icmp6_type == ND_NEIGHBOR_ADVERT)) {
struct in6_addr *nd_target;
- struct nd_opt_hdr *nd_opt;
+ struct ovs_nd_opt *nd_opt;
l4_len += sizeof *nd_target;
nd_target = dp_packet_put_zeros(p, sizeof *nd_target);
nd_opt = dp_packet_put_zeros(p, 8);
nd_opt->nd_opt_len = 1;
nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR;
- memcpy(nd_opt + 1, flow->arp_sha, ETH_ADDR_LEN);
+ nd_opt->nd_opt_mac = flow->arp_sha;
}
if (!eth_addr_is_zero(flow->arp_tha)) {
l4_len += 8;
nd_opt = dp_packet_put_zeros(p, 8);
nd_opt->nd_opt_len = 1;
nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
- memcpy(nd_opt + 1, flow->arp_tha, ETH_ADDR_LEN);
+ nd_opt->nd_opt_mac = flow->arp_tha;
}
}
icmp->icmp6_cksum = (OVS_FORCE uint16_t)
flow->nw_proto == ARP_OP_REPLY) {
put_16aligned_be32(&arp->ar_spa, flow->nw_src);
put_16aligned_be32(&arp->ar_tpa, flow->nw_dst);
- memcpy(arp->ar_sha, flow->arp_sha, ETH_ADDR_LEN);
- memcpy(arp->ar_tha, flow->arp_tha, ETH_ADDR_LEN);
+ arp->ar_sha = flow->arp_sha;
+ arp->ar_tha = flow->arp_tha;
}
}
\f
/* Compressed flow. */
-static int
-miniflow_n_values(const struct miniflow *flow)
-{
- return count_1bits(flow->map);
-}
-
-static uint64_t *
-miniflow_alloc_values(struct miniflow *flow, int n)
-{
- int size = MINIFLOW_VALUES_SIZE(n);
-
- if (size <= sizeof flow->inline_values) {
- flow->values_inline = true;
- return flow->inline_values;
- } else {
- COVERAGE_INC(miniflow_malloc);
- flow->values_inline = false;
- flow->offline_values = xmalloc(size);
- return flow->offline_values;
- }
-}
-
/* Completes an initialization of 'dst' as a miniflow copy of 'src' begun by
- * the caller. The caller must have already initialized 'dst->map' properly
- * to indicate the significant uint64_t elements of 'src'. 'n' must be the
- * number of 1-bits in 'dst->map'.
+ * the caller. The caller must have already computed 'dst->map' properly to
+ * indicate the significant uint64_t elements of 'src'.
*
* Normally the significant elements are the ones that are non-zero. However,
* when a miniflow is initialized from a (mini)mask, the values can be zeroes,
- * so that the flow and mask always have the same maps.
- *
- * This function initializes values (either inline if possible or with
- * malloc() otherwise) and copies the uint64_t elements of 'src' indicated by
- * 'dst->map' into it. */
-static void
-miniflow_init__(struct miniflow *dst, const struct flow *src, int n)
+ * so that the flow and mask always have the same maps. */
+void
+miniflow_init(struct miniflow *dst, const struct flow *src)
{
- const uint64_t *src_u64 = (const uint64_t *) src;
- uint64_t *dst_u64 = miniflow_alloc_values(dst, n);
- int idx;
+ uint64_t *dst_u64 = miniflow_values(dst);
+ size_t idx;
- MAP_FOR_EACH_INDEX(idx, dst->map) {
- *dst_u64++ = src_u64[idx];
+ FLOWMAP_FOR_EACH_INDEX(idx, dst->map) {
+ *dst_u64++ = flow_u64_value(src, idx);
}
}
-/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
- * with miniflow_destroy().
- * Always allocates offline storage. */
+/* Initialize the maps of 'flow' from 'src'. */
void
-miniflow_init(struct miniflow *dst, const struct flow *src)
+miniflow_map_init(struct miniflow *flow, const struct flow *src)
{
- const uint64_t *src_u64 = (const uint64_t *) src;
- unsigned int i;
- int n;
-
- /* Initialize dst->map, counting the number of nonzero elements. */
- n = 0;
- dst->map = 0;
-
- for (i = 0; i < FLOW_U64S; i++) {
- if (src_u64[i]) {
- dst->map |= UINT64_C(1) << i;
- n++;
+ /* Initialize map, counting the number of nonzero elements. */
+ flowmap_init(&flow->map);
+ for (size_t i = 0; i < FLOW_U64S; i++) {
+ if (flow_u64_value(src, i)) {
+ flowmap_set(&flow->map, i, 1);
}
}
-
- miniflow_init__(dst, src, n);
}
-/* Initializes 'dst' as a copy of 'src', using 'mask->map' as 'dst''s map. The
- * caller must eventually free 'dst' with miniflow_destroy(). */
-void
-miniflow_init_with_minimask(struct miniflow *dst, const struct flow *src,
- const struct minimask *mask)
+/* Allocates 'n' count of miniflows, consecutive in memory, initializing the
+ * map of each from 'src'.
+ * Returns the size of the miniflow data. */
+size_t
+miniflow_alloc(struct miniflow *dsts[], size_t n, const struct miniflow *src)
{
- dst->map = mask->masks.map;
- miniflow_init__(dst, src, miniflow_n_values(dst));
-}
+ size_t n_values = miniflow_n_values(src);
+ size_t data_size = MINIFLOW_VALUES_SIZE(n_values);
+ struct miniflow *dst = xmalloc(n * (sizeof *src + data_size));
+ size_t i;
-/* 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 size = MINIFLOW_VALUES_SIZE(miniflow_n_values(src));
- uint64_t *values;
+ COVERAGE_INC(miniflow_malloc);
- dst->map = src->map;
- if (size <= sizeof dst->inline_values) {
- dst->values_inline = true;
- values = dst->inline_values;
- } else {
- dst->values_inline = false;
- COVERAGE_INC(miniflow_malloc);
- dst->offline_values = xmalloc(size);
- values = dst->offline_values;
+ for (i = 0; i < n; i++) {
+ *dst = *src; /* Copy maps. */
+ dsts[i] = dst;
+ dst += 1; /* Just past the maps. */
+ dst = (struct miniflow *)((uint64_t *)dst + n_values); /* Skip data. */
}
- memcpy(values, miniflow_get_values(src), size);
+ return data_size;
}
-/* Initializes 'dst' as a copy of 'src'. The caller must have allocated
- * 'dst' to have inline space all data in 'src'. */
-void
-miniflow_clone_inline(struct miniflow *dst, const struct miniflow *src,
- size_t n_values)
+/* Returns a miniflow copy of 'src'. The caller must eventually free() the
+ * returned miniflow. */
+struct miniflow *
+miniflow_create(const struct flow *src)
{
- dst->values_inline = true;
- dst->map = src->map;
- memcpy(dst->inline_values, miniflow_get_values(src),
- MINIFLOW_VALUES_SIZE(n_values));
-}
+ struct miniflow tmp;
+ struct miniflow *dst;
-/* Initializes 'dst' with the data in 'src', destroying 'src'.
- * The caller must eventually free 'dst' with miniflow_destroy().
- * 'dst' must be regularly sized miniflow, but 'src' can have
- * storage for more than the default MINI_N_INLINE inline
- * values. */
-void
-miniflow_move(struct miniflow *dst, struct miniflow *src)
-{
- int size = MINIFLOW_VALUES_SIZE(miniflow_n_values(src));
-
- dst->map = src->map;
- if (size <= sizeof dst->inline_values) {
- dst->values_inline = true;
- memcpy(dst->inline_values, miniflow_get_values(src), size);
- miniflow_destroy(src);
- } else if (src->values_inline) {
- dst->values_inline = false;
- COVERAGE_INC(miniflow_malloc);
- dst->offline_values = xmalloc(size);
- memcpy(dst->offline_values, src->inline_values, size);
- } else {
- dst->values_inline = false;
- dst->offline_values = src->offline_values;
- }
+ miniflow_map_init(&tmp, src);
+
+ miniflow_alloc(&dst, 1, &tmp);
+ miniflow_init(dst, src);
+ return dst;
}
-/* Frees any memory owned by 'flow'. Does not free the storage in which 'flow'
- * itself resides; the caller is responsible for that. */
+/* Initializes 'dst' as a copy of 'src'. The caller must have allocated
+ * 'dst' to have inline space for 'n_values' data in 'src'. */
void
-miniflow_destroy(struct miniflow *flow)
+miniflow_clone(struct miniflow *dst, const struct miniflow *src,
+ size_t n_values)
{
- if (!flow->values_inline) {
- free(flow->offline_values);
- }
+ *dst = *src; /* Copy maps. */
+ memcpy(miniflow_values(dst), miniflow_get_values(src),
+ MINIFLOW_VALUES_SIZE(n_values));
}
/* Initializes 'dst' as a copy of 'src'. */
flow_union_with_miniflow(dst, src);
}
-/* Returns true if 'a' and 'b' are the equal miniflow, false otherwise. */
+/* Returns true if 'a' and 'b' are equal miniflows, false otherwise. */
bool
miniflow_equal(const struct miniflow *a, const struct miniflow *b)
{
const uint64_t *ap = miniflow_get_values(a);
const uint64_t *bp = miniflow_get_values(b);
- if (OVS_LIKELY(a->map == b->map)) {
- int count = miniflow_n_values(a);
-
- return !memcmp(ap, bp, count * sizeof *ap);
+ /* This is mostly called after a matching hash, so it is highly likely that
+ * the maps are equal as well. */
+ if (OVS_LIKELY(flowmap_equal(a->map, b->map))) {
+ return !memcmp(ap, bp, miniflow_n_values(a) * sizeof *ap);
} else {
- uint64_t map;
-
- for (map = a->map | b->map; map; map = zero_rightmost_1bit(map)) {
- uint64_t bit = rightmost_1bit(map);
+ size_t idx;
- if ((a->map & bit ? *ap++ : 0) != (b->map & bit ? *bp++ : 0)) {
+ FLOWMAP_FOR_EACH_INDEX (idx, flowmap_or(a->map, b->map)) {
+ if ((flowmap_is_set(&a->map, idx) ? *ap++ : 0)
+ != (flowmap_is_set(&b->map, idx) ? *bp++ : 0)) {
return false;
}
}
const struct minimask *mask)
{
const uint64_t *p = miniflow_get_values(&mask->masks);
- int idx;
+ size_t idx;
- MAP_FOR_EACH_INDEX(idx, mask->masks.map) {
+ FLOWMAP_FOR_EACH_INDEX(idx, mask->masks.map) {
if ((miniflow_get(a, idx) ^ miniflow_get(b, idx)) & *p++) {
return false;
}
miniflow_equal_flow_in_minimask(const struct miniflow *a, const struct flow *b,
const struct minimask *mask)
{
- const uint64_t *b_u64 = (const uint64_t *) b;
const uint64_t *p = miniflow_get_values(&mask->masks);
- int idx;
+ size_t idx;
- MAP_FOR_EACH_INDEX(idx, mask->masks.map) {
- if ((miniflow_get(a, idx) ^ b_u64[idx]) & *p++) {
+ FLOWMAP_FOR_EACH_INDEX(idx, mask->masks.map) {
+ if ((miniflow_get(a, idx) ^ flow_u64_value(b, idx)) & *p++) {
return false;
}
}
}
\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' with the data in 'src', destroying 'src'.
- * The caller must eventually free 'dst' with minimask_destroy(). */
-void
-minimask_move(struct minimask *dst, struct minimask *src)
+/* Returns a minimask copy of 'wc'. The caller must eventually free the
+ * returned minimask with free(). */
+struct minimask *
+minimask_create(const struct flow_wildcards *wc)
{
- miniflow_move(&dst->masks, &src->masks);
+ return (struct minimask *)miniflow_create(&wc->masks);
}
/* Initializes 'dst_' as the bit-wise "and" of 'a_' and 'b_'.
*
- * The caller must provide room for FLOW_U64S "uint64_t"s in 'storage', for use
- * by 'dst_'. The caller must *not* free 'dst_' with minimask_destroy(). */
+ * The caller must provide room for FLOW_U64S "uint64_t"s in 'storage', which
+ * must follow '*dst_' in memory, for use by 'dst_'. The caller must *not*
+ * free 'dst_' free(). */
void
minimask_combine(struct minimask *dst_,
const struct minimask *a_, const struct minimask *b_,
uint64_t *dst_values = storage;
const struct miniflow *a = &a_->masks;
const struct miniflow *b = &b_->masks;
- int idx;
+ size_t idx;
- dst->values_inline = false;
- dst->offline_values = storage;
+ flowmap_init(&dst->map);
- dst->map = 0;
- MAP_FOR_EACH_INDEX(idx, a->map & b->map) {
+ FLOWMAP_FOR_EACH_INDEX(idx, flowmap_and(a->map, b->map)) {
/* Both 'a' and 'b' have non-zero data at 'idx'. */
- uint64_t mask = miniflow_get__(a, idx) & miniflow_get__(b, idx);
+ uint64_t mask = *miniflow_get__(a, idx) & *miniflow_get__(b, idx);
if (mask) {
- dst->map |= UINT64_C(1) << idx;
+ flowmap_set(&dst->map, idx, 1);
*dst_values++ = 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'. */
+/* Initializes 'wc' as a copy of 'mask'. */
void
minimask_expand(const struct minimask *mask, struct flow_wildcards *wc)
{
bool
minimask_equal(const struct minimask *a, const struct minimask *b)
{
- return a->masks.map == b->masks.map &&
- !memcmp(miniflow_get_values(&a->masks),
- miniflow_get_values(&b->masks),
- count_1bits(a->masks.map) * sizeof *a->masks.inline_values);
+ return !memcmp(a, b, sizeof *a
+ + MINIFLOW_VALUES_SIZE(miniflow_n_values(&a->masks)));
}
/* Returns true if at least one bit matched by 'b' is wildcarded by 'a',
bool
minimask_has_extra(const struct minimask *a, const struct minimask *b)
{
- const uint64_t *ap = miniflow_get_values(&a->masks);
const uint64_t *bp = miniflow_get_values(&b->masks);
- int idx;
+ size_t idx;
- MAP_FOR_EACH_INDEX(idx, b->masks.map) {
+ FLOWMAP_FOR_EACH_INDEX(idx, b->masks.map) {
uint64_t b_u64 = *bp++;
/* 'b_u64' is non-zero, check if the data in 'a' is either zero
* or misses some of the bits in 'b_u64'. */
- if (!(a->masks.map & (UINT64_C(1) << idx))
- || ((miniflow_values_get__(ap, a->masks.map, idx) & b_u64)
- != b_u64)) {
+ if (!MINIFLOW_IN_MAP(&a->masks, idx)
+ || ((*miniflow_get__(&a->masks, idx) & b_u64) != b_u64)) {
return true; /* 'a' wildcards some bits 'b' doesn't. */
}
}