/*
- * Copyright (c) 2009-2015 Nicira, Inc.
+ * Copyright (c) 2009-2016 Nicira, Inc.
* Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include "smap.h"
#include "sset.h"
#include "timeval.h"
+#include "tun-metadata.h"
#include "unaligned.h"
#include "unixctl.h"
#include "openvswitch/vlog.h"
static void oftable_set_name(struct oftable *, const char *name);
-static enum ofperr evict_rules_from_table(struct oftable *,
- unsigned int extra_space)
+static enum ofperr evict_rules_from_table(struct oftable *)
+ OVS_REQUIRES(ofproto_mutex);
+static void oftable_configure_eviction(struct oftable *,
+ unsigned int eviction,
+ const struct mf_subfield *fields,
+ size_t n_fields)
OVS_REQUIRES(ofproto_mutex);
-static void oftable_disable_eviction(struct oftable *);
-static void oftable_enable_eviction(struct oftable *,
- const struct mf_subfield *fields,
- size_t n_fields);
-static void oftable_remove_rule(struct rule *rule) OVS_REQUIRES(ofproto_mutex);
+/* This is the only combination of OpenFlow eviction flags that OVS supports: a
+ * combination of OF1.4+ importance, the remaining lifetime of the flow, and
+ * fairness based on user-specified fields. */
+#define OFPROTO_EVICTION_FLAGS \
+ (OFPTMPEF14_OTHER | OFPTMPEF14_IMPORTANCE | OFPTMPEF14_LIFETIME)
/* A set of rules within a single OpenFlow table (oftable) that have the same
* values for the oftable's eviction_fields. A rule to be evicted, when one is
static bool choose_rule_to_evict(struct oftable *table, struct rule **rulep)
OVS_REQUIRES(ofproto_mutex);
-static uint32_t rule_eviction_priority(struct ofproto *ofproto, struct rule *)
- OVS_REQUIRES(ofproto_mutex);;
+static uint64_t rule_eviction_priority(struct ofproto *ofproto, struct rule *)
+ OVS_REQUIRES(ofproto_mutex);
static void eviction_group_add_rule(struct rule *)
OVS_REQUIRES(ofproto_mutex);
static void eviction_group_remove_rule(struct rule *)
* collect_rules_loose() and "strict" way by collect_rules_strict(), as
* defined in the OpenFlow spec. */
struct cls_rule cr;
+ cls_version_t version;
/* Matching criteria for the OpenFlow cookie. Consider a bit B in a rule's
* cookie and the corresponding bits C in 'cookie' and M in 'cookie_mask'.
static void rule_criteria_init(struct rule_criteria *, uint8_t table_id,
const struct match *match, int priority,
+ cls_version_t version,
ovs_be64 cookie, ovs_be64 cookie_mask,
ofp_port_t out_port, uint32_t out_group);
static void rule_criteria_require_rw(struct rule_criteria *,
/* ofport. */
static void ofport_destroy__(struct ofport *) OVS_EXCLUDED(ofproto_mutex);
-static void ofport_destroy(struct ofport *);
+static void ofport_destroy(struct ofport *, bool del);
-static void update_port(struct ofproto *, const char *devname);
+static int update_port(struct ofproto *, const char *devname);
static int init_ports(struct ofproto *);
static void reinit_ports(struct ofproto *);
};
/* rule. */
-static void ofproto_rule_send_removed(struct rule *, uint8_t reason);
+static void ofproto_rule_send_removed(struct rule *)
+ OVS_EXCLUDED(ofproto_mutex);
static bool rule_is_readonly(const struct rule *);
static void ofproto_rule_insert__(struct ofproto *, struct rule *)
OVS_REQUIRES(ofproto_mutex);
};
/* OpenFlow. */
-static enum ofperr modify_flow_check__(struct ofproto *,
+static enum ofperr replace_rule_create(struct ofproto *,
struct ofputil_flow_mod *,
- const struct rule *)
+ struct cls_rule *cr, uint8_t table_id,
+ struct rule *old_rule,
+ struct rule **new_rule)
+ OVS_REQUIRES(ofproto_mutex);
+
+static void replace_rule_start(struct ofproto *, cls_version_t version,
+ struct rule *old_rule, struct rule *new_rule,
+ struct cls_conjunction *, size_t n_conjs)
OVS_REQUIRES(ofproto_mutex);
-static void modify_flow__(struct ofproto *, struct ofputil_flow_mod *,
- const struct flow_mod_requester *, struct rule *,
- struct ovs_list *dead_cookies)
+
+static void replace_rule_revert(struct ofproto *, struct rule *old_rule,
+ struct rule *new_rule)
+ OVS_REQUIRES(ofproto_mutex);
+
+static void replace_rule_finish(struct ofproto *, struct ofputil_flow_mod *,
+ const struct flow_mod_requester *,
+ struct rule *old_rule, struct rule *new_rule,
+ struct ovs_list *dead_cookies)
OVS_REQUIRES(ofproto_mutex);
-static void delete_flows__(const struct rule_collection *,
+static void delete_flows__(struct rule_collection *,
enum ofp_flow_removed_reason,
const struct flow_mod_requester *)
OVS_REQUIRES(ofproto_mutex);
static bool ofproto_group_exists(const struct ofproto *ofproto,
uint32_t group_id)
OVS_EXCLUDED(ofproto->groups_rwlock);
-static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *);
+static enum ofperr add_group(struct ofproto *,
+ const struct ofputil_group_mod *);
static void handle_openflow(struct ofconn *, const struct ofpbuf *);
-static enum ofperr do_bundle_flow_mod_begin(struct ofproto *,
- struct ofputil_flow_mod *,
- struct ofp_bundle_entry *)
+static enum ofperr ofproto_flow_mod_start(struct ofproto *,
+ struct ofproto_flow_mod *)
OVS_REQUIRES(ofproto_mutex);
-static void do_bundle_flow_mod_finish(struct ofproto *,
- struct ofputil_flow_mod *,
- const struct flow_mod_requester *,
- struct ofp_bundle_entry *)
+static void ofproto_flow_mod_finish(struct ofproto *,
+ struct ofproto_flow_mod *,
+ const struct flow_mod_requester *)
OVS_REQUIRES(ofproto_mutex);
static enum ofperr handle_flow_mod__(struct ofproto *,
- struct ofputil_flow_mod *,
+ struct ofproto_flow_mod *,
const struct flow_mod_requester *)
OVS_EXCLUDED(ofproto_mutex);
static void calc_duration(long long int start, long long int now,
unsigned ofproto_max_idle = OFPROTO_MAX_IDLE_DEFAULT;
size_t n_handlers, n_revalidators;
-size_t n_dpdk_rxqs;
char *pmd_cpu_mask;
/* Map from datapath name to struct ofproto, for use by unixctl commands. */
for (i = 0; i < n_ofproto_classes; i++) {
ofproto_classes[i]->init(&init_ofp_ports);
}
+
+ ofproto_unixctl_init();
}
/* 'type' should be a normalized datapath type, as returned by
return class ? class->enumerate_names(type, names) : EAFNOSUPPORT;
}
+static void
+ofproto_bump_tables_version(struct ofproto *ofproto)
+{
+ ++ofproto->tables_version;
+ ofproto->ofproto_class->set_tables_version(ofproto,
+ ofproto->tables_version);
+}
+
int
ofproto_create(const char *datapath_name, const char *datapath_type,
struct ofproto **ofprotop)
*ofprotop = NULL;
- ofproto_unixctl_init();
-
datapath_type = ofproto_normalize_type(datapath_type);
class = ofproto_class_find__(datapath_type);
if (!class) {
ofproto->sw_desc = NULL;
ofproto->serial_desc = NULL;
ofproto->dp_desc = NULL;
- ofproto->frag_handling = OFPC_FRAG_NORMAL;
+ ofproto->frag_handling = OFPUTIL_FRAG_NORMAL;
hmap_init(&ofproto->ports);
hmap_init(&ofproto->ofport_usage);
shash_init(&ofproto->port_by_name);
ofproto->eviction_group_timer = LLONG_MIN;
ofproto->tables = NULL;
ofproto->n_tables = 0;
+ ofproto->tables_version = CLS_MIN_VERSION;
hindex_init(&ofproto->cookies);
hmap_init(&ofproto->learned_cookies);
list_init(&ofproto->expirable);
ofproto->ogf.max_groups[i] = OFPG_MAX;
ofproto->ogf.ofpacts[i] = (UINT64_C(1) << N_OFPACTS) - 1;
}
+ tun_metadata_init();
error = ofproto->ofproto_class->construct(ofproto);
if (error) {
ofproto->meters = xzalloc((ofproto->meter_features.max_meters + 1)
* sizeof(struct meter *));
+ /* Set the initial tables version. */
+ ofproto_bump_tables_version(ofproto);
+
*ofprotop = ofproto;
return 0;
}
: EOPNOTSUPP);
}
-void
-ofproto_set_n_dpdk_rxqs(int n_rxqs)
-{
- n_dpdk_rxqs = MAX(n_rxqs, 0);
-}
-
void
ofproto_set_cpu_mask(const char *cmask)
{
return;
}
- if (s->groups) {
- oftable_enable_eviction(table, s->groups, s->n_groups);
- } else {
- oftable_disable_eviction(table);
- }
-
- table->max_flows = s->max_flows;
-
if (classifier_set_prefix_fields(&table->cls,
s->prefix_fields, s->n_prefix_fields)) {
/* XXX: Trigger revalidation. */
}
ovs_mutex_lock(&ofproto_mutex);
- evict_rules_from_table(table, 0);
+ unsigned int new_eviction = (s->enable_eviction
+ ? table->eviction | EVICTION_CLIENT
+ : table->eviction & ~EVICTION_CLIENT);
+ oftable_configure_eviction(table, new_eviction, s->groups, s->n_groups);
+ table->max_flows = s->max_flows;
+ evict_rules_from_table(table);
ovs_mutex_unlock(&ofproto_mutex);
}
\f
* switch is being deleted and any OpenFlow channels have been or soon will
* be killed. */
ovs_mutex_lock(&ofproto_mutex);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_delete(rule);
+
+ if (!rule->removed) {
+ /* Make sure there is no postponed removal of the rule. */
+ ovs_assert(cls_rule_visible_in_version(&rule->cr, CLS_MAX_VERSION));
+
+ if (!classifier_remove(&rule->ofproto->tables[rule->table_id].cls,
+ &rule->cr)) {
+ OVS_NOT_REACHED();
+ }
+ ofproto_rule_remove__(rule->ofproto, rule);
+ ofproto->ofproto_class->rule_delete(rule);
+ ofproto_rule_unref(rule);
+ }
ovs_mutex_unlock(&ofproto_mutex);
}
rule_collection_add(&rules, rule);
}
delete_flows__(&rules, OFPRR_DELETE, NULL);
- rule_collection_destroy(&rules);
}
/* XXX: Concurrent handler threads may insert new learned flows based on
* learn actions of the now deleted flows right after we release
struct oftable *table;
destroy_rule_executes(ofproto);
- delete_group(ofproto, OFPG_ALL);
guarded_list_destroy(&ofproto->rule_executes);
ovs_rwlock_destroy(&ofproto->groups_rwlock);
ofproto->ofproto_class->dealloc(ofproto);
}
+/* Destroying rules is doubly deferred, must have 'ofproto' around for them.
+ * - 1st we defer the removal of the rules from the classifier
+ * - 2nd we defer the actual destruction of the rules. */
+static void
+ofproto_destroy_defer__(struct ofproto *ofproto)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ ovsrcu_postpone(ofproto_destroy__, ofproto);
+}
+
void
-ofproto_destroy(struct ofproto *p)
+ofproto_destroy(struct ofproto *p, bool del)
OVS_EXCLUDED(ofproto_mutex)
{
struct ofport *ofport, *next_ofport;
ofproto_flush__(p);
HMAP_FOR_EACH_SAFE (ofport, next_ofport, hmap_node, &p->ports) {
- ofport_destroy(ofport);
+ ofport_destroy(ofport, del);
}
HMAP_FOR_EACH_SAFE (usage, next_usage, hmap_node, &p->ofport_usage) {
connmgr_destroy(p->connmgr);
/* Destroying rules is deferred, must have 'ofproto' around for them. */
- ovsrcu_postpone(ofproto_destroy__, p);
+ ovsrcu_postpone(ofproto_destroy_defer__, p);
}
/* Destroys the datapath with the respective 'name' and 'type'. With the Linux
struct eviction_group *evg;
struct rule *rule;
- if (!table->eviction_fields) {
+ if (!table->eviction) {
continue;
}
- if (classifier_count(&table->cls) > 100000) {
+ if (table->n_flows > 100000) {
static struct vlog_rate_limit count_rl =
VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_WARN_RL(&count_rl, "Table %"PRIuSIZE" has an excessive"
- " number of rules: %d", i,
- classifier_count(&table->cls));
+ " number of rules: %d", i, table->n_flows);
}
ovs_mutex_lock(&ofproto_mutex);
n_rules = 0;
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
- n_rules += classifier_count(&table->cls);
+ n_rules += table->n_flows;
}
simap_increase(usage, "rules", n_rules);
simap_put(&ofproto->ofp_requests, netdev_name,
ofp_to_u16(ofp_port));
- update_port(ofproto, netdev_name);
+ error = update_port(ofproto, netdev_name);
}
if (ofp_portp) {
*ofp_portp = OFPP_NONE;
const struct ofpact *ofpacts, size_t ofpacts_len,
enum ofp_flow_mod_command command)
{
- memset(fm, 0, sizeof *fm);
- fm->match = *match;
- fm->priority = priority;
- fm->cookie = 0;
- fm->new_cookie = 0;
- fm->modify_cookie = false;
- fm->table_id = 0;
- fm->command = command;
- fm->idle_timeout = 0;
- fm->hard_timeout = 0;
- fm->importance = 0;
- fm->buffer_id = UINT32_MAX;
- fm->out_port = OFPP_ANY;
- fm->out_group = OFPG_ANY;
- fm->flags = 0;
- fm->ofpacts = CONST_CAST(struct ofpact *, ofpacts);
- fm->ofpacts_len = ofpacts_len;
- fm->delete_reason = OFPRR_DELETE;
+ *fm = (struct ofputil_flow_mod) {
+ .match = *match,
+ .priority = priority,
+ .table_id = 0,
+ .command = command,
+ .buffer_id = UINT32_MAX,
+ .out_port = OFPP_ANY,
+ .out_group = OFPG_ANY,
+ .ofpacts = CONST_CAST(struct ofpact *, ofpacts),
+ .ofpacts_len = ofpacts_len,
+ .delete_reason = OFPRR_DELETE,
+ };
}
static int
const struct ofpact *ofpacts, size_t ofpacts_len,
enum ofp_flow_mod_command command)
{
- struct ofputil_flow_mod fm;
+ struct ofproto_flow_mod ofm;
- flow_mod_init(&fm, match, priority, ofpacts, ofpacts_len, command);
+ flow_mod_init(&ofm.fm, match, priority, ofpacts, ofpacts_len, command);
- return handle_flow_mod__(ofproto, &fm, NULL);
+ return handle_flow_mod__(ofproto, &ofm, NULL);
}
/* Adds a flow to OpenFlow flow table 0 in 'p' that matches 'cls_rule' and
/* First do a cheap check whether the rule we're looking for already exists
* with the actions that we want. If it does, then we're done. */
rule = rule_from_cls_rule(classifier_find_match_exactly(
- &ofproto->tables[0].cls, match, priority));
+ &ofproto->tables[0].cls, match, priority,
+ CLS_MAX_VERSION));
if (rule) {
const struct rule_actions *actions = rule_get_actions(rule);
must_add = !ofpacts_equal(actions->ofpacts, actions->ofpacts_len,
* This is a helper function for in-band control and fail-open and the "learn"
* action. */
enum ofperr
-ofproto_flow_mod(struct ofproto *ofproto, struct ofputil_flow_mod *fm)
+ofproto_flow_mod(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_EXCLUDED(ofproto_mutex)
{
+ struct ofputil_flow_mod *fm = &ofm->fm;
+
/* Optimize for the most common case of a repeated learn action.
* If an identical flow already exists we only need to update its
* 'modified' time. */
struct rule *rule;
bool done = false;
- rule = rule_from_cls_rule(classifier_find_match_exactly(&table->cls,
- &fm->match,
- fm->priority));
+ rule = rule_from_cls_rule(classifier_find_match_exactly(
+ &table->cls, &fm->match, fm->priority,
+ CLS_MAX_VERSION));
if (rule) {
/* Reading many of the rule fields and writing on 'modified'
* requires the rule->mutex. Also, rule->actions may change
}
}
- return handle_flow_mod__(ofproto, fm, NULL);
+ return handle_flow_mod__(ofproto, ofm, NULL);
}
/* Searches for a rule with matching criteria exactly equal to 'target' in
/* First do a cheap check whether the rule we're looking for has already
* been deleted. If so, then we're done. */
- rule = rule_from_cls_rule(classifier_find_match_exactly(cls, target,
- priority));
+ rule = rule_from_cls_rule(classifier_find_match_exactly(
+ cls, target, priority, CLS_MAX_VERSION));
if (!rule) {
return;
}
}
}
pp->port_no = ofproto_port->ofp_port;
- netdev_get_etheraddr(netdev, pp->hw_addr);
+ netdev_get_etheraddr(netdev, &pp->hw_addr);
ovs_strlcpy(pp->name, ofproto_port->name, sizeof pp->name);
netdev_get_flags(netdev, &flags);
pp->config = flags & NETDEV_UP ? 0 : OFPUTIL_PC_PORT_DOWN;
/* Adds an ofport to 'p' initialized based on the given 'netdev' and 'opp'.
* The caller must ensure that 'p' does not have a conflicting ofport (that is,
* one with the same name or port number). */
-static void
+static int
ofport_install(struct ofproto *p,
struct netdev *netdev, const struct ofputil_phy_port *pp)
{
goto error;
}
connmgr_send_port_status(p->connmgr, NULL, pp, OFPPR_ADD);
- return;
+ return 0;
error:
VLOG_WARN_RL(&rl, "%s: could not add port %s (%s)",
} else {
netdev_close(netdev);
}
+ return error;
}
/* Removes 'ofport' from 'p' and destroys it. */
{
connmgr_send_port_status(ofport->ofproto->connmgr, NULL, &ofport->pp,
OFPPR_DELETE);
- ofport_destroy(ofport);
+ ofport_destroy(ofport, true);
}
/* If 'ofproto' contains an ofport named 'name', removes it from 'ofproto' and
static void
ofport_modified(struct ofport *port, struct ofputil_phy_port *pp)
{
- memcpy(port->pp.hw_addr, pp->hw_addr, ETH_ADDR_LEN);
+ port->pp.hw_addr = pp->hw_addr;
port->pp.config = ((port->pp.config & ~OFPUTIL_PC_PORT_DOWN)
| (pp->config & OFPUTIL_PC_PORT_DOWN));
port->pp.state = ((port->pp.state & ~OFPUTIL_PS_LINK_DOWN)
}
static void
-ofport_destroy(struct ofport *port)
+ofport_destroy(struct ofport *port, bool del)
{
if (port) {
dealloc_ofp_port(port->ofproto, port->ofp_port);
- port->ofproto->ofproto_class->port_destruct(port);
+ port->ofproto->ofproto_class->port_destruct(port, del);
ofport_destroy__(port);
}
}
return error;
}
-static void
+static int
update_port(struct ofproto *ofproto, const char *name)
{
struct ofproto_port ofproto_port;
struct ofputil_phy_port pp;
struct netdev *netdev;
struct ofport *port;
+ int error = 0;
COVERAGE_INC(ofproto_update_port);
ofport_remove(port);
}
ofport_remove_with_name(ofproto, name);
- ofport_install(ofproto, netdev, &pp);
+ error = ofport_install(ofproto, netdev, &pp);
}
} else {
/* Any port named 'name' is gone now. */
ofport_remove_with_name(ofproto, name);
}
ofproto_port_destroy(&ofproto_port);
+
+ return error;
}
static int
rule->ofproto->ofproto_class->rule_dealloc(rule);
}
-/* Create a new rule based on attributes in 'fm', match in 'cr', and
- * 'table_id'. Note that the rule is NOT inserted into a any data structures
- * yet. Takes ownership of 'cr'. */
-static enum ofperr
-ofproto_rule_create(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct cls_rule *cr, uint8_t table_id,
- struct rule **rulep)
- OVS_REQUIRES(ofproto_mutex)
-{
- struct rule *rule;
- enum ofperr error;
-
- /* Allocate new rule. */
- rule = ofproto->ofproto_class->rule_alloc();
- if (!rule) {
- cls_rule_destroy(cr);
- VLOG_WARN_RL(&rl, "%s: failed to allocate a rule.", ofproto->name);
- return OFPERR_OFPFMFC_UNKNOWN;
- }
-
- /* Initialize base state. */
- *CONST_CAST(struct ofproto **, &rule->ofproto) = ofproto;
- cls_rule_move(CONST_CAST(struct cls_rule *, &rule->cr), cr);
- ovs_refcount_init(&rule->ref_count);
- rule->flow_cookie = fm->new_cookie;
- rule->created = rule->modified = time_msec();
-
- ovs_mutex_init(&rule->mutex);
- ovs_mutex_lock(&rule->mutex);
- rule->idle_timeout = fm->idle_timeout;
- rule->hard_timeout = fm->hard_timeout;
- rule->importance = fm->importance;
- ovs_mutex_unlock(&rule->mutex);
-
- *CONST_CAST(uint8_t *, &rule->table_id) = table_id;
- rule->flags = fm->flags & OFPUTIL_FF_STATE;
- ovsrcu_set_hidden(&rule->actions,
- rule_actions_create(fm->ofpacts, fm->ofpacts_len));
- list_init(&rule->meter_list_node);
- rule->eviction_group = NULL;
- list_init(&rule->expirable);
- rule->monitor_flags = 0;
- rule->add_seqno = 0;
- rule->modify_seqno = 0;
-
- /* Construct rule, initializing derived state. */
- error = ofproto->ofproto_class->rule_construct(rule);
- if (error) {
- ofproto_rule_destroy__(rule);
- return error;
- }
-
- *rulep = rule;
- return 0;
-}
-
static void
rule_destroy_cb(struct rule *rule)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
+ /* Send rule removed if needed. */
+ if (rule->flags & OFPUTIL_FF_SEND_FLOW_REM
+ && rule->removed_reason != OVS_OFPRR_NONE
+ && !rule_is_hidden(rule)) {
+ ofproto_rule_send_removed(rule);
+ }
rule->ofproto->ofproto_class->rule_destruct(rule);
ofproto_rule_destroy__(rule);
}
}
}
+static void
+remove_rule_rcu__(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ struct ofproto *ofproto = rule->ofproto;
+ struct oftable *table = &ofproto->tables[rule->table_id];
+
+ ovs_assert(!cls_rule_visible_in_version(&rule->cr, CLS_MAX_VERSION));
+ if (!classifier_remove(&table->cls, &rule->cr)) {
+ OVS_NOT_REACHED();
+ }
+ ofproto->ofproto_class->rule_delete(rule);
+ ofproto_rule_unref(rule);
+}
+
+static void
+remove_rule_rcu(struct rule *rule)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ ovs_mutex_lock(&ofproto_mutex);
+ remove_rule_rcu__(rule);
+ ovs_mutex_unlock(&ofproto_mutex);
+}
+
+/* Removes and deletes rules from a NULL-terminated array of rule pointers. */
+static void
+remove_rules_rcu(struct rule **rules)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ struct rule **orig_rules = rules;
+
+ if (*rules) {
+ struct ofproto *ofproto = rules[0]->ofproto;
+ unsigned long tables[BITMAP_N_LONGS(256)];
+ struct rule *rule;
+ size_t table_id;
+
+ memset(tables, 0, sizeof tables);
+
+ ovs_mutex_lock(&ofproto_mutex);
+ while ((rule = *rules++)) {
+ /* Defer once for each new table. This defers the subtable cleanup
+ * until later, so that when removing large number of flows the
+ * operation is faster. */
+ if (!bitmap_is_set(tables, rule->table_id)) {
+ struct classifier *cls = &ofproto->tables[rule->table_id].cls;
+
+ bitmap_set1(tables, rule->table_id);
+ classifier_defer(cls);
+ }
+ remove_rule_rcu__(rule);
+ }
+
+ BITMAP_FOR_EACH_1(table_id, 256, tables) {
+ struct classifier *cls = &ofproto->tables[table_id].cls;
+
+ classifier_publish(cls);
+ }
+ ovs_mutex_unlock(&ofproto_mutex);
+ }
+
+ free(orig_rules);
+}
+
void
ofproto_group_ref(struct ofgroup *group)
{
struct match match;
match_init_catchall(&match);
- rule_criteria_init(&criteria, c->table_id, &match, 0,
+ rule_criteria_init(&criteria, c->table_id, &match, 0, CLS_MAX_VERSION,
c->cookie, OVS_BE64_MAX, OFPP_ANY, OFPG_ANY);
rule_criteria_require_rw(&criteria, false);
collect_rules_loose(ofproto, &criteria, &rules);
- delete_flows__(&rules, OFPRR_DELETE, NULL);
rule_criteria_destroy(&criteria);
- rule_collection_destroy(&rules);
+ delete_flows__(&rules, OFPRR_DELETE, NULL);
free(c);
}
stats = *statsp = xcalloc(ofproto->n_tables, sizeof *stats);
for (i = 0; i < ofproto->n_tables; i++) {
struct ofputil_table_stats *s = &stats[i];
- struct classifier *cls = &ofproto->tables[i].cls;
s->table_id = i;
- s->active_count = classifier_count(cls);
+ s->active_count = ofproto->tables[i].n_flows;
if (i == 0) {
s->active_count -= connmgr_count_hidden_rules(
ofproto->connmgr);
static enum ofperr
handle_get_config_request(struct ofconn *ofconn, const struct ofp_header *oh)
{
- struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofp_switch_config *osc;
- enum ofp_config_flags flags;
- struct ofpbuf *buf;
+ struct ofputil_switch_config config;
+ config.frag = ofconn_get_ofproto(ofconn)->frag_handling;
+ config.invalid_ttl_to_controller
+ = ofconn_get_invalid_ttl_to_controller(ofconn);
+ config.miss_send_len = ofconn_get_miss_send_len(ofconn);
- /* Send reply. */
- buf = ofpraw_alloc_reply(OFPRAW_OFPT_GET_CONFIG_REPLY, oh, 0);
- osc = ofpbuf_put_uninit(buf, sizeof *osc);
- flags = ofproto->frag_handling;
- /* OFPC_INVALID_TTL_TO_CONTROLLER is deprecated in OF 1.3 */
- if (oh->version < OFP13_VERSION
- && ofconn_get_invalid_ttl_to_controller(ofconn)) {
- flags |= OFPC_INVALID_TTL_TO_CONTROLLER;
- }
- osc->flags = htons(flags);
- osc->miss_send_len = htons(ofconn_get_miss_send_len(ofconn));
- ofconn_send_reply(ofconn, buf);
+ ofconn_send_reply(ofconn, ofputil_encode_get_config_reply(oh, &config));
return 0;
}
static enum ofperr
handle_set_config(struct ofconn *ofconn, const struct ofp_header *oh)
{
- const struct ofp_switch_config *osc = ofpmsg_body(oh);
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- uint16_t flags = ntohs(osc->flags);
+ struct ofputil_switch_config config;
+ enum ofperr error;
+
+ error = ofputil_decode_set_config(oh, &config);
+ if (error) {
+ return error;
+ }
if (ofconn_get_type(ofconn) != OFCONN_PRIMARY
|| ofconn_get_role(ofconn) != OFPCR12_ROLE_SLAVE) {
- enum ofp_config_flags cur = ofproto->frag_handling;
- enum ofp_config_flags next = flags & OFPC_FRAG_MASK;
+ enum ofputil_frag_handling cur = ofproto->frag_handling;
+ enum ofputil_frag_handling next = config.frag;
- ovs_assert((cur & OFPC_FRAG_MASK) == cur);
if (cur != next) {
if (ofproto->ofproto_class->set_frag_handling(ofproto, next)) {
ofproto->frag_handling = next;
}
}
}
- /* OFPC_INVALID_TTL_TO_CONTROLLER is deprecated in OF 1.3 */
- ofconn_set_invalid_ttl_to_controller(ofconn,
- (oh->version < OFP13_VERSION
- && flags & OFPC_INVALID_TTL_TO_CONTROLLER));
- ofconn_set_miss_send_len(ofconn, ntohs(osc->miss_send_len));
+ if (config.invalid_ttl_to_controller >= 0) {
+ ofconn_set_invalid_ttl_to_controller(ofconn,
+ config.invalid_ttl_to_controller);
+ }
+
+ ofconn_set_miss_send_len(ofconn, config.miss_send_len);
return 0;
}
* - If they use any groups, then 'ofproto' has that group configured.
*
* Returns 0 if successful, otherwise an OpenFlow error. */
-static enum ofperr
+enum ofperr
ofproto_check_ofpacts(struct ofproto *ofproto,
const struct ofpact ofpacts[], size_t ofpacts_len)
{
return OFPERR_OFPMMFC_INVALID_METER;
}
- OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
+ OFPACT_FOR_EACH_FLATTENED (a, ofpacts, ofpacts_len) {
if (a->type == OFPACT_GROUP
&& !ofproto_group_exists(ofproto, ofpact_get_GROUP(a)->group_id)) {
return OFPERR_OFPBAC_BAD_OUT_GROUP;
/* Get payload. */
if (po.buffer_id != UINT32_MAX) {
error = ofconn_pktbuf_retrieve(ofconn, po.buffer_id, &payload, NULL);
- if (error || !payload) {
+ if (error) {
goto exit_free_ofpacts;
}
} else {
/* Verify actions against packet, then send packet if successful. */
flow_extract(payload, &flow);
flow.in_port.ofp_port = po.in_port;
- error = ofproto_check_ofpacts(p, po.ofpacts, po.ofpacts_len);
+
+ /* Check actions like for flow mods. We pass a 'table_id' of 0 to
+ * ofproto_check_consistency(), which isn't strictly correct because these
+ * actions aren't in any table. This is OK as 'table_id' is only used to
+ * check instructions (e.g., goto-table), which can't appear on the action
+ * list of a packet-out. */
+ error = ofpacts_check_consistency(po.ofpacts, po.ofpacts_len,
+ &flow, u16_to_ofp(p->max_ports),
+ 0, p->n_tables,
+ ofconn_get_protocol(ofconn));
if (!error) {
- error = p->ofproto_class->packet_out(p, payload, &flow,
- po.ofpacts, po.ofpacts_len);
+ error = ofproto_check_ofpacts(p, po.ofpacts, po.ofpacts_len);
+ if (!error) {
+ error = p->ofproto_class->packet_out(p, payload, &flow,
+ po.ofpacts, po.ofpacts_len);
+ }
}
dp_packet_delete(payload);
return error;
}
+static enum ofperr
+handle_nxt_resume(struct ofconn *ofconn, const struct ofp_header *oh)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct ofputil_packet_in_private pin;
+ enum ofperr error;
+
+ error = ofputil_decode_packet_in_private(oh, false, &pin, NULL, NULL);
+ if (error) {
+ return error;
+ }
+
+ error = (ofproto->ofproto_class->nxt_resume
+ ? ofproto->ofproto_class->nxt_resume(ofproto, &pin)
+ : OFPERR_NXR_NOT_SUPPORTED);
+
+ ofputil_packet_in_private_destroy(&pin);
+
+ return error;
+}
+
static void
update_port_config(struct ofconn *ofconn, struct ofport *port,
enum ofputil_port_config config,
}
static enum ofperr
-handle_port_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+port_mod_start(struct ofconn *ofconn, struct ofputil_port_mod *pm,
+ struct ofport **port)
{
struct ofproto *p = ofconn_get_ofproto(ofconn);
+
+ *port = ofproto_get_port(p, pm->port_no);
+ if (!*port) {
+ return OFPERR_OFPPMFC_BAD_PORT;
+ }
+ if (!eth_addr_equals((*port)->pp.hw_addr, pm->hw_addr)) {
+ return OFPERR_OFPPMFC_BAD_HW_ADDR;
+ }
+ return 0;
+}
+
+static void
+port_mod_finish(struct ofconn *ofconn, struct ofputil_port_mod *pm,
+ struct ofport *port)
+{
+ update_port_config(ofconn, port, pm->config, pm->mask);
+ if (pm->advertise) {
+ netdev_set_advertisements(port->netdev, pm->advertise);
+ }
+}
+
+static enum ofperr
+handle_port_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+{
struct ofputil_port_mod pm;
struct ofport *port;
enum ofperr error;
return error;
}
- port = ofproto_get_port(p, pm.port_no);
- if (!port) {
- return OFPERR_OFPPMFC_BAD_PORT;
- } else if (!eth_addr_equals(port->pp.hw_addr, pm.hw_addr)) {
- return OFPERR_OFPPMFC_BAD_HW_ADDR;
- } else {
- update_port_config(ofconn, port, pm.config, pm.mask);
- if (pm.advertise) {
- netdev_set_advertisements(port->netdev, pm.advertise);
- }
+ error = port_mod_start(ofconn, &pm, &port);
+ if (!error) {
+ port_mod_finish(ofconn, &pm, port);
}
- return 0;
+ return error;
}
static enum ofperr
const struct ofp_header *request)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofputil_table_features *features;
- struct ovs_list replies;
- struct ofpbuf msg;
- size_t i;
-
- ofpbuf_use_const(&msg, request, ntohs(request->length));
+ struct ofpbuf msg = ofpbuf_const_initializer(request,
+ ntohs(request->length));
ofpraw_pull_assert(&msg);
if (msg.size || ofpmp_more(request)) {
return OFPERR_OFPTFFC_EPERM;
}
+ struct ofputil_table_features *features;
query_tables(ofproto, &features, NULL);
+ struct ovs_list replies;
ofpmp_init(&replies, request);
- for (i = 0; i < ofproto->n_tables; i++) {
+ for (size_t i = 0; i < ofproto->n_tables; i++) {
if (!(ofproto->tables[i].flags & OFTABLE_HIDDEN)) {
ofputil_append_table_features_reply(&features[i], &replies);
}
return 0;
}
+/* Returns the vacancy of 'oftable', a number that ranges from 0 (if the table
+ * is full) to 100 (if the table is empty).
+ *
+ * A table without a limit on flows is considered to be empty. */
+static uint8_t
+oftable_vacancy(const struct oftable *t)
+{
+ return (!t->max_flows ? 100
+ : t->n_flows >= t->max_flows ? 0
+ : (t->max_flows - t->n_flows) * 100.0 / t->max_flows);
+}
+
+static void
+query_table_desc__(struct ofputil_table_desc *td,
+ struct ofproto *ofproto, uint8_t table_id)
+{
+ const struct oftable *t = &ofproto->tables[table_id];
+
+ td->table_id = table_id;
+ td->eviction = (t->eviction & EVICTION_OPENFLOW
+ ? OFPUTIL_TABLE_EVICTION_ON
+ : OFPUTIL_TABLE_EVICTION_OFF);
+ td->eviction_flags = OFPROTO_EVICTION_FLAGS;
+ td->vacancy = (t->vacancy_event
+ ? OFPUTIL_TABLE_VACANCY_ON
+ : OFPUTIL_TABLE_VACANCY_OFF);
+ td->table_vacancy.vacancy_down = t->vacancy_down;
+ td->table_vacancy.vacancy_up = t->vacancy_up;
+ td->table_vacancy.vacancy = oftable_vacancy(t);
+}
+
+/* This function queries the database for dumping table-desc. */
+static void
+query_tables_desc(struct ofproto *ofproto, struct ofputil_table_desc **descp)
+{
+ struct ofputil_table_desc *table_desc;
+ size_t i;
+
+ table_desc = *descp = xcalloc(ofproto->n_tables, sizeof *table_desc);
+ for (i = 0; i < ofproto->n_tables; i++) {
+ struct ofputil_table_desc *td = &table_desc[i];
+ query_table_desc__(td, ofproto, i);
+ }
+}
+
+/* Function to handle dump-table-desc request. */
+static enum ofperr
+handle_table_desc_request(struct ofconn *ofconn,
+ const struct ofp_header *request)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct ofputil_table_desc *table_desc;
+ struct ovs_list replies;
+ size_t i;
+
+ query_tables_desc(ofproto, &table_desc);
+ ofpmp_init(&replies, request);
+ for (i = 0; i < ofproto->n_tables; i++) {
+ if (!(ofproto->tables[i].flags & OFTABLE_HIDDEN)) {
+ ofputil_append_table_desc_reply(&table_desc[i], &replies,
+ request->version);
+ }
+ }
+ ofconn_send_replies(ofconn, &replies);
+ free(table_desc);
+ return 0;
+}
+
+/* This function determines and sends the vacancy event, based on the value
+ * of current vacancy and threshold vacancy. If the current vacancy is less
+ * than or equal to vacancy_down, vacancy up events must be enabled, and when
+ * the current vacancy is greater or equal to vacancy_up, vacancy down events
+ * must be enabled. */
+static void
+send_table_status(struct ofproto *ofproto, uint8_t table_id)
+{
+ struct oftable *t = &ofproto->tables[table_id];
+ if (!t->vacancy_event) {
+ return;
+ }
+
+ uint8_t vacancy = oftable_vacancy(t);
+ enum ofp14_table_reason event;
+ if (vacancy < t->vacancy_down) {
+ event = OFPTR_VACANCY_DOWN;
+ } else if (vacancy > t->vacancy_up) {
+ event = OFPTR_VACANCY_UP;
+ } else {
+ return;
+ }
+
+ if (event == t->vacancy_event) {
+ struct ofputil_table_desc td;
+ query_table_desc__(&td, ofproto, table_id);
+ connmgr_send_table_status(ofproto->connmgr, &td, event);
+
+ t->vacancy_event = (event == OFPTR_VACANCY_DOWN
+ ? OFPTR_VACANCY_UP
+ : OFPTR_VACANCY_DOWN);
+ }
+}
+
static void
append_port_stat(struct ofport *port, struct ovs_list *replies)
{
static void
rule_criteria_init(struct rule_criteria *criteria, uint8_t table_id,
const struct match *match, int priority,
- ovs_be64 cookie, ovs_be64 cookie_mask,
- ofp_port_t out_port, uint32_t out_group)
+ cls_version_t version, ovs_be64 cookie,
+ ovs_be64 cookie_mask, ofp_port_t out_port,
+ uint32_t out_group)
{
criteria->table_id = table_id;
cls_rule_init(&criteria->cr, match, priority);
+ criteria->version = version;
criteria->cookie = cookie;
criteria->cookie_mask = cookie_mask;
criteria->out_port = out_port;
}
}
+/* Returns a NULL-terminated array of rule pointers,
+ * destroys 'rules'. */
+static struct rule **
+rule_collection_detach(struct rule_collection *rules)
+{
+ struct rule **rule_array;
+
+ rule_collection_add(rules, NULL);
+
+ if (rules->rules == rules->stub) {
+ rules->rules = xmemdup(rules->rules, rules->n * sizeof *rules->rules);
+ }
+
+ rule_array = rules->rules;
+ rule_collection_init(rules);
+
+ return rule_array;
+}
+
void
rule_collection_destroy(struct rule_collection *rules)
{
rule_collection_init(rules);
}
-/* Checks whether 'rule' matches 'c' and, if so, adds it to 'rules'. This
- * function verifies most of the criteria in 'c' itself, but the caller must
+/* Schedules postponed removal of rules, destroys 'rules'. */
+static void
+rule_collection_remove_postponed(struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ if (rules->n > 0) {
+ if (rules->n == 1) {
+ ovsrcu_postpone(remove_rule_rcu, rules->rules[0]);
+ } else {
+ ovsrcu_postpone(remove_rules_rcu, rule_collection_detach(rules));
+ }
+ }
+}
+
+/* Checks whether 'rule' matches 'c' and, if so, adds it to 'rules'. This
+ * function verifies most of the criteria in 'c' itself, but the caller must
* check 'c->cr' itself.
*
- * Rules that have already been marked as 'to_be_removed' are not collected.
+ * Rules that have already been marked for removal are not collected.
*
* Increments '*n_readonly' if 'rule' wasn't added because it's read-only (and
* 'c' only includes modifiable rules). */
&& ofproto_rule_has_out_group(rule, c->out_group)
&& !((rule->flow_cookie ^ c->cookie) & c->cookie_mask)
&& (!rule_is_hidden(rule) || c->include_hidden)
- && !rule->cr.to_be_removed) {
+ && cls_rule_visible_in_version(&rule->cr, c->version)) {
/* Rule matches all the criteria... */
if (!rule_is_readonly(rule) || c->include_readonly) {
/* ...add it. */
FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) {
struct rule *rule;
- CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &criteria->cr) {
+ CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &criteria->cr,
+ criteria->version) {
collect_rule(rule, criteria, rules, &n_readonly);
}
}
struct rule *rule;
rule = rule_from_cls_rule(classifier_find_rule_exactly(
- &table->cls, &criteria->cr));
+ &table->cls, &criteria->cr,
+ criteria->version));
if (rule) {
collect_rule(rule, criteria, rules, &n_readonly);
}
return error;
}
- rule_criteria_init(&criteria, fsr.table_id, &fsr.match, 0, fsr.cookie,
- fsr.cookie_mask, fsr.out_port, fsr.out_group);
+ rule_criteria_init(&criteria, fsr.table_id, &fsr.match, 0, CLS_MAX_VERSION,
+ fsr.cookie, fsr.cookie_mask, fsr.out_port,
+ fsr.out_group);
ovs_mutex_lock(&ofproto_mutex);
error = collect_rules_loose(ofproto, &criteria, &rules);
}
rule_criteria_init(&criteria, request.table_id, &request.match, 0,
- request.cookie, request.cookie_mask,
+ CLS_MAX_VERSION, request.cookie, request.cookie_mask,
request.out_port, request.out_group);
ovs_mutex_lock(&ofproto_mutex);
}
static enum ofperr
-evict_rules_from_table(struct oftable *table, unsigned int extra_space)
+evict_rules_from_table(struct oftable *table)
OVS_REQUIRES(ofproto_mutex)
{
enum ofperr error = 0;
struct rule_collection rules;
- unsigned int count = classifier_count(&table->cls) + extra_space;
+ unsigned int count = table->n_flows;
unsigned int max_flows = table->max_flows;
rule_collection_init(&rules);
}
}
delete_flows__(&rules, OFPRR_EVICTION, NULL);
- rule_collection_destroy(&rules);
return error;
}
-static bool
-is_conjunction(const struct ofpact *ofpacts, size_t ofpacts_len)
-{
- return ofpacts_len > 0 && ofpacts->type == OFPACT_CONJUNCTION;
-}
-
static void
get_conjunctions(const struct ofputil_flow_mod *fm,
struct cls_conjunction **conjsp, size_t *n_conjsp)
struct cls_conjunction *conjs = NULL;
int n_conjs = 0;
- if (is_conjunction(fm->ofpacts, fm->ofpacts_len)) {
- const struct ofpact *ofpact;
- int i;
-
- n_conjs = 0;
- OFPACT_FOR_EACH (ofpact, fm->ofpacts, fm->ofpacts_len) {
+ const struct ofpact *ofpact;
+ OFPACT_FOR_EACH (ofpact, fm->ofpacts, fm->ofpacts_len) {
+ if (ofpact->type == OFPACT_CONJUNCTION) {
n_conjs++;
+ } else if (ofpact->type != OFPACT_NOTE) {
+ /* "conjunction" may appear with "note" actions but not with any
+ * other type of actions. */
+ ovs_assert(!n_conjs);
+ break;
}
+ }
+ if (n_conjs) {
+ int i = 0;
conjs = xzalloc(n_conjs * sizeof *conjs);
- i = 0;
OFPACT_FOR_EACH (ofpact, fm->ofpacts, fm->ofpacts_len) {
- struct ofpact_conjunction *oc = ofpact_get_CONJUNCTION(ofpact);
- conjs[i].clause = oc->clause;
- conjs[i].n_clauses = oc->n_clauses;
- conjs[i].id = oc->id;
- i++;
+ if (ofpact->type == OFPACT_CONJUNCTION) {
+ struct ofpact_conjunction *oc = ofpact_get_CONJUNCTION(ofpact);
+ conjs[i].clause = oc->clause;
+ conjs[i].n_clauses = oc->n_clauses;
+ conjs[i].id = oc->id;
+ i++;
+ }
}
}
*n_conjsp = n_conjs;
}
-static void
-set_conjunctions(struct rule *rule, const struct cls_conjunction *conjs,
- size_t n_conjs)
- OVS_REQUIRES(ofproto_mutex)
-{
- struct cls_rule *cr = CONST_CAST(struct cls_rule *, &rule->cr);
-
- cls_rule_set_conjunctions(cr, conjs, n_conjs);
-}
-
/* Implements OFPFC_ADD and the cases for OFPFC_MODIFY and OFPFC_MODIFY_STRICT
* in which no matching flow already exists in the flow table.
*
*
* The caller retains ownership of 'fm->ofpacts'. */
static enum ofperr
-add_flow_begin(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct rule **rulep, bool *modify)
+add_flow_start(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule **old_rule = &ofm->old_rules.stub[0];
+ struct rule **new_rule = &ofm->new_rules.stub[0];
struct oftable *table;
struct cls_rule cr;
struct rule *rule;
uint8_t table_id;
- enum ofperr error = 0;
+ struct cls_conjunction *conjs;
+ size_t n_conjs;
+ enum ofperr error;
if (!check_table_id(ofproto, fm->table_id)) {
error = OFPERR_OFPBRC_BAD_TABLE_ID;
cls_rule_init(&cr, &fm->match, fm->priority);
/* Check for the existence of an identical rule.
- * This will not return rules earlier marked as 'to_be_removed'. */
- rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, &cr));
- if (rule) {
- /* Transform "add" into "modify" of an existing identical flow. */
- cls_rule_destroy(&cr);
-
- fm->modify_cookie = true;
- error = modify_flow_check__(ofproto, fm, rule);
- if (error) {
- return error;
- }
-
- *modify = true;
- } else { /* New rule. */
- struct cls_conjunction *conjs;
- size_t n_conjs;
-
+ * This will not return rules earlier marked for removal. */
+ rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, &cr,
+ ofm->version));
+ *old_rule = rule;
+ if (!rule) {
/* Check for overlap, if requested. */
if (fm->flags & OFPUTIL_FF_CHECK_OVERLAP
- && classifier_rule_overlaps(&table->cls, &cr)) {
+ && classifier_rule_overlaps(&table->cls, &cr, ofm->version)) {
cls_rule_destroy(&cr);
return OFPERR_OFPFMFC_OVERLAP;
}
/* If necessary, evict an existing rule to clear out space. */
- error = evict_rules_from_table(table, 1);
- if (error) {
- cls_rule_destroy(&cr);
- return error;
- }
-
- /* Allocate new rule. */
- error = ofproto_rule_create(ofproto, fm, &cr, table - ofproto->tables,
- &rule);
- if (error) {
- return error;
- }
-
- /* Insert flow to the classifier, so that later flow_mods may relate
- * to it. This is reversible, in case later errors require this to
- * be reverted. */
- ofproto_rule_insert__(ofproto, rule);
- /* Make the new rule invisible for classifier lookups. */
- classifier_defer(&table->cls);
- get_conjunctions(fm, &conjs, &n_conjs);
- classifier_insert(&table->cls, &rule->cr, conjs, n_conjs);
- free(conjs);
-
- error = ofproto->ofproto_class->rule_insert(rule);
- if (error) {
- oftable_remove_rule(rule);
- ofproto_rule_unref(rule);
- return error;
+ if (table->n_flows >= table->max_flows) {
+ if (!choose_rule_to_evict(table, &rule)) {
+ error = OFPERR_OFPFMFC_TABLE_FULL;
+ cls_rule_destroy(&cr);
+ return error;
+ }
+ eviction_group_remove_rule(rule);
+ /* Marks '*old_rule' as an evicted rule rather than replaced rule.
+ */
+ fm->delete_reason = OFPRR_EVICTION;
+ *old_rule = rule;
}
+ } else {
+ fm->modify_cookie = true;
+ }
- *modify = false;
+ /* Allocate new rule. */
+ error = replace_rule_create(ofproto, fm, &cr, table - ofproto->tables,
+ rule, new_rule);
+ if (error) {
+ return error;
}
- *rulep = rule;
+ get_conjunctions(fm, &conjs, &n_conjs);
+ replace_rule_start(ofproto, ofm->version, rule, *new_rule, conjs, n_conjs);
+ free(conjs);
+
return 0;
}
-/* Revert the effects of add_flow_begin().
- * 'new_rule' must be passed in as NULL, if no new rule was allocated and
- * inserted to the classifier.
- * Note: evictions cannot be reverted. */
+/* Revert the effects of add_flow_start(). */
static void
-add_flow_revert(struct ofproto *ofproto, struct rule *new_rule)
+add_flow_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
- /* Old rule was not changed yet, only need to revert a new rule. */
- if (new_rule) {
- struct oftable *table = &ofproto->tables[new_rule->table_id];
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule *old_rule = ofm->old_rules.stub[0];
+ struct rule *new_rule = ofm->new_rules.stub[0];
- if (!classifier_remove(&table->cls, &new_rule->cr)) {
- OVS_NOT_REACHED();
- }
- classifier_publish(&table->cls);
-
- ofproto_rule_remove__(ofproto, new_rule);
- ofproto->ofproto_class->rule_delete(new_rule);
- ofproto_rule_unref(new_rule);
+ if (old_rule && fm->delete_reason == OFPRR_EVICTION) {
+ /* Revert the eviction. */
+ eviction_group_add_rule(old_rule);
}
+
+ replace_rule_revert(ofproto, old_rule, new_rule);
}
+/* To be called after version bump. */
static void
-add_flow_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req,
- struct rule *rule, bool modify)
+add_flow_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm,
+ const struct flow_mod_requester *req)
OVS_REQUIRES(ofproto_mutex)
{
- if (modify) {
- struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies);
-
- modify_flow__(ofproto, fm, req, rule, &dead_cookies);
- learned_cookies_flush(ofproto, &dead_cookies);
- } else {
- struct oftable *table = &ofproto->tables[rule->table_id];
-
- cls_rule_make_visible(&rule->cr);
- classifier_publish(&table->cls);
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule *old_rule = ofm->old_rules.stub[0];
+ struct rule *new_rule = ofm->new_rules.stub[0];
+ struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies);
- learned_cookies_inc(ofproto, rule_get_actions(rule));
+ replace_rule_finish(ofproto, fm, req, old_rule, new_rule, &dead_cookies);
+ learned_cookies_flush(ofproto, &dead_cookies);
- if (minimask_get_vid_mask(&rule->cr.match.mask) == VLAN_VID_MASK) {
+ if (old_rule) {
+ ovsrcu_postpone(remove_rule_rcu, old_rule);
+ } else {
+ if (minimask_get_vid_mask(new_rule->cr.match.mask) == VLAN_VID_MASK) {
if (ofproto->vlan_bitmap) {
- uint16_t vid = miniflow_get_vid(&rule->cr.match.flow);
+ uint16_t vid = miniflow_get_vid(new_rule->cr.match.flow);
if (!bitmap_is_set(ofproto->vlan_bitmap, vid)) {
bitmap_set1(ofproto->vlan_bitmap, vid);
}
}
- ofmonitor_report(ofproto->connmgr, rule, NXFME_ADDED, 0,
+ ofmonitor_report(ofproto->connmgr, new_rule, NXFME_ADDED, 0,
req ? req->ofconn : NULL,
req ? req->request->xid : 0, NULL);
+
+ /* Send Vacancy Events for OF1.4+. */
+ send_table_status(ofproto, new_rule->table_id);
}
- send_buffered_packet(req, fm->buffer_id, rule);
+ send_buffered_packet(req, fm->buffer_id, new_rule);
}
\f
/* OFPFC_MODIFY and OFPFC_MODIFY_STRICT. */
-/* Checks if the 'rule' can be modified to match 'fm'.
- *
- * Returns 0 on success, otherwise an OpenFlow error code. */
-static enum ofperr
-modify_flow_check__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct rule *rule)
- OVS_REQUIRES(ofproto_mutex)
-{
- if (ofproto->ofproto_class->rule_premodify_actions) {
- return ofproto->ofproto_class->rule_premodify_actions(
- rule, fm->ofpacts, fm->ofpacts_len);
- }
- return 0;
-}
-
-/* Checks if the rules listed in 'rules' can have their actions changed to
- * match those in 'fm'.
- *
- * Returns 0 on success, otherwise an OpenFlow error code. */
+/* Create a new rule based on attributes in 'fm', match in 'cr', 'table_id',
+ * and 'old_rule'. Note that the rule is NOT inserted into a any data
+ * structures yet. Takes ownership of 'cr'. */
static enum ofperr
-modify_flows_check__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct rule_collection *rules)
- OVS_REQUIRES(ofproto_mutex)
+replace_rule_create(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+ struct cls_rule *cr, uint8_t table_id,
+ struct rule *old_rule, struct rule **new_rule)
{
+ struct rule *rule;
enum ofperr error;
- size_t i;
- if (ofproto->ofproto_class->rule_premodify_actions) {
- for (i = 0; i < rules->n; i++) {
- error = modify_flow_check__(ofproto, fm, rules->rules[i]);
- if (error) {
- return error;
- }
- }
+ /* Allocate new rule. */
+ rule = ofproto->ofproto_class->rule_alloc();
+ if (!rule) {
+ cls_rule_destroy(cr);
+ VLOG_WARN_RL(&rl, "%s: failed to allocate a rule.", ofproto->name);
+ return OFPERR_OFPFMFC_UNKNOWN;
}
- return 0;
-}
-
-/* Modifies the 'rule', changing them to match 'fm'. */
-static void
-modify_flow__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req, struct rule *rule,
- struct ovs_list *dead_cookies)
- OVS_REQUIRES(ofproto_mutex)
-{
- enum nx_flow_update_event event = fm->command == OFPFC_ADD
- ? NXFME_ADDED : NXFME_MODIFIED;
-
- /* 'fm' says that */
- bool change_cookie = (fm->modify_cookie
- && fm->new_cookie != OVS_BE64_MAX
- && fm->new_cookie != rule->flow_cookie);
-
- const struct rule_actions *actions = rule_get_actions(rule);
- bool change_actions = !ofpacts_equal(fm->ofpacts, fm->ofpacts_len,
- actions->ofpacts,
- actions->ofpacts_len);
-
- bool reset_counters = (fm->flags & OFPUTIL_FF_RESET_COUNTS) != 0;
+ /* Initialize base state. */
+ *CONST_CAST(struct ofproto **, &rule->ofproto) = ofproto;
+ cls_rule_move(CONST_CAST(struct cls_rule *, &rule->cr), cr);
+ ovs_refcount_init(&rule->ref_count);
+ rule->flow_cookie = fm->new_cookie;
+ rule->created = rule->modified = time_msec();
- long long int now = time_msec();
+ ovs_mutex_init(&rule->mutex);
+ ovs_mutex_lock(&rule->mutex);
+ rule->idle_timeout = fm->idle_timeout;
+ rule->hard_timeout = fm->hard_timeout;
+ *CONST_CAST(uint16_t *, &rule->importance) = fm->importance;
+ rule->removed_reason = OVS_OFPRR_NONE;
- if (change_cookie) {
- cookies_remove(ofproto, rule);
- }
+ *CONST_CAST(uint8_t *, &rule->table_id) = table_id;
+ rule->flags = fm->flags & OFPUTIL_FF_STATE;
+ *CONST_CAST(const struct rule_actions **, &rule->actions)
+ = rule_actions_create(fm->ofpacts, fm->ofpacts_len);
+ list_init(&rule->meter_list_node);
+ rule->eviction_group = NULL;
+ list_init(&rule->expirable);
+ rule->monitor_flags = 0;
+ rule->add_seqno = 0;
+ rule->modify_seqno = 0;
- ovs_mutex_lock(&rule->mutex);
- if (fm->command == OFPFC_ADD) {
- rule->idle_timeout = fm->idle_timeout;
- rule->hard_timeout = fm->hard_timeout;
- rule->importance = fm->importance;
- rule->flags = fm->flags & OFPUTIL_FF_STATE;
- rule->created = now;
- }
- if (change_cookie) {
- rule->flow_cookie = fm->new_cookie;
+ /* Copy values from old rule for modify semantics. */
+ if (old_rule && fm->delete_reason != OFPRR_EVICTION) {
+ bool change_cookie = (fm->modify_cookie
+ && fm->new_cookie != OVS_BE64_MAX
+ && fm->new_cookie != old_rule->flow_cookie);
+
+ ovs_mutex_lock(&old_rule->mutex);
+ if (fm->command != OFPFC_ADD) {
+ rule->idle_timeout = old_rule->idle_timeout;
+ rule->hard_timeout = old_rule->hard_timeout;
+ *CONST_CAST(uint16_t *, &rule->importance) = old_rule->importance;
+ rule->flags = old_rule->flags;
+ rule->created = old_rule->created;
+ }
+ if (!change_cookie) {
+ rule->flow_cookie = old_rule->flow_cookie;
+ }
+ ovs_mutex_unlock(&old_rule->mutex);
}
- rule->modified = now;
ovs_mutex_unlock(&rule->mutex);
- if (change_cookie) {
- cookies_insert(ofproto, rule);
- }
- if (fm->command == OFPFC_ADD) {
- if (fm->idle_timeout || fm->hard_timeout || fm->importance) {
- if (!rule->eviction_group) {
- eviction_group_add_rule(rule);
- }
- } else {
- eviction_group_remove_rule(rule);
- }
+ /* Construct rule, initializing derived state. */
+ error = ofproto->ofproto_class->rule_construct(rule);
+ if (error) {
+ ofproto_rule_destroy__(rule);
+ return error;
}
- if (change_actions) {
- /* We have to change the actions. The rule's conjunctive match set
- * is a function of its actions, so we need to update that too. The
- * conjunctive match set is used in the lookup process to figure
- * which (if any) collection of conjunctive sets the packet matches
- * with. However, a rule with conjunction actions is never to be
- * returned as a classifier lookup result. To make sure a rule with
- * conjunction actions is not returned as a lookup result, we update
- * them in a carefully chosen order:
- *
- * - If we're adding a conjunctive match set where there wasn't one
- * before, we have to make the conjunctive match set available to
- * lookups before the rule's actions are changed, as otherwise
- * rule with a conjunction action could be returned as a lookup
- * result.
- *
- * - To clear some nonempty conjunctive set, we set the rule's
- * actions first, so that a lookup can't return a rule with
- * conjunction actions.
- *
- * - Otherwise, order doesn't matter for changing one nonempty
- * conjunctive match set to some other nonempty set, since the
- * rule's actions are not seen by the classifier, and hence don't
- * matter either before or after the change. */
- struct cls_conjunction *conjs;
- size_t n_conjs;
- get_conjunctions(fm, &conjs, &n_conjs);
+ rule->removed = true; /* Not yet in ofproto data structures. */
- if (n_conjs) {
- set_conjunctions(rule, conjs, n_conjs);
- }
- ovsrcu_set(&rule->actions, rule_actions_create(fm->ofpacts,
- fm->ofpacts_len));
- if (!conjs) {
- set_conjunctions(rule, conjs, n_conjs);
- }
+ *new_rule = rule;
+ return 0;
+}
- free(conjs);
- }
+static void
+replace_rule_start(struct ofproto *ofproto, cls_version_t version,
+ struct rule *old_rule, struct rule *new_rule,
+ struct cls_conjunction *conjs, size_t n_conjs)
+{
+ struct oftable *table = &ofproto->tables[new_rule->table_id];
- if (change_actions || reset_counters) {
- ofproto->ofproto_class->rule_modify_actions(rule, reset_counters);
+ /* 'old_rule' may be either an evicted rule or replaced rule. */
+ if (old_rule) {
+ /* Mark the old rule for removal in the next version. */
+ cls_rule_make_invisible_in_version(&old_rule->cr, version);
+ } else {
+ table->n_flows++;
}
+ /* Insert flow to the classifier, so that later flow_mods may relate
+ * to it. This is reversible, in case later errors require this to
+ * be reverted. */
+ ofproto_rule_insert__(ofproto, new_rule);
+ /* Make the new rule visible for classifier lookups only from the next
+ * version. */
+ classifier_insert(&table->cls, &new_rule->cr, version, conjs, n_conjs);
+}
- if (event != NXFME_MODIFIED || change_actions || change_cookie) {
- ofmonitor_report(ofproto->connmgr, rule, event, 0,
- req ? req->ofconn : NULL, req ? req->request->xid : 0,
- change_actions ? actions : NULL);
+static void replace_rule_revert(struct ofproto *ofproto,
+ struct rule *old_rule, struct rule *new_rule)
+{
+ struct oftable *table = &ofproto->tables[new_rule->table_id];
+
+ if (old_rule) {
+ /* Restore the original visibility of the old rule. */
+ cls_rule_restore_visibility(&old_rule->cr);
+ } else {
+ /* Restore table's rule count. */
+ table->n_flows--;
}
- if (change_actions) {
- learned_cookies_inc(ofproto, rule_get_actions(rule));
- learned_cookies_dec(ofproto, actions, dead_cookies);
- rule_actions_destroy(actions);
+ /* Remove the new rule immediately. It was never visible to lookups. */
+ if (!classifier_remove(&table->cls, &new_rule->cr)) {
+ OVS_NOT_REACHED();
}
+ ofproto_rule_remove__(ofproto, new_rule);
+ /* The rule was not inserted to the ofproto provider, so we can
+ * release it without deleting it from the ofproto provider. */
+ ofproto_rule_unref(new_rule);
}
-/* Modifies the rules listed in 'rules', changing their actions to match those
- * in 'fm'.
- *
- * 'req' is used to retrieve the packet buffer specified in fm->buffer_id,
- * if any. */
+/* Adds the 'new_rule', replacing the 'old_rule'. */
static void
-modify_flows__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req,
- const struct rule_collection *rules)
+replace_rule_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+ const struct flow_mod_requester *req,
+ struct rule *old_rule, struct rule *new_rule,
+ struct ovs_list *dead_cookies)
OVS_REQUIRES(ofproto_mutex)
{
- struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies);
- size_t i;
+ bool forward_stats = !(fm->flags & OFPUTIL_FF_RESET_COUNTS);
+ struct rule *replaced_rule;
+
+ replaced_rule = fm->delete_reason != OFPRR_EVICTION ? old_rule : NULL;
+
+ /* Insert the new flow to the ofproto provider. A non-NULL 'replaced_rule'
+ * is a duplicate rule the 'new_rule' is replacing. The provider should
+ * link the stats from the old rule to the new one if 'forward_stats' is
+ * 'true'. The 'replaced_rule' will be deleted right after this call. */
+ ofproto->ofproto_class->rule_insert(new_rule, replaced_rule,
+ forward_stats);
+ learned_cookies_inc(ofproto, rule_get_actions(new_rule));
+
+ if (old_rule) {
+ const struct rule_actions *old_actions = rule_get_actions(old_rule);
+
+ /* Remove the old rule from data structures. Removal from the
+ * classifier and the deletion of the rule is RCU postponed by the
+ * caller. */
+ ofproto_rule_remove__(ofproto, old_rule);
+ learned_cookies_dec(ofproto, old_actions, dead_cookies);
+
+ if (replaced_rule) {
+ enum nx_flow_update_event event = fm->command == OFPFC_ADD
+ ? NXFME_ADDED : NXFME_MODIFIED;
+
+ bool change_cookie = (fm->modify_cookie
+ && fm->new_cookie != OVS_BE64_MAX
+ && fm->new_cookie != old_rule->flow_cookie);
+
+ bool change_actions = !ofpacts_equal(fm->ofpacts,
+ fm->ofpacts_len,
+ old_actions->ofpacts,
+ old_actions->ofpacts_len);
+
+ if (event != NXFME_MODIFIED || change_actions || change_cookie) {
+ ofmonitor_report(ofproto->connmgr, new_rule, event, 0,
+ req ? req->ofconn : NULL,
+ req ? req->request->xid : 0,
+ change_actions ? old_actions : NULL);
+ }
+ } else {
+ /* XXX: This is slight duplication with delete_flows_finish__() */
- for (i = 0; i < rules->n; i++) {
- modify_flow__(ofproto, fm, req, rules->rules[i], &dead_cookies);
+ old_rule->removed_reason = OFPRR_EVICTION;
+
+ ofmonitor_report(ofproto->connmgr, old_rule, NXFME_DELETED,
+ OFPRR_EVICTION,
+ req ? req->ofconn : NULL,
+ req ? req->request->xid : 0, NULL);
+ }
}
- learned_cookies_flush(ofproto, &dead_cookies);
}
static enum ofperr
-modify_flows_begin__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct rule_collection *rules)
+modify_flows_start__(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *old_rules = &ofm->old_rules;
+ struct rule_collection *new_rules = &ofm->new_rules;
enum ofperr error;
- if (rules->n > 0) {
- error = modify_flows_check__(ofproto, fm, rules);
+ rule_collection_init(new_rules);
+
+ if (old_rules->n > 0) {
+ struct cls_conjunction *conjs;
+ size_t n_conjs;
+ size_t i;
+
+ /* Create a new 'modified' rule for each old rule. */
+ for (i = 0; i < old_rules->n; i++) {
+ struct rule *old_rule = old_rules->rules[i];
+ struct rule *new_rule;
+ struct cls_rule cr;
+
+ cls_rule_clone(&cr, &old_rule->cr);
+ error = replace_rule_create(ofproto, fm, &cr, old_rule->table_id,
+ old_rule, &new_rule);
+ if (!error) {
+ rule_collection_add(new_rules, new_rule);
+ } else {
+ rule_collection_unref(new_rules);
+ rule_collection_destroy(new_rules);
+ return error;
+ }
+ }
+ ovs_assert(new_rules->n == old_rules->n);
+
+ get_conjunctions(fm, &conjs, &n_conjs);
+ for (i = 0; i < old_rules->n; i++) {
+ replace_rule_start(ofproto, ofm->version, old_rules->rules[i],
+ new_rules->rules[i], conjs, n_conjs);
+ }
+ free(conjs);
} else if (!(fm->cookie_mask != htonll(0)
|| fm->new_cookie == OVS_BE64_MAX)) {
- bool modify;
-
- error = add_flow_begin(ofproto, fm, &rules->rules[0], &modify);
+ /* No match, add a new flow. */
+ error = add_flow_start(ofproto, ofm);
if (!error) {
- ovs_assert(!modify);
+ ovs_assert(fm->delete_reason == OFPRR_EVICTION
+ || !old_rules->rules[0]);
}
+ new_rules->n = 1;
} else {
- rules->rules[0] = NULL;
error = 0;
}
+
return error;
}
* 'ofconn' is used to retrieve the packet buffer specified in fm->buffer_id,
* if any. */
static enum ofperr
-modify_flows_begin_loose(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct rule_collection *rules)
+modify_flows_start_loose(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *old_rules = &ofm->old_rules;
struct rule_criteria criteria;
enum ofperr error;
- rule_criteria_init(&criteria, fm->table_id, &fm->match, 0,
- fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, CLS_MAX_VERSION,
+ fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG_ANY);
rule_criteria_require_rw(&criteria,
(fm->flags & OFPUTIL_FF_NO_READONLY) != 0);
- error = collect_rules_loose(ofproto, &criteria, rules);
+ error = collect_rules_loose(ofproto, &criteria, old_rules);
rule_criteria_destroy(&criteria);
if (!error) {
- error = modify_flows_begin__(ofproto, fm, rules);
+ error = modify_flows_start__(ofproto, ofm);
}
if (error) {
- rule_collection_destroy(rules);
+ rule_collection_destroy(old_rules);
}
return error;
}
static void
-modify_flows_revert(struct ofproto *ofproto, struct rule_collection *rules)
+modify_flows_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
- /* Old rules were not changed yet, only need to revert a new rule. */
- if (rules->n == 0 && rules->rules[0] != NULL) {
- add_flow_revert(ofproto, rules->rules[0]);
+ struct rule_collection *old_rules = &ofm->old_rules;
+ struct rule_collection *new_rules = &ofm->new_rules;
+
+ /* Old rules were not changed yet, only need to revert new rules. */
+ if (old_rules->n == 0 && new_rules->n == 1) {
+ add_flow_revert(ofproto, ofm);
+ } else if (old_rules->n > 0) {
+ for (size_t i = 0; i < old_rules->n; i++) {
+ replace_rule_revert(ofproto, old_rules->rules[i],
+ new_rules->rules[i]);
+ }
+ rule_collection_destroy(new_rules);
+ rule_collection_destroy(old_rules);
}
- rule_collection_destroy(rules);
}
static void
-modify_flows_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req,
- struct rule_collection *rules)
+modify_flows_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm,
+ const struct flow_mod_requester *req)
OVS_REQUIRES(ofproto_mutex)
{
- if (rules->n > 0) {
- modify_flows__(ofproto, fm, req, rules);
- send_buffered_packet(req, fm->buffer_id, rules->rules[0]);
- } else if (rules->rules[0] != NULL) {
- add_flow_finish(ofproto, fm, req, rules->rules[0], false);
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *old_rules = &ofm->old_rules;
+ struct rule_collection *new_rules = &ofm->new_rules;
+
+ if (old_rules->n == 0 && new_rules->n == 1) {
+ add_flow_finish(ofproto, ofm, req);
+ } else if (old_rules->n > 0) {
+ struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies);
+
+ ovs_assert(new_rules->n == old_rules->n);
+
+ for (size_t i = 0; i < old_rules->n; i++) {
+ replace_rule_finish(ofproto, fm, req, old_rules->rules[i],
+ new_rules->rules[i], &dead_cookies);
+ }
+ learned_cookies_flush(ofproto, &dead_cookies);
+ rule_collection_remove_postponed(old_rules);
+
+ send_buffered_packet(req, fm->buffer_id, new_rules->rules[0]);
+ rule_collection_destroy(new_rules);
}
- rule_collection_destroy(rules);
}
/* Implements OFPFC_MODIFY_STRICT. Returns 0 on success or an OpenFlow error
* code on failure. */
static enum ofperr
-modify_flow_begin_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct rule_collection *rules)
+modify_flow_start_strict(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *old_rules = &ofm->old_rules;
struct rule_criteria criteria;
enum ofperr error;
rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority,
- fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY);
+ CLS_MAX_VERSION, fm->cookie, fm->cookie_mask, OFPP_ANY,
+ OFPG_ANY);
rule_criteria_require_rw(&criteria,
(fm->flags & OFPUTIL_FF_NO_READONLY) != 0);
- error = collect_rules_strict(ofproto, &criteria, rules);
+ error = collect_rules_strict(ofproto, &criteria, old_rules);
rule_criteria_destroy(&criteria);
if (!error) {
/* collect_rules_strict() can return max 1 rule. */
- error = modify_flows_begin__(ofproto, fm, rules);
+ error = modify_flows_start__(ofproto, ofm);
}
if (error) {
- rule_collection_destroy(rules);
+ rule_collection_destroy(old_rules);
}
return error;
}
\f
/* OFPFC_DELETE implementation. */
-/* Deletes the rules listed in 'rules'. */
static void
-delete_flows__(const struct rule_collection *rules,
- enum ofp_flow_removed_reason reason,
- const struct flow_mod_requester *req)
+delete_flows_start__(struct ofproto *ofproto, cls_version_t version,
+ const struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ for (size_t i = 0; i < rules->n; i++) {
+ struct rule *rule = rules->rules[i];
+ struct oftable *table = &ofproto->tables[rule->table_id];
+
+ table->n_flows--;
+ cls_rule_make_invisible_in_version(&rule->cr, version);
+ }
+}
+
+static void
+delete_flows_finish__(struct ofproto *ofproto,
+ struct rule_collection *rules,
+ enum ofp_flow_removed_reason reason,
+ const struct flow_mod_requester *req)
OVS_REQUIRES(ofproto_mutex)
{
if (rules->n) {
struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies);
- struct ofproto *ofproto = rules->rules[0]->ofproto;
- struct rule *rule, *next;
- size_t i;
- for (i = 0, next = rules->rules[0];
- rule = next, next = (++i < rules->n) ? rules->rules[i] : NULL,
- rule; ) {
- struct classifier *cls = &ofproto->tables[rule->table_id].cls;
- uint8_t next_table = next ? next->table_id : UINT8_MAX;
+ for (size_t i = 0; i < rules->n; i++) {
+ struct rule *rule = rules->rules[i];
- ofproto_rule_send_removed(rule, reason);
+ /* This value will be used to send the flow removed message right
+ * before the rule is actually destroyed. */
+ rule->removed_reason = reason;
ofmonitor_report(ofproto->connmgr, rule, NXFME_DELETED, reason,
req ? req->ofconn : NULL,
req ? req->request->xid : 0, NULL);
- if (next_table == rule->table_id) {
- classifier_defer(cls);
- }
- classifier_remove(cls, &rule->cr);
- if (next_table != rule->table_id) {
- classifier_publish(cls);
- }
- ofproto_rule_remove__(ofproto, rule);
-
- ofproto->ofproto_class->rule_delete(rule);
+ /* Send Vacancy Event for OF1.4+. */
+ send_table_status(ofproto, rule->table_id);
+ ofproto_rule_remove__(ofproto, rule);
learned_cookies_dec(ofproto, rule_get_actions(rule),
&dead_cookies);
-
- ofproto_rule_unref(rule);
}
+ rule_collection_remove_postponed(rules);
+
learned_cookies_flush(ofproto, &dead_cookies);
+ }
+}
+
+/* Deletes the rules listed in 'rules'.
+ * The deleted rules will become invisible to the lookups in the next version.
+ * Destroys 'rules'. */
+static void
+delete_flows__(struct rule_collection *rules,
+ enum ofp_flow_removed_reason reason,
+ const struct flow_mod_requester *req)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ if (rules->n) {
+ struct ofproto *ofproto = rules->rules[0]->ofproto;
+
+ delete_flows_start__(ofproto, ofproto->tables_version + 1, rules);
+ ofproto_bump_tables_version(ofproto);
+ delete_flows_finish__(ofproto, rules, reason, req);
ofmonitor_flush(ofproto->connmgr);
}
}
/* Implements OFPFC_DELETE. */
static enum ofperr
-delete_flows_begin_loose(struct ofproto *ofproto,
- const struct ofputil_flow_mod *fm,
- struct rule_collection *rules)
+delete_flows_start_loose(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ const struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *rules = &ofm->old_rules;
struct rule_criteria criteria;
enum ofperr error;
- rule_criteria_init(&criteria, fm->table_id, &fm->match, 0,
- fm->cookie, fm->cookie_mask,
- fm->out_port, fm->out_group);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, CLS_MAX_VERSION,
+ fm->cookie, fm->cookie_mask, fm->out_port,
+ fm->out_group);
rule_criteria_require_rw(&criteria,
(fm->flags & OFPUTIL_FF_NO_READONLY) != 0);
error = collect_rules_loose(ofproto, &criteria, rules);
rule_criteria_destroy(&criteria);
if (!error) {
- for (size_t i = 0; i < rules->n; i++) {
- struct rule *rule = rules->rules[i];
-
- CONST_CAST(struct cls_rule *, &rule->cr)->to_be_removed = true;
- }
+ delete_flows_start__(ofproto, ofm->version, rules);
}
return error;
}
static void
-delete_flows_revert(struct rule_collection *rules)
+delete_flows_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ struct rule_collection *rules = &ofm->old_rules;
+
for (size_t i = 0; i < rules->n; i++) {
struct rule *rule = rules->rules[i];
+ struct oftable *table = &ofproto->tables[rule->table_id];
- CONST_CAST(struct cls_rule *, &rule->cr)->to_be_removed = false;
+ /* Restore table's rule count. */
+ table->n_flows++;
+
+ /* Restore the original visibility of the rule. */
+ cls_rule_restore_visibility(&rule->cr);
}
rule_collection_destroy(rules);
}
static void
-delete_flows_finish(const struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req,
- struct rule_collection *rules)
+delete_flows_finish(struct ofproto *ofproto,
+ struct ofproto_flow_mod *ofm,
+ const struct flow_mod_requester *req)
OVS_REQUIRES(ofproto_mutex)
{
- delete_flows__(rules, fm->delete_reason, req);
- rule_collection_destroy(rules);
+ delete_flows_finish__(ofproto, &ofm->old_rules, ofm->fm.delete_reason,
+ req);
}
/* Implements OFPFC_DELETE_STRICT. */
static enum ofperr
-delete_flow_begin_strict(struct ofproto *ofproto,
- const struct ofputil_flow_mod *fm,
- struct rule_collection *rules)
+delete_flow_start_strict(struct ofproto *ofproto,
+ struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
+ const struct ofputil_flow_mod *fm = &ofm->fm;
+ struct rule_collection *rules = &ofm->old_rules;
struct rule_criteria criteria;
enum ofperr error;
rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority,
- fm->cookie, fm->cookie_mask,
+ CLS_MAX_VERSION, fm->cookie, fm->cookie_mask,
fm->out_port, fm->out_group);
rule_criteria_require_rw(&criteria,
(fm->flags & OFPUTIL_FF_NO_READONLY) != 0);
rule_criteria_destroy(&criteria);
if (!error) {
- for (size_t i = 0; i < rules->n; i++) {
- struct rule *rule = rules->rules[i];
-
- CONST_CAST(struct cls_rule *, &rule->cr)->to_be_removed = true;
- }
+ delete_flows_start__(ofproto, ofm->version, rules);
}
return error;
}
+/* This may only be called by rule_destroy_cb()! */
static void
-ofproto_rule_send_removed(struct rule *rule, uint8_t reason)
- OVS_REQUIRES(ofproto_mutex)
+ofproto_rule_send_removed(struct rule *rule)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofputil_flow_removed fr;
long long int used;
- if (rule_is_hidden(rule) ||
- !(rule->flags & OFPUTIL_FF_SEND_FLOW_REM)) {
- return;
- }
-
minimatch_expand(&rule->cr.match, &fr.match);
fr.priority = rule->cr.priority;
+
+ ovs_mutex_lock(&ofproto_mutex);
fr.cookie = rule->flow_cookie;
- fr.reason = reason;
+ fr.reason = rule->removed_reason;
fr.table_id = rule->table_id;
calc_duration(rule->created, time_msec(),
&fr.duration_sec, &fr.duration_nsec);
ovs_mutex_unlock(&rule->mutex);
rule->ofproto->ofproto_class->rule_get_stats(rule, &fr.packet_count,
&fr.byte_count, &used);
-
connmgr_send_flow_removed(rule->ofproto->connmgr, &fr);
+ ovs_mutex_unlock(&ofproto_mutex);
}
/* Sends an OpenFlow "flow removed" message with the given 'reason' (either
OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofputil_flow_mod fm;
+ struct ofproto_flow_mod ofm;
uint64_t ofpacts_stub[1024 / 8];
struct ofpbuf ofpacts;
enum ofperr error;
}
ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub);
- error = ofputil_decode_flow_mod(&fm, oh, ofconn_get_protocol(ofconn),
+ error = ofputil_decode_flow_mod(&ofm.fm, oh, ofconn_get_protocol(ofconn),
&ofpacts,
u16_to_ofp(ofproto->max_ports),
ofproto->n_tables);
if (!error) {
- error = ofproto_check_ofpacts(ofproto, fm.ofpacts, fm.ofpacts_len);
+ error = ofproto_check_ofpacts(ofproto, ofm.fm.ofpacts,
+ ofm.fm.ofpacts_len);
}
if (!error) {
struct flow_mod_requester req;
req.ofconn = ofconn;
req.request = oh;
- error = handle_flow_mod__(ofproto, &fm, &req);
+ error = handle_flow_mod__(ofproto, &ofm, &req);
}
if (error) {
goto exit_free_ofpacts;
}
- ofconn_report_flow_mod(ofconn, fm.command);
+ ofconn_report_flow_mod(ofconn, ofm.fm.command);
exit_free_ofpacts:
ofpbuf_uninit(&ofpacts);
}
static enum ofperr
-handle_flow_mod__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+handle_flow_mod__(struct ofproto *ofproto, struct ofproto_flow_mod *ofm,
const struct flow_mod_requester *req)
OVS_EXCLUDED(ofproto_mutex)
{
- struct ofp_bundle_entry be;
enum ofperr error;
ovs_mutex_lock(&ofproto_mutex);
- error = do_bundle_flow_mod_begin(ofproto, fm, &be);
+ ofm->version = ofproto->tables_version + 1;
+ error = ofproto_flow_mod_start(ofproto, ofm);
if (!error) {
- do_bundle_flow_mod_finish(ofproto, fm, req, &be);
+ ofproto_bump_tables_version(ofproto);
+ ofproto_flow_mod_finish(ofproto, ofm, req);
}
ofmonitor_flush(ofproto->connmgr);
ovs_mutex_unlock(&ofproto_mutex);
}
if (request.role != OFPCR12_ROLE_NOCHANGE) {
- if (request.have_generation_id
+ if (request.role != OFPCR12_ROLE_EQUAL
+ && request.have_generation_id
&& !ofconn_set_master_election_id(ofconn, request.generation_id)) {
return OFPERR_OFPRRFC_STALE;
}
uint32_t format;
format = ntohl(msg->format);
- if (format != NXPIF_OPENFLOW10 && format != NXPIF_NXM) {
+ if (!ofputil_packet_in_format_is_valid(format)) {
return OFPERR_OFPBRC_EPERM;
}
static enum ofperr
handle_nxt_set_async_config(struct ofconn *ofconn, const struct ofp_header *oh)
{
- const struct nx_async_config *msg = ofpmsg_body(oh);
- uint32_t master[OAM_N_TYPES];
- uint32_t slave[OAM_N_TYPES];
-
- master[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[0]);
- master[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[0]);
- master[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[0]);
+ struct ofputil_async_cfg basis = ofconn_get_async_config(ofconn);
+ struct ofputil_async_cfg ac;
+ enum ofperr error;
- slave[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[1]);
- slave[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[1]);
- slave[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[1]);
+ error = ofputil_decode_set_async_config(oh, false, &basis, &ac);
+ if (error) {
+ return error;
+ }
- ofconn_set_async_config(ofconn, master, slave);
+ ofconn_set_async_config(ofconn, &ac);
if (ofconn_get_type(ofconn) == OFCONN_SERVICE &&
!ofconn_get_miss_send_len(ofconn)) {
ofconn_set_miss_send_len(ofconn, OFP_DEFAULT_MISS_SEND_LEN);
static enum ofperr
handle_nxt_get_async_request(struct ofconn *ofconn, const struct ofp_header *oh)
{
- struct ofpbuf *buf;
- uint32_t master[OAM_N_TYPES];
- uint32_t slave[OAM_N_TYPES];
- struct nx_async_config *msg;
-
- ofconn_get_async_config(ofconn, master, slave);
- buf = ofpraw_alloc_reply(OFPRAW_OFPT13_GET_ASYNC_REPLY, oh, 0);
- msg = ofpbuf_put_zeros(buf, sizeof *msg);
-
- msg->packet_in_mask[0] = htonl(master[OAM_PACKET_IN]);
- msg->port_status_mask[0] = htonl(master[OAM_PORT_STATUS]);
- msg->flow_removed_mask[0] = htonl(master[OAM_FLOW_REMOVED]);
-
- msg->packet_in_mask[1] = htonl(slave[OAM_PACKET_IN]);
- msg->port_status_mask[1] = htonl(slave[OAM_PORT_STATUS]);
- msg->flow_removed_mask[1] = htonl(slave[OAM_FLOW_REMOVED]);
-
- ofconn_send_reply(ofconn, buf);
+ struct ofputil_async_cfg ac = ofconn_get_async_config(ofconn);
+ ofconn_send_reply(ofconn, ofputil_encode_get_async_reply(oh, &ac));
return 0;
}
FOR_EACH_MATCHING_TABLE (table, m->table_id, ofproto) {
struct rule *rule;
- CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &target) {
+ CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &target, CLS_MAX_VERSION) {
ofproto_collect_ofmonitor_refresh_rule(m, rule, seqno, rules);
}
}
OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofmonitor **monitors;
- size_t n_monitors, allocated_monitors;
- struct rule_collection rules;
- struct ovs_list replies;
- enum ofperr error;
- struct ofpbuf b;
- size_t i;
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- monitors = NULL;
- n_monitors = allocated_monitors = 0;
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+
+ struct ofmonitor **monitors = NULL;
+ size_t allocated_monitors = 0;
+ size_t n_monitors = 0;
+
+ enum ofperr error;
ovs_mutex_lock(&ofproto_mutex);
for (;;) {
monitors[n_monitors++] = m;
}
+ struct rule_collection rules;
rule_collection_init(&rules);
- for (i = 0; i < n_monitors; i++) {
+ for (size_t i = 0; i < n_monitors; i++) {
ofproto_collect_ofmonitor_initial_rules(monitors[i], &rules);
}
+ struct ovs_list replies;
ofpmp_init(&replies, oh);
ofmonitor_compose_refresh_updates(&rules, &replies);
ovs_mutex_unlock(&ofproto_mutex);
return 0;
error:
- for (i = 0; i < n_monitors; i++) {
+ for (size_t i = 0; i < n_monitors; i++) {
ofmonitor_destroy(monitors[i]);
}
free(monitors);
meter_delete(ofproto, first, last);
ovs_mutex_unlock(&ofproto_mutex);
- rule_collection_destroy(&rules);
return error;
}
break;
}
+ if (!error) {
+ struct ofputil_requestforward rf;
+ rf.xid = oh->xid;
+ rf.reason = OFPRFR_METER_MOD;
+ rf.meter_mod = &mm;
+ connmgr_send_requestforward(ofproto->connmgr, ofconn, &rf);
+ }
+
exit_free_bands:
ofpbuf_uninit(&bands);
return error;
uint32_t count;
match_init_catchall(&match);
- rule_criteria_init(&criteria, 0xff, &match, 0, htonll(0), htonll(0),
- OFPP_ANY, group->group_id);
+ rule_criteria_init(&criteria, 0xff, &match, 0, CLS_MAX_VERSION, htonll(0),
+ htonll(0), OFPP_ANY, group->group_id);
ovs_mutex_lock(&ofproto_mutex);
error = collect_rules_loose(ofproto, &criteria, &rules);
ovs_mutex_unlock(&ofproto_mutex);
return 0;
}
-static enum ofperr
-handle_queue_get_config_request(struct ofconn *ofconn,
- const struct ofp_header *oh)
+static void
+put_queue_get_config_reply(struct ofport *port, uint32_t queue,
+ struct ovs_list *replies)
{
- struct ofproto *p = ofconn_get_ofproto(ofconn);
- struct netdev_queue_dump queue_dump;
- struct ofport *ofport;
- unsigned int queue_id;
- struct ofpbuf *reply;
- struct smap details;
- ofp_port_t request;
- enum ofperr error;
+ struct ofputil_queue_config qc;
- error = ofputil_decode_queue_get_config_request(oh, &request);
- if (error) {
- return error;
- }
+ /* None of the existing queues have compatible properties, so we hard-code
+ * omitting min_rate and max_rate. */
+ qc.port = port->ofp_port;
+ qc.queue = queue;
+ qc.min_rate = UINT16_MAX;
+ qc.max_rate = UINT16_MAX;
+ ofputil_append_queue_get_config_reply(&qc, replies);
+}
- ofport = ofproto_get_port(p, request);
- if (!ofport) {
- return OFPERR_OFPQOFC_BAD_PORT;
- }
+static int
+handle_queue_get_config_request_for_port(struct ofport *port, uint32_t queue,
+ struct ovs_list *replies)
+{
+ struct smap details = SMAP_INITIALIZER(&details);
+ if (queue != OFPQ_ALL) {
+ int error = netdev_get_queue(port->netdev, queue, &details);
+ switch (error) {
+ case 0:
+ put_queue_get_config_reply(port, queue, replies);
+ break;
+ case EOPNOTSUPP:
+ case EINVAL:
+ return OFPERR_OFPQOFC_BAD_QUEUE;
+ default:
+ return OFPERR_NXQOFC_QUEUE_ERROR;
+ }
+ } else {
+ struct netdev_queue_dump queue_dump;
+ uint32_t queue_id;
- reply = ofputil_encode_queue_get_config_reply(oh);
+ NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &queue_dump,
+ port->netdev) {
+ put_queue_get_config_reply(port, queue_id, replies);
+ }
+ }
+ smap_destroy(&details);
+ return 0;
+}
- smap_init(&details);
- NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &queue_dump, ofport->netdev) {
- struct ofputil_queue_config queue;
+static enum ofperr
+handle_queue_get_config_request(struct ofconn *ofconn,
+ const struct ofp_header *oh)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct ovs_list replies;
+ struct ofport *port;
+ ofp_port_t req_port;
+ uint32_t req_queue;
+ enum ofperr error;
- /* None of the existing queues have compatible properties, so we
- * hard-code omitting min_rate and max_rate. */
- queue.queue_id = queue_id;
- queue.min_rate = UINT16_MAX;
- queue.max_rate = UINT16_MAX;
- ofputil_append_queue_get_config_reply(reply, &queue);
- }
- smap_destroy(&details);
+ error = ofputil_decode_queue_get_config_request(oh, &req_port, &req_queue);
+ if (error) {
+ return error;
+ }
- ofconn_send_reply(ofconn, reply);
+ ofputil_start_queue_get_config_reply(oh, &replies);
+ if (req_port == OFPP_ANY) {
+ error = OFPERR_OFPQOFC_BAD_QUEUE;
+ HMAP_FOR_EACH (port, hmap_node, &ofproto->ports) {
+ if (!handle_queue_get_config_request_for_port(port, req_queue,
+ &replies)) {
+ error = 0;
+ }
+ }
+ } else {
+ port = ofproto_get_port(ofproto, req_port);
+ error = (port
+ ? handle_queue_get_config_request_for_port(port, req_queue,
+ &replies)
+ : OFPERR_OFPQOFC_BAD_PORT);
+ }
+ if (!error) {
+ ofconn_send_replies(ofconn, &replies);
+ } else {
+ ofpbuf_list_delete(&replies);
+ }
- return 0;
+ return error;
}
static enum ofperr
-init_group(struct ofproto *ofproto, struct ofputil_group_mod *gm,
+init_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm,
struct ofgroup **ofgroup)
{
enum ofperr error;
*CONST_CAST(long long int *, &((*ofgroup)->modified)) = now;
ovs_refcount_init(&(*ofgroup)->ref_count);
- list_move(&(*ofgroup)->buckets, &gm->buckets);
+ list_init(&(*ofgroup)->buckets);
+ ofputil_bucket_clone_list(&(*ofgroup)->buckets, &gm->buckets, NULL);
+
*CONST_CAST(uint32_t *, &(*ofgroup)->n_buckets) =
list_size(&(*ofgroup)->buckets);
* 'ofproto''s group table. Returns 0 on success or an OpenFlow error code on
* failure. */
static enum ofperr
-add_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
+add_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm)
{
struct ofgroup *ofgroup;
enum ofperr error;
ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL);
- if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) {
- VLOG_WARN_RL(&rl, "Duplicate bucket id");
+ if (ofputil_bucket_check_duplicate_id(&new_ofgroup->buckets)) {
+ VLOG_INFO_RL(&rl, "Duplicate bucket id");
return OFPERR_OFPGMFC_BUCKET_EXISTS;
}
/* Rearrange list according to command_bucket_id */
if (command_bucket_id == OFPG15_BUCKET_LAST) {
- struct ofputil_bucket *new_first;
- const struct ofputil_bucket *first;
+ if (!list_is_empty(&ofgroup->buckets)) {
+ struct ofputil_bucket *new_first;
+ const struct ofputil_bucket *first;
- first = ofputil_bucket_list_front(&ofgroup->buckets);
- new_first = ofputil_bucket_find(&new_ofgroup->buckets,
- first->bucket_id);
+ first = ofputil_bucket_list_front(&ofgroup->buckets);
+ new_first = ofputil_bucket_find(&new_ofgroup->buckets,
+ first->bucket_id);
- list_splice(new_ofgroup->buckets.next, &new_first->list_node,
- &new_ofgroup->buckets);
+ list_splice(new_ofgroup->buckets.next, &new_first->list_node,
+ &new_ofgroup->buckets);
+ }
} else if (command_bucket_id <= OFPG15_BUCKET_MAX && last) {
struct ofputil_bucket *after;
* ofproto's ofgroup hash map. Thus, the group is never altered while users of
* the xlate module hold a pointer to the group. */
static enum ofperr
-modify_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
+modify_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm)
{
struct ofgroup *ofgroup, *new_ofgroup, *retiring;
enum ofperr error;
OVS_RELEASES(ofproto->groups_rwlock)
{
struct match match;
- struct ofputil_flow_mod fm;
+ struct ofproto_flow_mod ofm;
/* Delete all flow entries containing this group in a group action */
match_init_catchall(&match);
- flow_mod_init(&fm, &match, 0, NULL, 0, OFPFC_DELETE);
- fm.delete_reason = OFPRR_GROUP_DELETE;
- fm.out_group = ofgroup->group_id;
- handle_flow_mod__(ofproto, &fm, NULL);
+ flow_mod_init(&ofm.fm, &match, 0, NULL, 0, OFPFC_DELETE);
+ ofm.fm.delete_reason = OFPRR_GROUP_DELETE;
+ ofm.fm.out_group = ofgroup->group_id;
+ ofm.fm.table_id = OFPTT_ALL;
+ handle_flow_mod__(ofproto, &ofm, NULL);
hmap_remove(&ofproto->groups, &ofgroup->hmap_node);
/* No-one can find this group any more. */
ovs_rwlock_unlock(&ofproto->groups_rwlock);
}
+/* Delete all groups from 'ofproto'.
+ *
+ * This is intended for use within an ofproto provider's 'destruct'
+ * function. */
+void
+ofproto_group_delete_all(struct ofproto *ofproto)
+{
+ delete_group(ofproto, OFPG_ALL);
+}
+
static enum ofperr
handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh)
{
switch (gm.command) {
case OFPGC11_ADD:
- return add_group(ofproto, &gm);
+ error = add_group(ofproto, &gm);
+ break;
case OFPGC11_MODIFY:
- return modify_group(ofproto, &gm);
+ error = modify_group(ofproto, &gm);
+ break;
case OFPGC11_DELETE:
delete_group(ofproto, gm.group_id);
- return 0;
+ error = 0;
+ break;
case OFPGC15_INSERT_BUCKET:
- return modify_group(ofproto, &gm);
+ error = modify_group(ofproto, &gm);
+ break;
case OFPGC15_REMOVE_BUCKET:
- return modify_group(ofproto, &gm);
+ error = modify_group(ofproto, &gm);
+ break;
default:
if (gm.command > OFPGC11_DELETE) {
- VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d",
+ VLOG_INFO_RL(&rl, "%s: Invalid group_mod command type %d",
ofproto->name, gm.command);
}
- return OFPERR_OFPGMFC_BAD_COMMAND;
+ error = OFPERR_OFPGMFC_BAD_COMMAND;
+ }
+
+ if (!error) {
+ struct ofputil_requestforward rf;
+ rf.xid = oh->xid;
+ rf.reason = OFPRFR_GROUP_MOD;
+ rf.group_mod = &gm;
+ connmgr_send_requestforward(ofproto->connmgr, ofconn, &rf);
}
+ ofputil_bucket_list_destroy(&gm.buckets);
+
+ return error;
}
enum ofputil_table_miss
ofproto_table_get_miss_config(const struct ofproto *ofproto, uint8_t table_id)
{
- enum ofputil_table_miss value;
+ enum ofputil_table_miss miss;
+
+ atomic_read_relaxed(&ofproto->tables[table_id].miss_config, &miss);
+ return miss;
+}
+
+static void
+table_mod__(struct oftable *oftable,
+ const struct ofputil_table_mod *tm)
+{
+ if (tm->miss == OFPUTIL_TABLE_MISS_DEFAULT) {
+ /* This is how an OFPT_TABLE_MOD decodes if it doesn't specify any
+ * table-miss configuration (because the protocol used doesn't have
+ * such a concept), so there's nothing to do. */
+ } else {
+ atomic_store_relaxed(&oftable->miss_config, tm->miss);
+ }
+
+ unsigned int new_eviction = oftable->eviction;
+ if (tm->eviction == OFPUTIL_TABLE_EVICTION_ON) {
+ new_eviction |= EVICTION_OPENFLOW;
+ } else if (tm->eviction == OFPUTIL_TABLE_EVICTION_OFF) {
+ new_eviction &= ~EVICTION_OPENFLOW;
+ }
+
+ if (new_eviction != oftable->eviction) {
+ ovs_mutex_lock(&ofproto_mutex);
+ oftable_configure_eviction(oftable, new_eviction,
+ oftable->eviction_fields,
+ oftable->n_eviction_fields);
+ ovs_mutex_unlock(&ofproto_mutex);
+ }
- atomic_read_relaxed(&ofproto->tables[table_id].miss_config, &value);
- return value;
+ if (tm->vacancy != OFPUTIL_TABLE_VACANCY_DEFAULT) {
+ ovs_mutex_lock(&ofproto_mutex);
+ oftable->vacancy_down = tm->table_vacancy.vacancy_down;
+ oftable->vacancy_up = tm->table_vacancy.vacancy_up;
+ if (tm->vacancy == OFPUTIL_TABLE_VACANCY_OFF) {
+ oftable->vacancy_event = 0;
+ } else if (!oftable->vacancy_event) {
+ uint8_t vacancy = oftable_vacancy(oftable);
+ oftable->vacancy_event = (vacancy < oftable->vacancy_up
+ ? OFPTR_VACANCY_UP
+ : OFPTR_VACANCY_DOWN);
+ }
+ ovs_mutex_unlock(&ofproto_mutex);
+ }
}
static enum ofperr
{
if (!check_table_id(ofproto, tm->table_id)) {
return OFPERR_OFPTMFC_BAD_TABLE;
- } else if (tm->miss_config != OFPUTIL_TABLE_MISS_DEFAULT) {
- if (tm->table_id == OFPTT_ALL) {
- int i;
- for (i = 0; i < ofproto->n_tables; i++) {
- atomic_store_relaxed(&ofproto->tables[i].miss_config,
- tm->miss_config);
+ }
+
+ /* Don't allow the eviction flags to be changed (except to the only fixed
+ * value that OVS supports). OF1.4 says this is normal: "The
+ * OFPTMPT_EVICTION property usually cannot be modified using a
+ * OFP_TABLE_MOD request, because the eviction mechanism is switch
+ * defined". */
+ if (tm->eviction_flags != UINT32_MAX
+ && tm->eviction_flags != OFPROTO_EVICTION_FLAGS) {
+ return OFPERR_OFPTMFC_BAD_CONFIG;
+ }
+
+ if (tm->table_id == OFPTT_ALL) {
+ struct oftable *oftable;
+ OFPROTO_FOR_EACH_TABLE (oftable, ofproto) {
+ if (!(oftable->flags & (OFTABLE_HIDDEN | OFTABLE_READONLY))) {
+ table_mod__(oftable, tm);
}
- } else {
- atomic_store_relaxed(&ofproto->tables[tm->table_id].miss_config,
- tm->miss_config);
}
+ } else {
+ struct oftable *oftable = &ofproto->tables[tm->table_id];
+ if (oftable->flags & OFTABLE_READONLY) {
+ return OFPERR_OFPTMFC_EPERM;
+ }
+ table_mod__(oftable, tm);
}
+
return 0;
}
}
static enum ofperr
-do_bundle_flow_mod_begin(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct ofp_bundle_entry *be)
+ofproto_flow_mod_start(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
- switch (fm->command) {
+ switch (ofm->fm.command) {
case OFPFC_ADD:
- return add_flow_begin(ofproto, fm, &be->rule, &be->modify);
-
+ return add_flow_start(ofproto, ofm);
+ /* , &be->old_rules.stub[0],
+ &be->new_rules.stub[0]); */
case OFPFC_MODIFY:
- return modify_flows_begin_loose(ofproto, fm, &be->rules);
-
+ return modify_flows_start_loose(ofproto, ofm);
case OFPFC_MODIFY_STRICT:
- return modify_flow_begin_strict(ofproto, fm, &be->rules);
-
+ return modify_flow_start_strict(ofproto, ofm);
case OFPFC_DELETE:
- return delete_flows_begin_loose(ofproto, fm, &be->rules);
+ return delete_flows_start_loose(ofproto, ofm);
case OFPFC_DELETE_STRICT:
- return delete_flow_begin_strict(ofproto, fm, &be->rules);
+ return delete_flow_start_strict(ofproto, ofm);
}
return OFPERR_OFPFMFC_BAD_COMMAND;
}
static void
-do_bundle_flow_mod_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- struct ofp_bundle_entry *be)
+ofproto_flow_mod_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm)
OVS_REQUIRES(ofproto_mutex)
{
- switch (fm->command) {
+ switch (ofm->fm.command) {
case OFPFC_ADD:
- add_flow_revert(ofproto, be->modify ? NULL : be->rule);
+ add_flow_revert(ofproto, ofm);
break;
case OFPFC_MODIFY:
case OFPFC_MODIFY_STRICT:
- modify_flows_revert(ofproto, &be->rules);
+ modify_flows_revert(ofproto, ofm);
break;
case OFPFC_DELETE:
case OFPFC_DELETE_STRICT:
- delete_flows_revert(&be->rules);
+ delete_flows_revert(ofproto, ofm);
break;
default:
}
static void
-do_bundle_flow_mod_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
- const struct flow_mod_requester *req,
- struct ofp_bundle_entry *be)
+ofproto_flow_mod_finish(struct ofproto *ofproto,
+ struct ofproto_flow_mod *ofm,
+ const struct flow_mod_requester *req)
OVS_REQUIRES(ofproto_mutex)
{
- switch (fm->command) {
+ switch (ofm->fm.command) {
case OFPFC_ADD:
- add_flow_finish(ofproto, fm, req, be->rule, be->modify);
+ add_flow_finish(ofproto, ofm, req);
break;
case OFPFC_MODIFY:
case OFPFC_MODIFY_STRICT:
- modify_flows_finish(ofproto, fm, req, &be->rules);
+ modify_flows_finish(ofproto, ofm, req);
break;
case OFPFC_DELETE:
case OFPFC_DELETE_STRICT:
- delete_flows_finish(fm, req, &be->rules);
+ delete_flows_finish(ofproto, ofm, req);
break;
default:
/* Commit phases (all while locking ofproto_mutex):
*
- * 1. Gather resources - do not send any events or notifications.
+ * 1. Begin: Gather resources and make changes visible in the next version.
+ * - Mark affected rules for removal in the next version.
+ * - Create new replacement rules, make visible in the next
+ * version.
+ * - Do not send any events or notifications.
*
- * add: Check conflicts, check for a displaced flow. If no displaced flow
- * exists, add the new flow, but mark it as "invisible".
- * mod: Collect affected flows, Do not modify yet.
- * del: Collect affected flows, Do not delete yet.
+ * 2. Revert: Fail if any errors are found. After this point no errors are
+ * possible. No visible changes were made, so rollback is minimal (remove
+ * added invisible rules, restore visibility of rules marked for removal).
*
- * 2a. Fail if any errors are found. After this point no errors are possible.
- * No visible changes were made, so rollback is minimal (remove added invisible
- * flows, revert 'to_be_removed' status of flows).
- *
- * 2b. Commit the changes
- *
- * add: if have displaced flow, modify it, otherwise mark the new flow as
- * "visible".
- * mod: Modify the collected flows.
- * del: Delete the collected flows.
+ * 3. Finish: Make the changes visible for lookups. Insert replacement rules to
+ * the ofproto provider. Remove replaced and deleted rules from ofproto data
+ * structures, and Schedule postponed removal of deleted rules from the
+ * classifier. Send notifications, buffered packets, etc.
*/
static enum ofperr
do_bundle_commit(struct ofconn *ofconn, uint32_t id, uint16_t flags)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ cls_version_t version = ofproto->tables_version + 1;
struct ofp_bundle *bundle;
struct ofp_bundle_entry *be;
enum ofperr error;
if (bundle->flags != flags) {
error = OFPERR_OFPBFC_BAD_FLAGS;
} else {
+ bool prev_is_port_mod = false;
+
error = 0;
ovs_mutex_lock(&ofproto_mutex);
+
+ /* 1. Begin. */
LIST_FOR_EACH (be, node, &bundle->msg_list) {
if (be->type == OFPTYPE_PORT_MOD) {
- /* Not supported yet. */
- error = OFPERR_OFPBFC_MSG_FAILED;
+ /* Our port mods are not atomic. */
+ if (flags & OFPBF_ATOMIC) {
+ error = OFPERR_OFPBFC_MSG_FAILED;
+ } else {
+ prev_is_port_mod = true;
+ error = port_mod_start(ofconn, &be->opm.pm, &be->opm.port);
+ }
} else if (be->type == OFPTYPE_FLOW_MOD) {
- error = do_bundle_flow_mod_begin(ofproto, &be->fm, be);
+ /* Flow mods between port mods are applied as a single
+ * version, but the versions are published only after
+ * we know the commit is successful. */
+ if (prev_is_port_mod) {
+ ++version;
+ }
+ prev_is_port_mod = false;
+ /* Store the version in which the changes should take
+ * effect. */
+ be->ofm.version = version;
+ error = ofproto_flow_mod_start(ofproto, &be->ofm);
} else {
OVS_NOT_REACHED();
}
break;
}
}
+
if (error) {
/* Send error referring to the original message. */
if (error) {
error = OFPERR_OFPBFC_MSG_FAILED;
}
- /* Revert all previous entires. */
+ /* 2. Revert. Undo all the changes made above. */
LIST_FOR_EACH_REVERSE_CONTINUE(be, node, &bundle->msg_list) {
if (be->type == OFPTYPE_FLOW_MOD) {
- do_bundle_flow_mod_revert(ofproto, &be->fm, be);
+ ofproto_flow_mod_revert(ofproto, &be->ofm);
}
+ /* Nothing needs to be reverted for a port mod. */
}
} else {
- /* Finish the changes. */
+ /* 4. Finish. */
LIST_FOR_EACH (be, node, &bundle->msg_list) {
if (be->type == OFPTYPE_FLOW_MOD) {
struct flow_mod_requester req = { ofconn, be->ofp_msg };
- do_bundle_flow_mod_finish(ofproto, &be->fm, &req, be);
+ /* Bump the lookup version to the one of the current
+ * message. This makes all the changes in the bundle at
+ * this version visible to lookups at once. */
+ if (ofproto->tables_version < be->ofm.version) {
+ ofproto->tables_version = be->ofm.version;
+ ofproto->ofproto_class->set_tables_version(
+ ofproto, ofproto->tables_version);
+ }
+
+ ofproto_flow_mod_finish(ofproto, &be->ofm, &req);
+ } else if (be->type == OFPTYPE_PORT_MOD) {
+ /* Perform the actual port mod. This is not atomic, i.e.,
+ * the effects will be immediately seen by upcall
+ * processing regardless of the lookup version. It should
+ * be noted that port configuration changes can originate
+ * also from OVSDB changes asynchronously to all upcall
+ * processing. */
+ port_mod_finish(ofconn, &be->opm.pm, be->opm.port);
}
}
}
+
ofmonitor_flush(ofproto->connmgr);
ovs_mutex_unlock(&ofproto_mutex);
if (error) {
return error;
}
- /* Atomic updates not supported yet. */
- if (bctrl.flags & OFPBF_ATOMIC) {
- return OFPERR_OFPBFC_BAD_FLAGS;
- }
reply.flags = 0;
reply.bundle_id = bctrl.bundle_id;
break;
case OFPBCT_CLOSE_REQUEST:
error = ofp_bundle_close(ofconn, bctrl.bundle_id, bctrl.flags);
- reply.type = OFPBCT_CLOSE_REPLY;;
+ reply.type = OFPBCT_CLOSE_REPLY;
break;
case OFPBCT_COMMIT_REQUEST:
error = do_bundle_commit(ofconn, bctrl.bundle_id, bctrl.flags);
bmsg = ofp_bundle_entry_alloc(type, badd.msg);
if (type == OFPTYPE_PORT_MOD) {
- error = ofputil_decode_port_mod(badd.msg, &bmsg->pm, false);
+ error = ofputil_decode_port_mod(badd.msg, &bmsg->opm.pm, false);
} else if (type == OFPTYPE_FLOW_MOD) {
struct ofpbuf ofpacts;
uint64_t ofpacts_stub[1024 / 8];
ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub);
- error = ofputil_decode_flow_mod(&bmsg->fm, badd.msg,
+ error = ofputil_decode_flow_mod(&bmsg->ofm.fm, badd.msg,
ofconn_get_protocol(ofconn),
&ofpacts,
u16_to_ofp(ofproto->max_ports),
ofproto->n_tables);
/* Move actions to heap. */
- bmsg->fm.ofpacts = ofpbuf_steal_data(&ofpacts);
+ bmsg->ofm.fm.ofpacts = ofpbuf_steal_data(&ofpacts);
- if (!error && bmsg->fm.ofpacts_len) {
- error = ofproto_check_ofpacts(ofproto, bmsg->fm.ofpacts,
- bmsg->fm.ofpacts_len);
+ if (!error && bmsg->ofm.fm.ofpacts_len) {
+ error = ofproto_check_ofpacts(ofproto, bmsg->ofm.fm.ofpacts,
+ bmsg->ofm.fm.ofpacts_len);
}
} else {
OVS_NOT_REACHED();
return error;
}
+static enum ofperr
+handle_tlv_table_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+{
+ struct ofputil_tlv_table_mod ttm;
+ enum ofperr error;
+
+ error = reject_slave_controller(ofconn);
+ if (error) {
+ return error;
+ }
+
+ error = ofputil_decode_tlv_table_mod(oh, &ttm);
+ if (error) {
+ return error;
+ }
+
+ error = tun_metadata_table_mod(&ttm);
+
+ ofputil_uninit_tlv_table(&ttm.mappings);
+ return error;
+}
+
+static enum ofperr
+handle_tlv_table_request(struct ofconn *ofconn, const struct ofp_header *oh)
+{
+ struct ofputil_tlv_table_reply ttr;
+ struct ofpbuf *b;
+
+ tun_metadata_table_request(&ttr);
+ b = ofputil_encode_tlv_table_reply(oh, &ttr);
+ ofputil_uninit_tlv_table(&ttr.mappings);
+
+ ofconn_send_reply(ofconn, b);
+ return 0;
+}
+
static enum ofperr
handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg)
OVS_EXCLUDED(ofproto_mutex)
case OFPTYPE_GET_ASYNC_REQUEST:
return handle_nxt_get_async_request(ofconn, oh);
+ case OFPTYPE_NXT_RESUME:
+ return handle_nxt_resume(ofconn, oh);
+
/* Statistics requests. */
case OFPTYPE_DESC_STATS_REQUEST:
return handle_desc_stats_request(ofconn, oh);
case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
return handle_table_features_request(ofconn, oh);
+ case OFPTYPE_TABLE_DESC_REQUEST:
+ return handle_table_desc_request(ofconn, oh);
+
case OFPTYPE_PORT_STATS_REQUEST:
return handle_port_stats_request(ofconn, oh);
case OFPTYPE_BUNDLE_ADD_MESSAGE:
return handle_bundle_add(ofconn, oh);
+ case OFPTYPE_NXT_TLV_TABLE_MOD:
+ return handle_tlv_table_mod(ofconn, oh);
+
+ case OFPTYPE_NXT_TLV_TABLE_REQUEST:
+ return handle_tlv_table_request(ofconn, oh);
+
case OFPTYPE_HELLO:
case OFPTYPE_ERROR:
case OFPTYPE_FEATURES_REPLY:
case OFPTYPE_METER_CONFIG_STATS_REPLY:
case OFPTYPE_METER_FEATURES_STATS_REPLY:
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
+ case OFPTYPE_TABLE_DESC_REPLY:
case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_REQUESTFORWARD:
+ case OFPTYPE_TABLE_STATUS:
+ case OFPTYPE_NXT_TLV_TABLE_REPLY:
default:
if (ofpmsg_is_stat_request(oh)) {
return OFPERR_OFPBRC_BAD_STAT;
port = ofproto_get_port(ofproto, OFPP_LOCAL);
if (port) {
- uint8_t ea[ETH_ADDR_LEN];
+ struct eth_addr ea;
int error;
- error = netdev_get_etheraddr(port->netdev, ea);
+ error = netdev_get_etheraddr(port->netdev, &ea);
if (!error) {
return eth_addr_to_uint64(ea);
}
static uint64_t
pick_fallback_dpid(void)
{
- uint8_t ea[ETH_ADDR_LEN];
- eth_addr_nicira_random(ea);
+ struct eth_addr ea;
+ eth_addr_nicira_random(&ea);
return eth_addr_to_uint64(ea);
}
\f
struct eviction_group *evg;
*rulep = NULL;
- if (!table->eviction_fields) {
+ if (!table->eviction) {
return false;
}
uint32_t hash;
hash = table->eviction_group_id_basis;
- miniflow_expand(&rule->cr.match.flow, &flow);
+ miniflow_expand(rule->cr.match.flow, &flow);
for (sf = table->eviction_fields;
sf < &table->eviction_fields[table->n_eviction_fields];
sf++)
}
/* Returns an eviction priority for 'rule'. The return value should be
- * interpreted so that higher priorities make a rule more attractive candidates
- * for eviction.
- * Called only if have a timeout. */
-static uint32_t
+ * interpreted so that higher priorities make a rule a more attractive
+ * candidate for eviction. */
+static uint64_t
rule_eviction_priority(struct ofproto *ofproto, struct rule *rule)
OVS_REQUIRES(ofproto_mutex)
{
+ /* Calculate absolute time when this flow will expire. If it will never
+ * expire, then return 0 to make it unevictable. */
long long int expiration = LLONG_MAX;
- long long int modified;
- uint32_t expiration_offset;
-
- /* 'modified' needs protection even when we hold 'ofproto_mutex'. */
- ovs_mutex_lock(&rule->mutex);
- modified = rule->modified;
- ovs_mutex_unlock(&rule->mutex);
-
if (rule->hard_timeout) {
+ /* 'modified' needs protection even when we hold 'ofproto_mutex'. */
+ ovs_mutex_lock(&rule->mutex);
+ long long int modified = rule->modified;
+ ovs_mutex_unlock(&rule->mutex);
+
expiration = modified + rule->hard_timeout * 1000;
}
if (rule->idle_timeout) {
idle_expiration = used + rule->idle_timeout * 1000;
expiration = MIN(expiration, idle_expiration);
}
-
if (expiration == LLONG_MAX) {
return 0;
}
*
* This should work OK for program runs that last UINT32_MAX seconds or
* less. Therefore, please restart OVS at least once every 136 years. */
- expiration_offset = (expiration >> 10) - (time_boot_msec() >> 10);
+ uint32_t expiration_ofs = (expiration >> 10) - (time_boot_msec() >> 10);
- /* Invert the expiration offset because we're using a max-heap. */
- return UINT32_MAX - expiration_offset;
+ /* Combine expiration time with OpenFlow "importance" to form a single
+ * priority value. We want flows with relatively low "importance" to be
+ * evicted before even considering expiration time, so put "importance" in
+ * the most significant bits and expiration time in the least significant
+ * bits.
+ *
+ * Small 'priority' should be evicted before those with large 'priority'.
+ * The caller expects the opposite convention (a large return value being
+ * more attractive for eviction) so we invert it before returning. */
+ uint64_t priority = ((uint64_t) rule->importance << 32) + expiration_ofs;
+ return UINT64_MAX - priority;
}
/* Adds 'rule' to an appropriate eviction group for its oftable's
* so no additional protection is needed. */
has_timeout = rule->hard_timeout || rule->idle_timeout;
- if (table->eviction_fields && has_timeout) {
+ if (table->eviction && has_timeout) {
struct eviction_group *evg;
evg = eviction_group_find(table, eviction_group_hash_rule(rule));
memset(table, 0, sizeof *table);
classifier_init(&table->cls, flow_segment_u64s);
table->max_flows = UINT_MAX;
+ table->n_flows = 0;
+ hmap_init(&table->eviction_groups_by_id);
+ heap_init(&table->eviction_groups_by_size);
atomic_init(&table->miss_config, OFPUTIL_TABLE_MISS_DEFAULT);
classifier_set_prefix_fields(&table->cls, default_prefix_fields,
oftable_destroy(struct oftable *table)
{
ovs_assert(classifier_is_empty(&table->cls));
- oftable_disable_eviction(table);
+
+ ovs_mutex_lock(&ofproto_mutex);
+ oftable_configure_eviction(table, 0, NULL, 0);
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ hmap_destroy(&table->eviction_groups_by_id);
+ heap_destroy(&table->eviction_groups_by_size);
classifier_destroy(&table->cls);
free(table->name);
}
}
}
-/* oftables support a choice of two policies when adding a rule would cause the
- * number of flows in the table to exceed the configured maximum number: either
- * they can refuse to add the new flow or they can evict some existing flow.
- * This function configures the former policy on 'table'. */
-static void
-oftable_disable_eviction(struct oftable *table)
- OVS_REQUIRES(ofproto_mutex)
-{
- if (table->eviction_fields) {
- struct eviction_group *evg, *next;
-
- HMAP_FOR_EACH_SAFE (evg, next, id_node,
- &table->eviction_groups_by_id) {
- eviction_group_destroy(table, evg);
- }
- hmap_destroy(&table->eviction_groups_by_id);
- heap_destroy(&table->eviction_groups_by_size);
-
- free(table->eviction_fields);
- table->eviction_fields = NULL;
- table->n_eviction_fields = 0;
- }
-}
-
/* oftables support a choice of two policies when adding a rule would cause the
* number of flows in the table to exceed the configured maximum number: either
* they can refuse to add the new flow or they can evict some existing flow.
* on the values of the 'n_fields' fields specified in 'fields'. (Specifying
* 'n_fields' as 0 disables fairness.) */
static void
-oftable_enable_eviction(struct oftable *table,
- const struct mf_subfield *fields, size_t n_fields)
+oftable_configure_eviction(struct oftable *table, unsigned int eviction,
+ const struct mf_subfield *fields, size_t n_fields)
OVS_REQUIRES(ofproto_mutex)
{
struct rule *rule;
- if (table->eviction_fields
+ if ((table->eviction != 0) == (eviction != 0)
&& n_fields == table->n_eviction_fields
&& (!n_fields
|| !memcmp(fields, table->eviction_fields,
n_fields * sizeof *fields))) {
- /* No change. */
+ /* The set of eviction fields did not change. If 'eviction' changed,
+ * it remains nonzero, so that we can just update table->eviction
+ * without fussing with the eviction groups. */
+ table->eviction = eviction;
return;
}
- oftable_disable_eviction(table);
-
- table->n_eviction_fields = n_fields;
- table->eviction_fields = xmemdup(fields, n_fields * sizeof *fields);
-
- table->eviction_group_id_basis = random_uint32();
+ /* Destroy existing eviction groups, then destroy and recreate data
+ * structures to recover memory. */
+ struct eviction_group *evg, *next;
+ HMAP_FOR_EACH_SAFE (evg, next, id_node, &table->eviction_groups_by_id) {
+ eviction_group_destroy(table, evg);
+ }
+ hmap_destroy(&table->eviction_groups_by_id);
hmap_init(&table->eviction_groups_by_id);
+ heap_destroy(&table->eviction_groups_by_size);
heap_init(&table->eviction_groups_by_size);
- CLS_FOR_EACH (rule, cr, &table->cls) {
- eviction_group_add_rule(rule);
+ /* Replace eviction groups by the new ones, if there is a change. Free the
+ * old fields only after allocating the new ones, because 'fields ==
+ * table->eviction_fields' is possible. */
+ struct mf_subfield *old_fields = table->eviction_fields;
+ table->n_eviction_fields = n_fields;
+ table->eviction_fields = (fields
+ ? xmemdup(fields, n_fields * sizeof *fields)
+ : NULL);
+ free(old_fields);
+
+ /* Add the new eviction groups, if enabled. */
+ table->eviction = eviction;
+ if (table->eviction) {
+ table->eviction_group_id_basis = random_uint32();
+ CLS_FOR_EACH (rule, cr, &table->cls) {
+ eviction_group_add_rule(rule);
+ }
}
}
{
const struct rule_actions *actions = rule_get_actions(rule);
+ ovs_assert(rule->removed);
+
if (rule->hard_timeout || rule->idle_timeout) {
list_insert(&ofproto->expirable, &rule->expirable);
}
if (actions->has_meter) {
meter_insert_rule(rule);
}
+ rule->removed = false;
}
-/* Removes 'rule' from the ofproto data structures AFTER caller has removed
- * it from the classifier. */
+/* Removes 'rule' from the ofproto data structures. Caller may have deferred
+ * the removal from the classifier. */
static void
ofproto_rule_remove__(struct ofproto *ofproto, struct rule *rule)
OVS_REQUIRES(ofproto_mutex)
{
+ ovs_assert(!rule->removed);
+
cookies_remove(ofproto, rule);
eviction_group_remove_rule(rule);
list_remove(&rule->meter_list_node);
list_init(&rule->meter_list_node);
}
-}
-static void
-oftable_remove_rule(struct rule *rule)
- OVS_REQUIRES(ofproto_mutex)
-{
- struct classifier *cls = &rule->ofproto->tables[rule->table_id].cls;
-
- if (classifier_remove(cls, &rule->cr)) {
- ofproto_rule_remove__(rule->ofproto, rule);
- }
+ rule->removed = true;
}
\f
/* unixctl commands. */
OFPROTO_FOR_EACH_TABLE (oftable, ofproto) {
struct rule *rule;
- CLS_FOR_EACH_TARGET (rule, cr, &oftable->cls, &target) {
- if (minimask_get_vid_mask(&rule->cr.match.mask) == VLAN_VID_MASK) {
- uint16_t vid = miniflow_get_vid(&rule->cr.match.flow);
+ CLS_FOR_EACH_TARGET (rule, cr, &oftable->cls, &target,
+ CLS_MAX_VERSION) {
+ if (minimask_get_vid_mask(rule->cr.match.mask) == VLAN_VID_MASK) {
+ uint16_t vid = miniflow_get_vid(rule->cr.match.flow);
bitmap_set1(vlan_bitmap, vid);
bitmap_set1(ofproto->vlan_bitmap, vid);
projects / cascardo / ovs.git / blobdiff