void
match_wc_init(struct match *match, const struct flow *flow)
{
- struct flow_wildcards *wc;
- int i;
-
match->flow = *flow;
- wc = &match->wc;
- memset(&wc->masks, 0x0, sizeof wc->masks);
-
- memset(&wc->masks.dl_type, 0xff, sizeof wc->masks.dl_type);
-
- if (flow->nw_proto) {
- memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
- }
-
- if (flow->skb_priority) {
- memset(&wc->masks.skb_priority, 0xff, sizeof wc->masks.skb_priority);
- }
-
- if (flow->pkt_mark) {
- memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark);
- }
-
- for (i = 0; i < FLOW_N_REGS; i++) {
- if (flow->regs[i]) {
- memset(&wc->masks.regs[i], 0xff, sizeof wc->masks.regs[i]);
- }
- }
-
- if (flow->tunnel.ip_dst) {
- if (flow->tunnel.flags & FLOW_TNL_F_KEY) {
- memset(&wc->masks.tunnel.tun_id, 0xff, sizeof wc->masks.tunnel.tun_id);
- }
- memset(&wc->masks.tunnel.ip_src, 0xff, sizeof wc->masks.tunnel.ip_src);
- memset(&wc->masks.tunnel.ip_dst, 0xff, sizeof wc->masks.tunnel.ip_dst);
- memset(&wc->masks.tunnel.flags, 0xff, sizeof wc->masks.tunnel.flags);
- memset(&wc->masks.tunnel.ip_tos, 0xff, sizeof wc->masks.tunnel.ip_tos);
- memset(&wc->masks.tunnel.ip_ttl, 0xff, sizeof wc->masks.tunnel.ip_ttl);
- } else if (flow->tunnel.tun_id) {
- memset(&wc->masks.tunnel.tun_id, 0xff, sizeof wc->masks.tunnel.tun_id);
- }
-
- memset(&wc->masks.metadata, 0xff, sizeof wc->masks.metadata);
- memset(&wc->masks.in_port, 0xff, sizeof wc->masks.in_port);
- memset(&wc->masks.vlan_tci, 0xff, sizeof wc->masks.vlan_tci);
- memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src);
- memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);
-
- if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
- memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
- memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
- memset(&wc->masks.ipv6_label, 0xff, sizeof wc->masks.ipv6_label);
- } else if (flow->dl_type == htons(ETH_TYPE_IP) ||
- (flow->dl_type == htons(ETH_TYPE_ARP)) ||
- (flow->dl_type == htons(ETH_TYPE_RARP))) {
- memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
- memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst);
- } else if (eth_type_mpls(flow->dl_type)) {
- int i;
-
- for (i = 0; i < FLOW_MAX_MPLS_LABELS; i++) {
- wc->masks.mpls_lse[i] = OVS_BE32_MAX;
- if (flow->mpls_lse[i] & htonl(MPLS_BOS_MASK)) {
- break;
- }
- }
- }
-
- if (flow->dl_type == htons(ETH_TYPE_ARP) ||
- flow->dl_type == htons(ETH_TYPE_RARP)) {
- memset(&wc->masks.arp_sha, 0xff, sizeof wc->masks.arp_sha);
- memset(&wc->masks.arp_tha, 0xff, sizeof wc->masks.arp_tha);
- }
-
- if (is_ip_any(flow)) {
- memset(&wc->masks.nw_tos, 0xff, sizeof wc->masks.nw_tos);
- memset(&wc->masks.nw_ttl, 0xff, sizeof wc->masks.nw_ttl);
-
- if (flow->nw_frag) {
- memset(&wc->masks.nw_frag, 0xff, sizeof wc->masks.nw_frag);
- if (flow->nw_frag & FLOW_NW_FRAG_LATER) {
- /* No transport layer header in later fragments. */
- return;
- }
- }
-
- if (flow->nw_proto == IPPROTO_ICMP ||
- flow->nw_proto == IPPROTO_ICMPV6 ||
- (flow->tp_src || flow->tp_dst)) {
- memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
- memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
- }
- if (flow->nw_proto == IPPROTO_TCP) {
- memset(&wc->masks.tcp_flags, 0xff, sizeof wc->masks.tcp_flags);
- }
-
- if (flow->nw_proto == IPPROTO_ICMPV6) {
- memset(&wc->masks.arp_sha, 0xff, sizeof wc->masks.arp_sha);
- memset(&wc->masks.arp_tha, 0xff, sizeof wc->masks.arp_tha);
- }
- }
- return;
+ flow_wildcards_init_for_packet(&match->wc, flow);
+ WC_MASK_FIELD(&match->wc, regs);
+ WC_MASK_FIELD(&match->wc, metadata);
}
/* Initializes 'match' as a "catch-all" match that matches every packet. */
match->flow.regs[reg_idx] = value & mask;
}
+void
+match_set_xreg(struct match *match, unsigned int xreg_idx, uint64_t value)
+{
+ match_set_xreg_masked(match, xreg_idx, value, UINT64_MAX);
+}
+
+void
+match_set_xreg_masked(struct match *match, unsigned int xreg_idx,
+ uint64_t value, uint64_t mask)
+{
+ ovs_assert(xreg_idx < FLOW_N_XREGS);
+ flow_wildcards_set_xreg_mask(&match->wc, xreg_idx, mask);
+ flow_set_xreg(&match->flow, xreg_idx, value & mask);
+}
+
void
match_set_metadata(struct match *match, ovs_be64 metadata)
{
}
static void
-format_eth_masked(struct ds *s, const char *name, const uint8_t eth[6],
- const uint8_t mask[6])
+format_eth_masked(struct ds *s, const char *name,
+ const uint8_t eth[ETH_ADDR_LEN],
+ const uint8_t mask[ETH_ADDR_LEN])
{
if (!eth_addr_is_zero(mask)) {
ds_put_format(s, "%s=", name);
/* Appends a string representation of 'match' to 's'. If 'priority' is
* different from OFP_DEFAULT_PRIORITY, includes it in 's'. */
void
-match_format(const struct match *match, struct ds *s, unsigned int priority)
+match_format(const struct match *match, struct ds *s, int priority)
{
const struct flow_wildcards *wc = &match->wc;
size_t start_len = s->length;
int i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 26);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 27);
if (priority != OFP_DEFAULT_PRIORITY) {
- ds_put_format(s, "priority=%u,", priority);
+ ds_put_format(s, "priority=%d,", priority);
}
format_uint32_masked(s, "pkt_mark", f->pkt_mark, wc->masks.pkt_mark);
skip_proto = true;
if (f->nw_proto == IPPROTO_ICMP) {
ds_put_cstr(s, "icmp,");
+ } else if (f->nw_proto == IPPROTO_IGMP) {
+ ds_put_cstr(s, "igmp,");
} else if (f->nw_proto == IPPROTO_TCP) {
ds_put_cstr(s, "tcp,");
} else if (f->nw_proto == IPPROTO_UDP) {
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK)) {
ds_put_format(s, "mpls_label=%"PRIu32",",
- mpls_lse_to_label(f->mpls_lse[0]));
+ mpls_lse_to_label(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_TC_MASK)) {
ds_put_format(s, "mpls_tc=%"PRIu8",",
- mpls_lse_to_tc(f->mpls_lse[0]));
+ mpls_lse_to_tc(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_TTL_MASK)) {
ds_put_format(s, "mpls_ttl=%"PRIu8",",
- mpls_lse_to_ttl(f->mpls_lse[0]));
+ mpls_lse_to_ttl(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_BOS_MASK)) {
ds_put_format(s, "mpls_bos=%"PRIu8",",
- mpls_lse_to_bos(f->mpls_lse[0]));
+ mpls_lse_to_bos(f->mpls_lse[0]));
}
format_be32_masked(s, "mpls_lse1", f->mpls_lse[1], wc->masks.mpls_lse[1]);
format_be32_masked(s, "mpls_lse2", f->mpls_lse[2], wc->masks.mpls_lse[2]);
f->nw_proto == IPPROTO_ICMP) {
format_be16_masked(s, "icmp_type", f->tp_src, wc->masks.tp_src);
format_be16_masked(s, "icmp_code", f->tp_dst, wc->masks.tp_dst);
+ } else if (f->dl_type == htons(ETH_TYPE_IP) &&
+ f->nw_proto == IPPROTO_IGMP) {
+ format_be16_masked(s, "igmp_type", f->tp_src, wc->masks.tp_src);
+ format_be16_masked(s, "igmp_code", f->tp_dst, wc->masks.tp_dst);
} else if (f->dl_type == htons(ETH_TYPE_IPV6) &&
f->nw_proto == IPPROTO_ICMPV6) {
format_be16_masked(s, "icmp_type", f->tp_src, wc->masks.tp_src);
}
if (is_ip_any(f) && f->nw_proto == IPPROTO_TCP && wc->masks.tcp_flags) {
uint16_t mask = TCP_FLAGS(wc->masks.tcp_flags);
+
if (mask == TCP_FLAGS(OVS_BE16_MAX)) {
- ds_put_format(s, "tcp_flags=0x%03"PRIx16",", ntohs(f->tcp_flags));
- } else {
+ ds_put_cstr(s, "tcp_flags=");
+ if (f->tcp_flags) {
+ format_flags(s, packet_tcp_flag_to_string, ntohs(f->tcp_flags),
+ '|');
+ } else {
+ ds_put_cstr(s, "0"); /* Zero flags. */
+ }
+ } else if (mask) {
format_flags_masked(s, "tcp_flags", packet_tcp_flag_to_string,
ntohs(f->tcp_flags), mask);
}
* different from OFP_DEFAULT_PRIORITY, includes it in the string. The caller
* must free the string (with free()). */
char *
-match_to_string(const struct match *match, unsigned int priority)
+match_to_string(const struct match *match, int priority)
{
struct ds s = DS_EMPTY_INITIALIZER;
match_format(match, &s, priority);
&& minimask_equal(&a->mask, &b->mask));
}
-/* Returns a hash value for 'match', given 'basis'. */
-uint32_t
-minimatch_hash(const struct minimatch *match, uint32_t basis)
-{
- return miniflow_hash(&match->flow, minimask_hash(&match->mask, basis));
-}
-
/* Returns true if 'target' satisifies 'match', that is, if each bit for which
* 'match' specifies a particular value has the correct value in 'target'.
*
const struct flow *target)
{
const uint32_t *target_u32 = (const uint32_t *) target;
- const uint32_t *flowp = match->flow.values;
- const uint32_t *maskp = match->mask.masks.values;
+ const uint32_t *flowp = miniflow_get_u32_values(&match->flow);
+ const uint32_t *maskp = miniflow_get_u32_values(&match->mask.masks);
uint64_t map;
for (map = match->flow.map; map; map = zero_rightmost_1bit(map)) {
return true;
}
-/* Returns a hash value for the bits of range [start, end) in 'minimatch',
- * given 'basis'.
- *
- * The hash values returned by this function are the same as those returned by
- * flow_hash_in_minimask_range(), only the form of the arguments differ. */
-uint32_t
-minimatch_hash_range(const struct minimatch *match, uint8_t start, uint8_t end,
- uint32_t *basis)
-{
- unsigned int offset;
- const uint32_t *p, *q;
- uint32_t hash = *basis;
- int n, i;
-
- n = count_1bits(miniflow_get_map_in_range(&match->mask.masks, start, end,
- &offset));
- q = match->mask.masks.values + offset;
- p = match->flow.values + offset;
-
- for (i = 0; i < n; i++) {
- hash = mhash_add(hash, p[i] & q[i]);
- }
- *basis = hash; /* Allow continuation from the unfinished value. */
- return mhash_finish(hash, (offset + n) * 4);
-}
-
/* Appends a string representation of 'match' to 's'. If 'priority' is
* different from OFP_DEFAULT_PRIORITY, includes it in 's'. */
void
-minimatch_format(const struct minimatch *match, struct ds *s,
- unsigned int priority)
+minimatch_format(const struct minimatch *match, struct ds *s, int priority)
{
struct match megamatch;
* different from OFP_DEFAULT_PRIORITY, includes it in the string. The caller
* must free the string (with free()). */
char *
-minimatch_to_string(const struct minimatch *match, unsigned int priority)
+minimatch_to_string(const struct minimatch *match, int priority)
{
struct match megamatch;
projects / cascardo / ovs.git / blobdiff