/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "byte-order.h"
#include "command-line.h"
#include "flow.h"
+#include "ofp-util.h"
#include "packets.h"
#include "unaligned.h"
#include <assert.h>
/* Fields in a rule. */
-#define CLS_FIELDS \
- /* struct flow all-caps */ \
- /* wildcard bit(s) member name name */ \
- /* ----------------- ----------- -------- */ \
- CLS_FIELD(NXFW_TUN_ID, tun_id, TUN_ID) \
- CLS_FIELD(OFPFW_NW_SRC_MASK, nw_src, NW_SRC) \
- CLS_FIELD(OFPFW_NW_DST_MASK, nw_dst, NW_DST) \
- CLS_FIELD(OFPFW_IN_PORT, in_port, IN_PORT) \
- CLS_FIELD(OFPFW_DL_VLAN, dl_vlan, DL_VLAN) \
- CLS_FIELD(OFPFW_DL_TYPE, dl_type, DL_TYPE) \
- CLS_FIELD(OFPFW_TP_SRC, tp_src, TP_SRC) \
- CLS_FIELD(OFPFW_TP_DST, tp_dst, TP_DST) \
- CLS_FIELD(OFPFW_DL_SRC, dl_src, DL_SRC) \
- CLS_FIELD(OFPFW_DL_DST | FWW_ETH_MCAST, \
- dl_dst, DL_DST) \
- CLS_FIELD(OFPFW_NW_PROTO, nw_proto, NW_PROTO) \
- CLS_FIELD(OFPFW_DL_VLAN_PCP, dl_vlan_pcp, DL_VLAN_PCP) \
- CLS_FIELD(OFPFW_NW_TOS, nw_tos, NW_TOS)
+#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(FWW_TP_SRC, tp_src, TP_SRC) \
+ CLS_FIELD(FWW_TP_DST, tp_dst, TP_DST) \
+ CLS_FIELD(FWW_DL_SRC, dl_src, DL_SRC) \
+ CLS_FIELD(FWW_DL_DST | FWW_ETH_MCAST, dl_dst, DL_DST) \
+ CLS_FIELD(FWW_NW_PROTO, nw_proto, NW_PROTO) \
+ CLS_FIELD(FWW_NW_TOS, nw_tos, NW_TOS)
/* Field indexes.
*
struct cls_field {
int ofs; /* Offset in struct flow. */
int len; /* Length in bytes. */
- uint32_t wildcards; /* OFPFW_* bit or bits for this field. */
+ flow_wildcards_t wildcards; /* FWW_* bit or bits for this field. */
const char *name; /* Name (for debugging). */
};
}
}
-static int
-tcls_count_exact(const struct tcls *tcls)
-{
- int n_exact;
- size_t i;
-
- n_exact = 0;
- for (i = 0; i < tcls->n_rules; i++) {
- n_exact += tcls->rules[i]->cls_rule.wc.wildcards == 0;
- }
- return n_exact;
-}
-
static bool
tcls_is_empty(const struct tcls *tcls)
{
{
size_t i;
- assert(rule->cls_rule.wc.wildcards || rule->cls_rule.priority == UINT_MAX);
+ assert(!flow_wildcards_is_exact(&rule->cls_rule.wc)
+ || rule->cls_rule.priority == UINT_MAX);
for (i = 0; i < tcls->n_rules; i++) {
const struct cls_rule *pos = &tcls->rules[i]->cls_rule;
- if (pos->priority == rule->cls_rule.priority
- && pos->wc.wildcards == rule->cls_rule.wc.wildcards
- && flow_equal(&pos->flow, &rule->cls_rule.flow)) {
- /* Exact match.
- * XXX flow_equal should ignore wildcarded fields */
+ if (cls_rule_equal(pos, &rule->cls_rule)) {
+ /* Exact match. */
free(tcls->rules[i]);
tcls->rules[i] = xmemdup(rule, sizeof *rule);
return tcls->rules[i];
for (f_idx = 0; f_idx < CLS_N_FIELDS; f_idx++) {
const struct cls_field *f = &cls_fields[f_idx];
- void *wild_field = (char *) &wild->flow + f->ofs;
- void *fixed_field = (char *) fixed + f->ofs;
-
- if ((wild->wc.wildcards & f->wildcards) == f->wildcards ||
- !memcmp(wild_field, fixed_field, f->len)) {
- /* Definite match. */
- continue;
+ 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) {
+ 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);
+ } else if (f_idx == CLS_F_IDX_VLAN_TCI) {
+ eq = !((fixed->vlan_tci ^ wild->flow.vlan_tci)
+ & 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 {
+ NOT_REACHED();
}
- if (wild->wc.wildcards & f->wildcards) {
- uint32_t test = get_unaligned_u32(wild_field);
- uint32_t ip = get_unaligned_u32(fixed_field);
- int shift = (f_idx == CLS_F_IDX_NW_SRC
- ? OFPFW_NW_SRC_SHIFT : OFPFW_NW_DST_SHIFT);
- uint32_t mask = flow_nw_bits_to_mask(wild->wc.wildcards, shift);
- if (!((test ^ ip) & mask)) {
- continue;
- }
+ if (!eq) {
+ return false;
}
-
- return false;
}
return true;
}
CONSTANT_HTONL(0xc0a04455) };
static ovs_be32 nw_dst_values[] = { CONSTANT_HTONL(0xc0a80002),
CONSTANT_HTONL(0xc0a04455) };
-static ovs_be32 tun_id_values[] = { 0, 0xffff0000 };
+static ovs_be64 tun_id_values[] = {
+ 0,
+ CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) };
static uint16_t in_port_values[] = { 1, ODPP_LOCAL };
-static ovs_be16 dl_vlan_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };
-static uint8_t dl_vlan_pcp_values[] = { 7, 0 };
+static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) };
static ovs_be16 dl_type_values[]
= { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) };
static ovs_be16 tp_src_values[] = { CONSTANT_HTONS(49362),
{ 0x5e, 0x33, 0x7f, 0x5f, 0x1e, 0x99 } };
static uint8_t dl_dst_values[][6] = { { 0x4a, 0x27, 0x71, 0xae, 0x64, 0xc1 },
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
-static uint8_t nw_proto_values[] = { IP_TYPE_TCP, IP_TYPE_ICMP };
+static uint8_t nw_proto_values[] = { IPPROTO_TCP, IPPROTO_ICMP };
static uint8_t nw_tos_values[] = { 49, 0 };
static void *values[CLS_N_FIELDS][2];
values[CLS_F_IDX_IN_PORT][0] = &in_port_values[0];
values[CLS_F_IDX_IN_PORT][1] = &in_port_values[1];
- values[CLS_F_IDX_DL_VLAN][0] = &dl_vlan_values[0];
- values[CLS_F_IDX_DL_VLAN][1] = &dl_vlan_values[1];
-
- values[CLS_F_IDX_DL_VLAN_PCP][0] = &dl_vlan_pcp_values[0];
- values[CLS_F_IDX_DL_VLAN_PCP][1] = &dl_vlan_pcp_values[1];
+ values[CLS_F_IDX_VLAN_TCI][0] = &vlan_tci_values[0];
+ values[CLS_F_IDX_VLAN_TCI][1] = &vlan_tci_values[1];
values[CLS_F_IDX_DL_SRC][0] = dl_src_values[0];
values[CLS_F_IDX_DL_SRC][1] = dl_src_values[1];
#define N_NW_DST_VALUES ARRAY_SIZE(nw_dst_values)
#define N_TUN_ID_VALUES ARRAY_SIZE(tun_id_values)
#define N_IN_PORT_VALUES ARRAY_SIZE(in_port_values)
-#define N_DL_VLAN_VALUES ARRAY_SIZE(dl_vlan_values)
-#define N_DL_VLAN_PCP_VALUES ARRAY_SIZE(dl_vlan_pcp_values)
+#define N_VLAN_TCI_VALUES ARRAY_SIZE(vlan_tci_values)
#define N_DL_TYPE_VALUES ARRAY_SIZE(dl_type_values)
#define N_TP_SRC_VALUES ARRAY_SIZE(tp_src_values)
#define N_TP_DST_VALUES ARRAY_SIZE(tp_dst_values)
N_NW_DST_VALUES * \
N_TUN_ID_VALUES * \
N_IN_PORT_VALUES * \
- N_DL_VLAN_VALUES * \
- N_DL_VLAN_PCP_VALUES * \
+ N_VLAN_TCI_VALUES * \
N_DL_TYPE_VALUES * \
N_TP_SRC_VALUES * \
N_TP_DST_VALUES * \
unsigned int i;
assert(classifier_count(cls) == tcls->n_rules);
- assert(classifier_count_exact(cls) == tcls_count_exact(tcls));
for (i = 0; i < confidence; i++) {
struct cls_rule *cr0, *cr1;
struct flow flow;
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.in_port = in_port_values[get_value(&x, N_IN_PORT_VALUES)];
- flow.dl_vlan = dl_vlan_values[get_value(&x, N_DL_VLAN_VALUES)];
- flow.dl_vlan_pcp = dl_vlan_pcp_values[get_value(&x,
- N_DL_VLAN_PCP_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)];
flow.tp_src = tp_src_values[get_value(&x, N_TP_SRC_VALUES)];
flow.tp_dst = tp_dst_values[get_value(&x, N_TP_DST_VALUES)];
const struct test_rule *tr0 = test_rule_from_cls_rule(cr0);
const struct test_rule *tr1 = test_rule_from_cls_rule(cr1);
- assert(flow_equal(&cr0->flow, &cr1->flow));
- assert(cr0->wc.wildcards == cr1->wc.wildcards);
- assert(cr0->priority == cr1->priority);
- /* Skip nw_src_mask and nw_dst_mask, because they are derived
- * members whose values are used only for optimization. */
+ assert(cls_rule_equal(cr0, cr1));
assert(tr0->aux == tr1->aux);
}
}
}
-static void
-free_rule(struct cls_rule *cls_rule, void *cls)
-{
- classifier_remove(cls, cls_rule);
- free(test_rule_from_cls_rule(cls_rule));
-}
-
static void
destroy_classifier(struct classifier *cls)
{
- classifier_for_each(cls, free_rule, cls);
+ struct test_rule *rule, *next_rule;
+ struct cls_cursor cursor;
+
+ cls_cursor_init(&cursor, cls, NULL);
+ CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) {
+ classifier_remove(cls, &rule->cls_rule);
+ free(rule);
+ }
classifier_destroy(cls);
}
int n_tables, int n_rules, int n_dups)
{
const struct cls_table *table;
- const struct test_rule *test_rule;
struct flow_wildcards exact_wc;
+ struct test_rule *test_rule;
+ struct cls_cursor cursor;
int found_tables = 0;
int found_rules = 0;
int found_dups = 0;
- int n_exact1 = 0;
- int n_exact2 = 0;
+ int found_rules2 = 0;
flow_wildcards_init_exact(&exact_wc);
HMAP_FOR_EACH (table, hmap_node, &cls->tables) {
- bool is_exact = flow_wildcards_equal(&table->wc, &exact_wc);
const struct cls_rule *head;
assert(!hmap_is_empty(&table->rules));
const struct cls_rule *rule;
found_rules++;
- if (is_exact) {
- n_exact1++;
- }
LIST_FOR_EACH (rule, list, &head->list) {
assert(rule->priority < prev_priority);
prev_priority = rule->priority;
found_rules++;
found_dups++;
- if (is_exact) {
- n_exact1++;
- }
assert(classifier_find_rule_exactly(cls, rule) == rule);
}
}
}
- CLASSIFIER_FOR_EACH_EXACT_RULE (test_rule, cls_rule, cls) {
- n_exact2++;
- }
-
assert(found_tables == hmap_count(&cls->tables));
assert(n_tables == -1 || n_tables == hmap_count(&cls->tables));
assert(n_rules == -1 || found_rules == n_rules);
assert(n_dups == -1 || found_dups == n_dups);
- assert(n_exact1 == n_exact2);
+
+ cls_cursor_init(&cursor, cls, NULL);
+ CLS_CURSOR_FOR_EACH (test_rule, cls_rule, &cursor) {
+ found_rules2++;
+ }
+ assert(found_rules == found_rules2);
}
static struct test_rule *
make_rule(int wc_fields, unsigned int priority, int value_pat)
{
const struct cls_field *f;
- struct flow_wildcards wc;
struct test_rule *rule;
- uint32_t wildcards;
- struct flow flow;
- wildcards = 0;
- memset(&flow, 0, sizeof flow);
+ rule = xzalloc(sizeof *rule);
+ cls_rule_init_catchall(&rule->cls_rule, wc_fields ? priority : UINT_MAX);
for (f = &cls_fields[0]; f < &cls_fields[CLS_N_FIELDS]; f++) {
int f_idx = f - cls_fields;
- if (wc_fields & (1u << f_idx)) {
- wildcards |= f->wildcards;
+ int value_idx = (value_pat & (1u << f_idx)) != 0;
+ 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) {
+ 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);
+ } else if (f_idx == CLS_F_IDX_VLAN_TCI) {
+ 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 {
- int value_idx = (value_pat & (1u << f_idx)) != 0;
- memcpy((char *) &flow + f->ofs, values[f_idx][value_idx], f->len);
+ NOT_REACHED();
}
}
-
- rule = xzalloc(sizeof *rule);
- flow_wildcards_init(&wc, wildcards);
- cls_rule_init(&flow, &wc, !wildcards ? UINT_MAX : priority,
- &rule->cls_rule);
return rule;
}
}
while (!classifier_is_empty(&cls)) {
- struct test_rule *rule = xmemdup(tcls.rules[rand() % tcls.n_rules],
- sizeof(struct test_rule));
- classifier_for_each_match(&cls, &rule->cls_rule, free_rule, &cls);
- tcls_delete_matches(&tcls, &rule->cls_rule);
+ struct test_rule *rule, *next_rule;
+ struct test_rule *target;
+ struct cls_cursor cursor;
+
+ target = xmemdup(tcls.rules[rand() % tcls.n_rules],
+ sizeof(struct test_rule));
+
+ cls_cursor_init(&cursor, &cls, &target->cls_rule);
+ CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) {
+ classifier_remove(&cls, &rule->cls_rule);
+ free(rule);
+ }
+ tcls_delete_matches(&tcls, &target->cls_rule);
compare_classifiers(&cls, &tcls);
check_tables(&cls, -1, -1, -1);
- free(rule);
+ free(target);
}
destroy_classifier(&cls);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff