/* Fields in a rule. */
#define CLS_FIELDS \
- /* struct flow all-caps */ \
- /* FWW_* bit(s) member name name */ \
- /* -------------------------- ----------- -------- */ \
- CLS_FIELD(0, tun_id, TUN_ID) \
- CLS_FIELD(0, nw_src, NW_SRC) \
- CLS_FIELD(0, nw_dst, NW_DST) \
- CLS_FIELD(FWW_IN_PORT, in_port, IN_PORT) \
- CLS_FIELD(0, vlan_tci, VLAN_TCI) \
- CLS_FIELD(FWW_DL_TYPE, dl_type, DL_TYPE) \
- CLS_FIELD(0, tp_src, TP_SRC) \
- CLS_FIELD(0, tp_dst, TP_DST) \
- CLS_FIELD(0, dl_src, DL_SRC) \
- CLS_FIELD(0, dl_dst, DL_DST) \
- CLS_FIELD(FWW_NW_PROTO, nw_proto, NW_PROTO) \
- CLS_FIELD(FWW_NW_DSCP, nw_tos, NW_DSCP)
+ /* struct flow all-caps */ \
+ /* member name name */ \
+ /* ----------- -------- */ \
+ CLS_FIELD(tun_id, TUN_ID) \
+ CLS_FIELD(metadata, METADATA) \
+ CLS_FIELD(nw_src, NW_SRC) \
+ CLS_FIELD(nw_dst, NW_DST) \
+ CLS_FIELD(in_port, IN_PORT) \
+ CLS_FIELD(vlan_tci, VLAN_TCI) \
+ CLS_FIELD(dl_type, DL_TYPE) \
+ CLS_FIELD(tp_src, TP_SRC) \
+ CLS_FIELD(tp_dst, TP_DST) \
+ CLS_FIELD(dl_src, DL_SRC) \
+ CLS_FIELD(dl_dst, DL_DST) \
+ CLS_FIELD(nw_proto, NW_PROTO) \
+ CLS_FIELD(nw_tos, NW_DSCP)
/* Field indexes.
*
* (These are also indexed into struct classifier's 'tables' array.) */
enum {
-#define CLS_FIELD(WILDCARDS, MEMBER, NAME) CLS_F_IDX_##NAME,
+#define CLS_FIELD(MEMBER, NAME) CLS_F_IDX_##NAME,
CLS_FIELDS
#undef CLS_FIELD
CLS_N_FIELDS
struct cls_field {
int ofs; /* Offset in struct flow. */
int len; /* Length in bytes. */
- flow_wildcards_t wildcards; /* FWW_* bit or bits for this field. */
const char *name; /* Name (for debugging). */
};
static const struct cls_field cls_fields[CLS_N_FIELDS] = {
-#define CLS_FIELD(WILDCARDS, MEMBER, NAME) \
+#define CLS_FIELD(MEMBER, NAME) \
{ offsetof(struct flow, MEMBER), \
sizeof ((struct flow *)0)->MEMBER, \
- WILDCARDS, \
#NAME },
CLS_FIELDS
#undef CLS_FIELD
int f_idx;
for (f_idx = 0; f_idx < CLS_N_FIELDS; f_idx++) {
- const struct cls_field *f = &cls_fields[f_idx];
bool eq;
- if (f->wildcards) {
- void *wild_field = (char *) &wild->flow + f->ofs;
- void *fixed_field = (char *) fixed + f->ofs;
- eq = ((wild->wc.wildcards & f->wildcards) == f->wildcards
- || !memcmp(wild_field, fixed_field, f->len));
- } else if (f_idx == CLS_F_IDX_NW_SRC) {
+ if (f_idx == CLS_F_IDX_NW_SRC) {
eq = !((fixed->nw_src ^ wild->flow.nw_src) & wild->wc.nw_src_mask);
} else if (f_idx == CLS_F_IDX_NW_DST) {
eq = !((fixed->nw_dst ^ wild->flow.nw_dst) & wild->wc.nw_dst_mask);
& wild->wc.vlan_tci_mask);
} else if (f_idx == CLS_F_IDX_TUN_ID) {
eq = !((fixed->tun_id ^ wild->flow.tun_id) & wild->wc.tun_id_mask);
+ } else if (f_idx == CLS_F_IDX_METADATA) {
+ eq = !((fixed->metadata ^ wild->flow.metadata)
+ & wild->wc.metadata_mask);
} else if (f_idx == CLS_F_IDX_NW_DSCP) {
- eq = !((fixed->nw_tos ^ wild->flow.nw_tos) & IP_DSCP_MASK);
+ eq = !((fixed->nw_tos ^ wild->flow.nw_tos) &
+ (wild->wc.nw_tos_mask & IP_DSCP_MASK));
+ } else if (f_idx == CLS_F_IDX_NW_PROTO) {
+ eq = !((fixed->nw_proto ^ wild->flow.nw_proto)
+ & wild->wc.nw_proto_mask);
+ } else if (f_idx == CLS_F_IDX_DL_TYPE) {
+ eq = !((fixed->dl_type ^ wild->flow.dl_type)
+ & wild->wc.dl_type_mask);
+ } else if (f_idx == CLS_F_IDX_IN_PORT) {
+ eq = !((fixed->in_port ^ wild->flow.in_port)
+ & wild->wc.in_port_mask);
} else {
NOT_REACHED();
}
static ovs_be64 tun_id_values[] = {
0,
CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };
+static ovs_be64 metadata_values[] = {
+ 0,
+ CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };
static uint16_t in_port_values[] = { 1, OFPP_LOCAL };
static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };
static ovs_be16 dl_type_values[]
values[CLS_F_IDX_TUN_ID][0] = &tun_id_values[0];
values[CLS_F_IDX_TUN_ID][1] = &tun_id_values[1];
+ values[CLS_F_IDX_METADATA][0] = &metadata_values[0];
+ values[CLS_F_IDX_METADATA][1] = &metadata_values[1];
+
values[CLS_F_IDX_IN_PORT][0] = &in_port_values[0];
values[CLS_F_IDX_IN_PORT][1] = &in_port_values[1];
#define N_NW_SRC_VALUES ARRAY_SIZE(nw_src_values)
#define N_NW_DST_VALUES ARRAY_SIZE(nw_dst_values)
#define N_TUN_ID_VALUES ARRAY_SIZE(tun_id_values)
+#define N_METADATA_VALUES ARRAY_SIZE(metadata_values)
#define N_IN_PORT_VALUES ARRAY_SIZE(in_port_values)
#define N_VLAN_TCI_VALUES ARRAY_SIZE(vlan_tci_values)
#define N_DL_TYPE_VALUES ARRAY_SIZE(dl_type_values)
flow.nw_src = nw_src_values[get_value(&x, N_NW_SRC_VALUES)];
flow.nw_dst = nw_dst_values[get_value(&x, N_NW_DST_VALUES)];
flow.tun_id = tun_id_values[get_value(&x, N_TUN_ID_VALUES)];
+ flow.metadata = metadata_values[get_value(&x, N_METADATA_VALUES)];
flow.in_port = in_port_values[get_value(&x, N_IN_PORT_VALUES)];
flow.vlan_tci = vlan_tci_values[get_value(&x, N_VLAN_TCI_VALUES)];
flow.dl_type = dl_type_values[get_value(&x, N_DL_TYPE_VALUES)];
memcpy((char *) &rule->cls_rule.flow + f->ofs,
values[f_idx][value_idx], f->len);
- if (f->wildcards) {
- rule->cls_rule.wc.wildcards &= ~f->wildcards;
- } else if (f_idx == CLS_F_IDX_NW_SRC) {
+ if (f_idx == CLS_F_IDX_NW_SRC) {
rule->cls_rule.wc.nw_src_mask = htonl(UINT32_MAX);
} else if (f_idx == CLS_F_IDX_NW_DST) {
rule->cls_rule.wc.nw_dst_mask = htonl(UINT32_MAX);
rule->cls_rule.wc.vlan_tci_mask = htons(UINT16_MAX);
} else if (f_idx == CLS_F_IDX_TUN_ID) {
rule->cls_rule.wc.tun_id_mask = htonll(UINT64_MAX);
+ } else if (f_idx == CLS_F_IDX_METADATA) {
+ rule->cls_rule.wc.metadata_mask = htonll(UINT64_MAX);
+ } else if (f_idx == CLS_F_IDX_NW_DSCP) {
+ rule->cls_rule.wc.nw_tos_mask |= IP_DSCP_MASK;
+ } else if (f_idx == CLS_F_IDX_NW_PROTO) {
+ rule->cls_rule.wc.nw_proto_mask = UINT8_MAX;
+ } else if (f_idx == CLS_F_IDX_DL_TYPE) {
+ rule->cls_rule.wc.dl_type_mask = htons(UINT16_MAX);
+ } else if (f_idx == CLS_F_IDX_IN_PORT) {
+ rule->cls_rule.wc.in_port_mask = UINT16_MAX;
} else {
NOT_REACHED();
}