mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

OXM: Allow masking of ARP SHA and THA

Browse Source 
Signed-off-by: Simon Horman <horms@verge.net.au>
[blp@nicira.com added NEWS, updated a few overlooked meta-flow bits]
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Simon Horman 2012-07-19 09:21:49 -07:00 committed by Ben Pfaff
parent 465d9a8fe6
commit e878338bf1
9 changed files with 144 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -4,7 +4,8 @@ post-v1.8.0
cooperating group of processes or threads that emitted a log message. cooperating group of processes or threads that emitted a log message.
The default log patterns now include this information. The default log patterns now include this information.
- OpenFlow: - OpenFlow:
- Allow bitwise masking for IPv6 flow label. - Allow bitwise masking for SHA and THA fields in ARP, SLL and TLL
fields in IPv6 neighbor discovery messages, and IPv6 flow label.
v1.8.0 - xx xxx xxxx v1.8.0 - xx xxx xxxx

54
lib/classifier.c
View File

@ -412,15 +412,31 @@ cls_rule_set_icmp_code(struct cls_rule *rule, uint8_t icmp_code)
void void
cls_rule_set_arp_sha(struct cls_rule *rule, const uint8_t sha[ETH_ADDR_LEN]) cls_rule_set_arp_sha(struct cls_rule *rule, const uint8_t sha[ETH_ADDR_LEN])
{ {
rule->wc.wildcards &= ~FWW_ARP_SHA; cls_rule_set_eth(sha, rule->flow.arp_sha, rule->wc.arp_sha_mask);
memcpy(rule->flow.arp_sha, sha, ETH_ADDR_LEN); }
void
cls_rule_set_arp_sha_masked(struct cls_rule *rule,
const uint8_t arp_sha[ETH_ADDR_LEN],
const uint8_t mask[ETH_ADDR_LEN])
{
cls_rule_set_eth_masked(arp_sha, mask,
rule->flow.arp_sha, rule->wc.arp_sha_mask);
} }
void void
cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN])
{ {
rule->wc.wildcards &= ~FWW_ARP_THA; cls_rule_set_eth(tha, rule->flow.arp_tha, rule->wc.arp_tha_mask);
memcpy(rule->flow.arp_tha, tha, ETH_ADDR_LEN); }
void
cls_rule_set_arp_tha_masked(struct cls_rule *rule,
const uint8_t arp_tha[ETH_ADDR_LEN],
const uint8_t mask[ETH_ADDR_LEN])
{
cls_rule_set_eth_masked(arp_tha, mask,
rule->flow.arp_tha, rule->wc.arp_tha_mask);
} }
void void
@ -566,7 +582,7 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s)
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
if (rule->priority != OFP_DEFAULT_PRIORITY) { if (rule->priority != OFP_DEFAULT_PRIORITY) {
ds_put_format(s, "priority=%d,", rule->priority); ds_put_format(s, "priority=%d,", rule->priority);
@ -704,14 +720,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s)
} }
} }
if (f->dl_type == htons(ETH_TYPE_ARP)) { if (f->dl_type == htons(ETH_TYPE_ARP)) {
if (!(w & FWW_ARP_SHA)) { format_eth_masked(s, "arp_sha", f->arp_sha, wc->arp_sha_mask);
ds_put_format(s, "arp_sha="ETH_ADDR_FMT",", format_eth_masked(s, "arp_tha", f->arp_tha, wc->arp_tha_mask);
ETH_ADDR_ARGS(f->arp_sha));
}
if (!(w & FWW_ARP_THA)) {
ds_put_format(s, "arp_tha="ETH_ADDR_FMT",",
ETH_ADDR_ARGS(f->arp_tha));
}
} }
if (!(w & FWW_NW_DSCP)) { if (!(w & FWW_NW_DSCP)) {
ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK); ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK);
@ -748,14 +758,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s)
format_be16_masked(s, "icmp_code", f->tp_dst, wc->tp_dst_mask); format_be16_masked(s, "icmp_code", f->tp_dst, wc->tp_dst_mask);
format_ipv6_netmask(s, "nd_target", &f->nd_target, format_ipv6_netmask(s, "nd_target", &f->nd_target,
&wc->nd_target_mask); &wc->nd_target_mask);
if (!(w & FWW_ARP_SHA)) { format_eth_masked(s, "nd_sll", f->arp_sha, wc->arp_sha_mask);
ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", format_eth_masked(s, "nd_tll", f->arp_tha, wc->arp_tha_mask);
ETH_ADDR_ARGS(f->arp_sha));
}
if (!(w & FWW_ARP_THA)) {
ds_put_format(s, "nd_tll="ETH_ADDR_FMT",",
ETH_ADDR_ARGS(f->arp_tha));
}
} else { } else {
format_be16_masked(s, "tp_src", f->tp_src, wc->tp_src_mask); format_be16_masked(s, "tp_src", f->tp_src, wc->tp_src_mask);
format_be16_masked(s, "tp_dst", f->tp_dst, wc->tp_dst_mask); format_be16_masked(s, "tp_dst", f->tp_dst, wc->tp_dst_mask);
@ -1262,7 +1266,7 @@ flow_equal_except(const struct flow *a, const struct flow *b,
const flow_wildcards_t wc = wildcards->wildcards; const flow_wildcards_t wc = wildcards->wildcards;
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
for (i = 0; i < FLOW_N_REGS; i++) { for (i = 0; i < FLOW_N_REGS; i++) {
if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) {
@ -1288,8 +1292,10 @@ flow_equal_except(const struct flow *a, const struct flow *b,
&& (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK)) && (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK))
&& (wc & FWW_NW_ECN || !((a->nw_tos ^ b->nw_tos) & IP_ECN_MASK)) && (wc & FWW_NW_ECN || !((a->nw_tos ^ b->nw_tos) & IP_ECN_MASK))
&& !((a->nw_frag ^ b->nw_frag) & wildcards->nw_frag_mask) && !((a->nw_frag ^ b->nw_frag) & wildcards->nw_frag_mask)
&& (wc & FWW_ARP_SHA || eth_addr_equals(a->arp_sha, b->arp_sha)) && eth_addr_equal_except(a->arp_sha, b->arp_sha,
&& (wc & FWW_ARP_THA || eth_addr_equals(a->arp_tha, b->arp_tha)) wildcards->arp_sha_mask)
&& eth_addr_equal_except(a->arp_tha, b->arp_tha,
wildcards->arp_tha_mask)
&& !((a->ipv6_label ^ b->ipv6_label) & wildcards->ipv6_label_mask) && !((a->ipv6_label ^ b->ipv6_label) & wildcards->ipv6_label_mask)
&& ipv6_equal_except(&a->ipv6_src, &b->ipv6_src, && ipv6_equal_except(&a->ipv6_src, &b->ipv6_src,
&wildcards->ipv6_src_mask) &wildcards->ipv6_src_mask)

4
lib/classifier.h
View File

@ -134,7 +134,11 @@ void cls_rule_set_nw_frag_masked(struct cls_rule *,
void cls_rule_set_icmp_type(struct cls_rule *, uint8_t); void cls_rule_set_icmp_type(struct cls_rule *, uint8_t);
void cls_rule_set_icmp_code(struct cls_rule *, uint8_t); void cls_rule_set_icmp_code(struct cls_rule *, uint8_t);
void cls_rule_set_arp_sha(struct cls_rule *, const uint8_t[6]); void cls_rule_set_arp_sha(struct cls_rule *, const uint8_t[6]);
void cls_rule_set_arp_sha_masked(struct cls_rule *, const uint8_t[6],
const uint8_t [6]);
void cls_rule_set_arp_tha(struct cls_rule *, const uint8_t[6]); void cls_rule_set_arp_tha(struct cls_rule *, const uint8_t[6]);
void cls_rule_set_arp_tha_masked(struct cls_rule *, const uint8_t[6],
const uint8_t [6]);
void cls_rule_set_ipv6_src(struct cls_rule *, const struct in6_addr *); void cls_rule_set_ipv6_src(struct cls_rule *, const struct in6_addr *);
void cls_rule_set_ipv6_src_masked(struct cls_rule *, const struct in6_addr *, void cls_rule_set_ipv6_src_masked(struct cls_rule *, const struct in6_addr *,
const struct in6_addr *); const struct in6_addr *);

52
lib/flow.c
View File

@ -444,7 +444,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
const flow_wildcards_t wc = wildcards->wildcards; const flow_wildcards_t wc = wildcards->wildcards;
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
for (i = 0; i < FLOW_N_REGS; i++) { for (i = 0; i < FLOW_N_REGS; i++) {
flow->regs[i] &= wildcards->reg_masks[i]; flow->regs[i] &= wildcards->reg_masks[i];
@ -478,12 +478,8 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
flow->nw_ttl = 0; flow->nw_ttl = 0;
} }
flow->nw_frag &= wildcards->nw_frag_mask; flow->nw_frag &= wildcards->nw_frag_mask;
if (wc & FWW_ARP_SHA) { eth_addr_bitand(flow->arp_sha, wildcards->arp_sha_mask, flow->arp_sha);
memset(flow->arp_sha, 0, sizeof flow->arp_sha); eth_addr_bitand(flow->arp_tha, wildcards->arp_tha_mask, flow->arp_tha);
}
if (wc & FWW_ARP_THA) {
memset(flow->arp_tha, 0, sizeof flow->arp_tha);
}
flow->ipv6_src = ipv6_addr_bitand(&flow->ipv6_src, flow->ipv6_src = ipv6_addr_bitand(&flow->ipv6_src,
&wildcards->ipv6_src_mask); &wildcards->ipv6_src_mask);
flow->ipv6_dst = ipv6_addr_bitand(&flow->ipv6_dst, flow->ipv6_dst = ipv6_addr_bitand(&flow->ipv6_dst,
@ -497,7 +493,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
void void
flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd) flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
{ {
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
fmd->tun_id = flow->tun_id; fmd->tun_id = flow->tun_id;
fmd->tun_id_mask = htonll(UINT64_MAX); fmd->tun_id_mask = htonll(UINT64_MAX);
@ -591,7 +587,7 @@ flow_print(FILE *stream, const struct flow *flow)
void void
flow_wildcards_init_catchall(struct flow_wildcards *wc) flow_wildcards_init_catchall(struct flow_wildcards *wc)
{ {
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
wc->wildcards = FWW_ALL; wc->wildcards = FWW_ALL;
wc->tun_id_mask = htonll(0); wc->tun_id_mask = htonll(0);
@ -609,6 +605,8 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc)
wc->tp_dst_mask = htons(0); wc->tp_dst_mask = htons(0);
memset(wc->dl_src_mask, 0, ETH_ADDR_LEN); memset(wc->dl_src_mask, 0, ETH_ADDR_LEN);
memset(wc->dl_dst_mask, 0, ETH_ADDR_LEN); memset(wc->dl_dst_mask, 0, ETH_ADDR_LEN);
memset(wc->arp_sha_mask, 0, ETH_ADDR_LEN);
memset(wc->arp_tha_mask, 0, ETH_ADDR_LEN);
memset(wc->zeros, 0, sizeof wc->zeros); memset(wc->zeros, 0, sizeof wc->zeros);
} }
@ -617,7 +615,7 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc)
void void
flow_wildcards_init_exact(struct flow_wildcards *wc) flow_wildcards_init_exact(struct flow_wildcards *wc)
{ {
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
wc->wildcards = 0; wc->wildcards = 0;
wc->tun_id_mask = htonll(UINT64_MAX); wc->tun_id_mask = htonll(UINT64_MAX);
@ -635,6 +633,8 @@ flow_wildcards_init_exact(struct flow_wildcards *wc)
wc->tp_dst_mask = htons(UINT16_MAX); wc->tp_dst_mask = htons(UINT16_MAX);
memset(wc->dl_src_mask, 0xff, ETH_ADDR_LEN); memset(wc->dl_src_mask, 0xff, ETH_ADDR_LEN);
memset(wc->dl_dst_mask, 0xff, ETH_ADDR_LEN); memset(wc->dl_dst_mask, 0xff, ETH_ADDR_LEN);
memset(wc->arp_sha_mask, 0xff, ETH_ADDR_LEN);
memset(wc->arp_tha_mask, 0xff, ETH_ADDR_LEN);
memset(wc->zeros, 0, sizeof wc->zeros); memset(wc->zeros, 0, sizeof wc->zeros);
} }
@ -645,7 +645,7 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc)
{ {
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
if (wc->wildcards if (wc->wildcards
|| wc->tun_id_mask != htonll(UINT64_MAX) || wc->tun_id_mask != htonll(UINT64_MAX)
@ -657,6 +657,8 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc)
|| wc->metadata_mask != htonll(UINT64_MAX) || wc->metadata_mask != htonll(UINT64_MAX)
|| !eth_mask_is_exact(wc->dl_src_mask) || !eth_mask_is_exact(wc->dl_src_mask)
|| !eth_mask_is_exact(wc->dl_dst_mask) || !eth_mask_is_exact(wc->dl_dst_mask)
|| !eth_mask_is_exact(wc->arp_sha_mask)
|| !eth_mask_is_exact(wc->arp_tha_mask)
|| !ipv6_mask_is_exact(&wc->ipv6_src_mask) || !ipv6_mask_is_exact(&wc->ipv6_src_mask)
|| !ipv6_mask_is_exact(&wc->ipv6_dst_mask) || !ipv6_mask_is_exact(&wc->ipv6_dst_mask)
|| wc->ipv6_label_mask != htonl(UINT32_MAX) || wc->ipv6_label_mask != htonl(UINT32_MAX)
@ -681,7 +683,7 @@ flow_wildcards_is_catchall(const struct flow_wildcards *wc)
{ {
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
if (wc->wildcards != FWW_ALL if (wc->wildcards != FWW_ALL
|| wc->tun_id_mask != htonll(0) || wc->tun_id_mask != htonll(0)
@ -693,6 +695,8 @@ flow_wildcards_is_catchall(const struct flow_wildcards *wc)
|| wc->metadata_mask != htonll(0) || wc->metadata_mask != htonll(0)
|| !eth_addr_is_zero(wc->dl_src_mask) || !eth_addr_is_zero(wc->dl_src_mask)
|| !eth_addr_is_zero(wc->dl_dst_mask) || !eth_addr_is_zero(wc->dl_dst_mask)
|| !eth_addr_is_zero(wc->arp_sha_mask)
|| !eth_addr_is_zero(wc->arp_tha_mask)
|| !ipv6_mask_is_any(&wc->ipv6_src_mask) || !ipv6_mask_is_any(&wc->ipv6_src_mask)
|| !ipv6_mask_is_any(&wc->ipv6_dst_mask) || !ipv6_mask_is_any(&wc->ipv6_dst_mask)
|| wc->ipv6_label_mask != htonl(0) || wc->ipv6_label_mask != htonl(0)
@ -720,7 +724,7 @@ flow_wildcards_combine(struct flow_wildcards *dst,
{ {
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
dst->wildcards = src1->wildcards | src2->wildcards; dst->wildcards = src1->wildcards | src2->wildcards;
dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask; dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask;
@ -742,6 +746,8 @@ flow_wildcards_combine(struct flow_wildcards *dst,
dst->tp_dst_mask = src1->tp_dst_mask & src2->tp_dst_mask; dst->tp_dst_mask = src1->tp_dst_mask & src2->tp_dst_mask;
eth_addr_bitand(src1->dl_src_mask, src2->dl_src_mask, dst->dl_src_mask); eth_addr_bitand(src1->dl_src_mask, src2->dl_src_mask, dst->dl_src_mask);
eth_addr_bitand(src1->dl_dst_mask, src2->dl_dst_mask, dst->dl_dst_mask); eth_addr_bitand(src1->dl_dst_mask, src2->dl_dst_mask, dst->dl_dst_mask);
eth_addr_bitand(src1->arp_sha_mask, src2->arp_sha_mask, dst->arp_sha_mask);
eth_addr_bitand(src1->arp_tha_mask, src2->arp_tha_mask, dst->arp_tha_mask);
} }
/* Returns a hash of the wildcards in 'wc'. */ /* Returns a hash of the wildcards in 'wc'. */
@ -751,7 +757,7 @@ flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis)
/* If you change struct flow_wildcards and thereby trigger this /* If you change struct flow_wildcards and thereby trigger this
* assertion, please check that the new struct flow_wildcards has no holes * assertion, please check that the new struct flow_wildcards has no holes
* in it before you update the assertion. */ * in it before you update the assertion. */
BUILD_ASSERT_DECL(sizeof *wc == 104 + FLOW_N_REGS * 4); BUILD_ASSERT_DECL(sizeof *wc == 112 + FLOW_N_REGS * 4);
return hash_bytes(wc, sizeof *wc, basis); return hash_bytes(wc, sizeof *wc, basis);
} }
@ -763,7 +769,7 @@ flow_wildcards_equal(const struct flow_wildcards *a,
{ {
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
if (a->wildcards != b->wildcards if (a->wildcards != b->wildcards
|| a->tun_id_mask != b->tun_id_mask || a->tun_id_mask != b->tun_id_mask
@ -778,7 +784,9 @@ flow_wildcards_equal(const struct flow_wildcards *a,
|| a->tp_src_mask != b->tp_src_mask || a->tp_src_mask != b->tp_src_mask
|| a->tp_dst_mask != b->tp_dst_mask || a->tp_dst_mask != b->tp_dst_mask
|| !eth_addr_equals(a->dl_src_mask, b->dl_src_mask) || !eth_addr_equals(a->dl_src_mask, b->dl_src_mask)
|| !eth_addr_equals(a->dl_dst_mask, b->dl_dst_mask)) { || !eth_addr_equals(a->dl_dst_mask, b->dl_dst_mask)
|| !eth_addr_equals(a->arp_sha_mask, b->arp_sha_mask)
|| !eth_addr_equals(a->arp_tha_mask, b->arp_tha_mask)) {
return false; return false;
} }
@ -801,7 +809,7 @@ flow_wildcards_has_extra(const struct flow_wildcards *a,
uint8_t eth_masked[ETH_ADDR_LEN]; uint8_t eth_masked[ETH_ADDR_LEN];
struct in6_addr ipv6_masked; struct in6_addr ipv6_masked;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
for (i = 0; i < FLOW_N_REGS; i++) { for (i = 0; i < FLOW_N_REGS; i++) {
if ((a->reg_masks[i] & b->reg_masks[i]) != b->reg_masks[i]) { if ((a->reg_masks[i] & b->reg_masks[i]) != b->reg_masks[i]) {
@ -819,6 +827,16 @@ flow_wildcards_has_extra(const struct flow_wildcards *a,
return true; return true;
} }
eth_addr_bitand(a->arp_sha_mask, b->arp_sha_mask, eth_masked);
if (!eth_addr_equals(eth_masked, b->arp_sha_mask)) {
return true;
}
eth_addr_bitand(a->arp_tha_mask, b->arp_tha_mask, eth_masked);
if (!eth_addr_equals(eth_masked, b->arp_tha_mask)) {
return true;
}
ipv6_masked = ipv6_addr_bitand(&a->ipv6_src_mask, &b->ipv6_src_mask); ipv6_masked = ipv6_addr_bitand(&a->ipv6_src_mask, &b->ipv6_src_mask);
if (!ipv6_addr_equals(&ipv6_masked, &b->ipv6_src_mask)) { if (!ipv6_addr_equals(&ipv6_masked, &b->ipv6_src_mask)) {
return true; return true;

18
lib/flow.h
View File

@ -34,7 +34,7 @@ struct ofpbuf;
/* This sequence number should be incremented whenever anything involving flows /* This sequence number should be incremented whenever anything involving flows
* or the wildcarding of flows changes. This will cause build assertion * or the wildcarding of flows changes. This will cause build assertion
* failures in places which likely need to be updated. */ * failures in places which likely need to be updated. */
#define FLOW_WC_SEQ 13 #define FLOW_WC_SEQ 14
#define FLOW_N_REGS 8 #define FLOW_N_REGS 8
BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS); BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS);
@ -103,7 +103,7 @@ BUILD_ASSERT_DECL(sizeof(((struct flow *)0)->nw_frag) == 1);
BUILD_ASSERT_DECL(sizeof(struct flow) == FLOW_SIG_SIZE + FLOW_PAD_SIZE); BUILD_ASSERT_DECL(sizeof(struct flow) == FLOW_SIG_SIZE + FLOW_PAD_SIZE);
/* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */ /* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */
BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 150 && FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 150 && FLOW_WC_SEQ == 14);
void flow_extract(struct ofpbuf *, uint32_t priority, ovs_be64 tun_id, void flow_extract(struct ofpbuf *, uint32_t priority, ovs_be64 tun_id,
uint16_t in_port, struct flow *); uint16_t in_port, struct flow *);
@ -155,13 +155,11 @@ typedef unsigned int OVS_BITWISE flow_wildcards_t;
/* No corresponding OFPFW10_* bits. */ /* No corresponding OFPFW10_* bits. */
#define FWW_NW_DSCP ((OVS_FORCE flow_wildcards_t) (1 << 1)) #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_ECN ((OVS_FORCE flow_wildcards_t) (1 << 2))
#define FWW_ARP_SHA ((OVS_FORCE flow_wildcards_t) (1 << 3)) #define FWW_NW_TTL ((OVS_FORCE flow_wildcards_t) (1 << 3))
#define FWW_ARP_THA ((OVS_FORCE flow_wildcards_t) (1 << 6)) #define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 6)) - 1))
#define FWW_NW_TTL ((OVS_FORCE flow_wildcards_t) (1 << 7))
#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 8)) - 1))
/* Remember to update FLOW_WC_SEQ when adding or removing FWW_*. */ /* Remember to update FLOW_WC_SEQ when adding or removing FWW_*. */
BUILD_ASSERT_DECL(FWW_ALL == ((1 << 8) - 1) && FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FWW_ALL == ((1 << 6) - 1) && FLOW_WC_SEQ == 14);
/* Information on wildcards for a flow, as a supplement to "struct flow". /* Information on wildcards for a flow, as a supplement to "struct flow".
* *
@ -185,11 +183,13 @@ struct flow_wildcards {
uint8_t nw_frag_mask; /* 1-bit in each significant nw_frag 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_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 dl_dst_mask[6]; /* 1-bit in each significant dl_dst bit. */
uint8_t zeros[5]; /* Padding field set to zero. */ 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. */
}; };
/* Remember to update FLOW_WC_SEQ when updating struct flow_wildcards. */ /* Remember to update FLOW_WC_SEQ when updating struct flow_wildcards. */
BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 136 && FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 144 && FLOW_WC_SEQ == 14);
void flow_wildcards_init_catchall(struct flow_wildcards *); void flow_wildcards_init_catchall(struct flow_wildcards *);
void flow_wildcards_init_exact(struct flow_wildcards *); void flow_wildcards_init_exact(struct flow_wildcards *);

54
lib/meta-flow.c
View File

@ -307,7 +307,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = {
}, { }, {
MFF_ARP_SHA, "arp_sha", NULL, MFF_ARP_SHA, "arp_sha", NULL,
MF_FIELD_SIZES(mac), MF_FIELD_SIZES(mac),
MFM_NONE, FWW_ARP_SHA, MFM_FULLY, 0,
MFS_ETHERNET, MFS_ETHERNET,
MFP_ARP, MFP_ARP,
false, false,
@ -316,7 +316,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = {
}, { }, {
MFF_ARP_THA, "arp_tha", NULL, MFF_ARP_THA, "arp_tha", NULL,
MF_FIELD_SIZES(mac), MF_FIELD_SIZES(mac),
MFM_NONE, FWW_ARP_THA, MFM_FULLY, 0,
MFS_ETHERNET, MFS_ETHERNET,
MFP_ARP, MFP_ARP,
false, false,
@ -424,7 +424,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = {
}, { }, {
MFF_ND_SLL, "nd_sll", NULL, MFF_ND_SLL, "nd_sll", NULL,
MF_FIELD_SIZES(mac), MF_FIELD_SIZES(mac),
MFM_NONE, FWW_ARP_SHA, MFM_FULLY, 0,
MFS_ETHERNET, MFS_ETHERNET,
MFP_ND_SOLICIT, MFP_ND_SOLICIT,
false, false,
@ -433,7 +433,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = {
}, { }, {
MFF_ND_TLL, "nd_tll", NULL, MFF_ND_TLL, "nd_tll", NULL,
MF_FIELD_SIZES(mac), MF_FIELD_SIZES(mac),
MFM_NONE, FWW_ARP_THA, MFM_FULLY, 0,
MFS_ETHERNET, MFS_ETHERNET,
MFP_ND_ADVERT, MFP_ND_ADVERT,
false, false,
@ -562,10 +562,6 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
case MFF_IP_ECN: case MFF_IP_ECN:
case MFF_IP_TTL: case MFF_IP_TTL:
case MFF_ARP_OP: case MFF_ARP_OP:
case MFF_ARP_SHA:
case MFF_ARP_THA:
case MFF_ND_SLL:
case MFF_ND_TLL:
assert(mf->fww_bit != 0); assert(mf->fww_bit != 0);
return (wc->wildcards & mf->fww_bit) != 0; return (wc->wildcards & mf->fww_bit) != 0;
@ -582,6 +578,14 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
case MFF_ETH_DST: case MFF_ETH_DST:
return eth_addr_is_zero(wc->dl_dst_mask); return eth_addr_is_zero(wc->dl_dst_mask);
case MFF_ARP_SHA:
case MFF_ND_SLL:
return eth_addr_is_zero(wc->arp_sha_mask);
case MFF_ARP_THA:
case MFF_ND_TLL:
return eth_addr_is_zero(wc->arp_tha_mask);
case MFF_VLAN_TCI: case MFF_VLAN_TCI:
return !wc->vlan_tci_mask; return !wc->vlan_tci_mask;
case MFF_VLAN_VID: case MFF_VLAN_VID:
@ -648,10 +652,6 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_IP_ECN: case MFF_IP_ECN:
case MFF_IP_TTL: case MFF_IP_TTL:
case MFF_ARP_OP: case MFF_ARP_OP:
case MFF_ARP_SHA:
case MFF_ARP_THA:
case MFF_ND_SLL:
case MFF_ND_TLL:
assert(mf->fww_bit != 0); assert(mf->fww_bit != 0);
memset(mask, wc->wildcards & mf->fww_bit ? 0x00 : 0xff, mf->n_bytes); memset(mask, wc->wildcards & mf->fww_bit ? 0x00 : 0xff, mf->n_bytes);
break; break;
@ -716,6 +716,14 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_ARP_TPA: case MFF_ARP_TPA:
mask->be32 = wc->nw_dst_mask; mask->be32 = wc->nw_dst_mask;
break; break;
case MFF_ARP_SHA:
case MFF_ND_SLL:
memcpy(mask->mac, wc->arp_sha_mask, ETH_ADDR_LEN);
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
memcpy(mask->mac, wc->arp_tha_mask, ETH_ADDR_LEN);
break;
case MFF_TCP_SRC: case MFF_TCP_SRC:
case MFF_UDP_SRC: case MFF_UDP_SRC:
@ -1431,14 +1439,14 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule)
case MFF_ARP_SHA: case MFF_ARP_SHA:
case MFF_ND_SLL: case MFF_ND_SLL:
rule->wc.wildcards |= FWW_ARP_SHA; memset(rule->flow.arp_sha, 0, ETH_ADDR_LEN);
memset(rule->flow.arp_sha, 0, sizeof rule->flow.arp_sha); memset(rule->wc.arp_sha_mask, 0, ETH_ADDR_LEN);
break; break;
case MFF_ARP_THA: case MFF_ARP_THA:
case MFF_ND_TLL: case MFF_ND_TLL:
rule->wc.wildcards |= FWW_ARP_THA; memset(rule->flow.arp_tha, 0, ETH_ADDR_LEN);
memset(rule->flow.arp_tha, 0, sizeof rule->flow.arp_tha); memset(rule->wc.arp_tha_mask, 0, ETH_ADDR_LEN);
break; break;
case MFF_TCP_SRC: case MFF_TCP_SRC:
@ -1502,14 +1510,10 @@ mf_set(const struct mf_field *mf,
case MFF_IP_DSCP: case MFF_IP_DSCP:
case MFF_IP_ECN: case MFF_IP_ECN:
case MFF_ARP_OP: case MFF_ARP_OP:
case MFF_ARP_SHA:
case MFF_ARP_THA:
case MFF_ICMPV4_TYPE: case MFF_ICMPV4_TYPE:
case MFF_ICMPV4_CODE: case MFF_ICMPV4_CODE:
case MFF_ICMPV6_TYPE: case MFF_ICMPV6_TYPE:
case MFF_ICMPV6_CODE: case MFF_ICMPV6_CODE:
case MFF_ND_SLL:
case MFF_ND_TLL:
NOT_REACHED(); NOT_REACHED();
case MFF_TUN_ID: case MFF_TUN_ID:
@ -1532,6 +1536,16 @@ mf_set(const struct mf_field *mf,
cls_rule_set_dl_src_masked(rule, value->mac, mask->mac); cls_rule_set_dl_src_masked(rule, value->mac, mask->mac);
break; break;
case MFF_ARP_SHA:
case MFF_ND_SLL:
cls_rule_set_arp_sha_masked(rule, value->mac, mask->mac);
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
cls_rule_set_arp_tha_masked(rule, value->mac, mask->mac);
break;
case MFF_VLAN_TCI: case MFF_VLAN_TCI:
cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16); cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16);
break; break;

28
lib/nx-match.c
View File

@ -493,7 +493,7 @@ nx_put_match(struct ofpbuf *b, bool oxm, const struct cls_rule *cr,
int match_len; int match_len;
int i; int i;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
/* Metadata. */ /* Metadata. */
if (!(wc & FWW_IN_PORT)) { if (!(wc & FWW_IN_PORT)) {
@ -548,15 +548,13 @@ nx_put_match(struct ofpbuf *b, bool oxm, const struct cls_rule *cr,
flow->tp_src == htons(ND_NEIGHBOR_ADVERT))) { flow->tp_src == htons(ND_NEIGHBOR_ADVERT))) {
nxm_put_ipv6(b, oxm ? OXM_OF_IPV6_ND_TARGET : NXM_NX_ND_TARGET, nxm_put_ipv6(b, oxm ? OXM_OF_IPV6_ND_TARGET : NXM_NX_ND_TARGET,
&flow->nd_target, &cr->wc.nd_target_mask); &flow->nd_target, &cr->wc.nd_target_mask);
if (!(wc & FWW_ARP_SHA) if (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)) {
&& flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)) { nxm_put_eth_masked(b, oxm ? OXM_OF_IPV6_ND_SLL : NXM_NX_ND_SLL,
nxm_put_eth(b, oxm ? OXM_OF_IPV6_ND_SLL : NXM_NX_ND_SLL, flow->arp_sha, cr->wc.arp_sha_mask);
flow->arp_sha);
} }
if (!(wc & FWW_ARP_THA) if (flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) {
&& flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) { nxm_put_eth_masked(b, oxm ? OXM_OF_IPV6_ND_TLL : NXM_NX_ND_TLL,
nxm_put_eth(b, oxm ? OXM_OF_IPV6_ND_TLL : NXM_NX_ND_TLL, flow->arp_tha, cr->wc.arp_tha_mask);
flow->arp_tha);
} }
} }
} else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) { } else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) {
@ -569,14 +567,10 @@ nx_put_match(struct ofpbuf *b, bool oxm, const struct cls_rule *cr,
flow->nw_src, cr->wc.nw_src_mask); flow->nw_src, cr->wc.nw_src_mask);
nxm_put_32m(b, oxm ? OXM_OF_ARP_TPA : NXM_OF_ARP_TPA, nxm_put_32m(b, oxm ? OXM_OF_ARP_TPA : NXM_OF_ARP_TPA,
flow->nw_dst, cr->wc.nw_dst_mask); flow->nw_dst, cr->wc.nw_dst_mask);
if (!(wc & FWW_ARP_SHA)) { nxm_put_eth_masked(b, oxm ? OXM_OF_ARP_SHA : NXM_NX_ARP_SHA,
nxm_put_eth(b, oxm ? OXM_OF_ARP_SHA : NXM_NX_ARP_SHA, flow->arp_sha, cr->wc.arp_sha_mask);
flow->arp_sha); nxm_put_eth_masked(b, oxm ? OXM_OF_ARP_THA : NXM_NX_ARP_THA,
} flow->arp_tha, cr->wc.arp_tha_mask);
if (!(wc & FWW_ARP_THA)) {
nxm_put_eth(b, oxm ? OXM_OF_ARP_THA : NXM_NX_ARP_THA,
flow->arp_tha);
}
} }
/* Tunnel ID. */ /* Tunnel ID. */

13
lib/ofp-util.c
View File

@ -104,14 +104,14 @@ static const flow_wildcards_t WC_INVARIANTS = 0
void void
ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc) ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc)
{ {
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
/* Initialize most of rule->wc. */ /* Initialize most of rule->wc. */
flow_wildcards_init_catchall(wc); flow_wildcards_init_catchall(wc);
wc->wildcards = (OVS_FORCE flow_wildcards_t) ofpfw & WC_INVARIANTS; wc->wildcards = (OVS_FORCE flow_wildcards_t) ofpfw & WC_INVARIANTS;
/* Wildcard fields that aren't defined by ofp10_match or tun_id. */ /* Wildcard fields that aren't defined by ofp10_match or tun_id. */
wc->wildcards |= FWW_ARP_SHA | FWW_ARP_THA | FWW_NW_ECN | FWW_NW_TTL; wc->wildcards |= FWW_NW_ECN | FWW_NW_TTL;
if (ofpfw & OFPFW10_NW_TOS) { if (ofpfw & OFPFW10_NW_TOS) {
/* OpenFlow 1.0 defines a TOS wildcard, but it's much later in /* OpenFlow 1.0 defines a TOS wildcard, but it's much later in
@ -1463,7 +1463,7 @@ ofputil_usable_protocols(const struct cls_rule *rule)
{ {
const struct flow_wildcards *wc = &rule->wc; const struct flow_wildcards *wc = &rule->wc;
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14);
/* NXM and OF1.1+ supports bitwise matching on ethernet addresses. */ /* NXM and OF1.1+ supports bitwise matching on ethernet addresses. */
if (!eth_mask_is_exact(wc->dl_src_mask) if (!eth_mask_is_exact(wc->dl_src_mask)
@ -1481,7 +1481,8 @@ ofputil_usable_protocols(const struct cls_rule *rule)
} }
/* Only NXM supports matching ARP hardware addresses. */ /* Only NXM supports matching ARP hardware addresses. */
if (!(wc->wildcards & FWW_ARP_SHA) || !(wc->wildcards & FWW_ARP_THA)) { if (!eth_addr_is_zero(wc->arp_sha_mask) ||
!eth_addr_is_zero(wc->arp_tha_mask)) {
return OFPUTIL_P_NXM_ANY; return OFPUTIL_P_NXM_ANY;
} }
@ -4109,10 +4110,10 @@ ofputil_normalize_rule(struct cls_rule *rule)
wc.wildcards |= FWW_NW_TTL; wc.wildcards |= FWW_NW_TTL;
} }
if (!(may_match & MAY_ARP_SHA)) { if (!(may_match & MAY_ARP_SHA)) {
wc.wildcards |= FWW_ARP_SHA; memset(wc.arp_sha_mask, 0, ETH_ADDR_LEN);
} }
if (!(may_match & MAY_ARP_THA)) { if (!(may_match & MAY_ARP_THA)) {
wc.wildcards |= FWW_ARP_THA; memset(wc.arp_tha_mask, 0, ETH_ADDR_LEN);
} }
if (!(may_match & MAY_IPV6)) { if (!(may_match & MAY_IPV6)) {
wc.ipv6_src_mask = wc.ipv6_dst_mask = in6addr_any; wc.ipv6_src_mask = wc.ipv6_dst_mask = in6addr_any;

12
tests/ovs-ofctl.at
View File

@ -1399,11 +1399,17 @@ OXM_OF_ARP_TPA_W(C0D80000/FFFF0000)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA(0002e30f80a4)
OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_SHA(0002e30f80a4)
OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ARP_SHA(0002e30f80a4)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/ffffffffffff)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/000000000000)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/00000000000f)
# ARP destination hardware address # ARP destination hardware address
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA(0002e30f80a4)
OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_THA(0002e30f80a4)
OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ARP_THA(0002e30f80a4)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/ffffffffffff)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/000000000000)
OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/00000000000f)
# IPv6 source # IPv6 source
OXM_OF_ETH_TYPE(86dd) OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005) OXM_OF_ETH_TYPE(86dd) OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005)
@ -1568,11 +1574,17 @@ nx_pull_match() returned error OFPBMC_BAD_PREREQ
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA(0002e30f80a4)
nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ
nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA(0002e30f80a4)
OXM_OF_ETH_TYPE(0806)
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA_W(000000000004/00000000000f)
# ARP destination hardware address # ARP destination hardware address
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA(0002e30f80a4)
nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ
nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA(0002e30f80a4)
OXM_OF_ETH_TYPE(0806)
OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA_W(000000000004/00000000000f)
# IPv6 source # IPv6 source
OXM_OF_ETH_TYPE(86dd), OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005) OXM_OF_ETH_TYPE(86dd), OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005)