/* OFOPERATION_MODIFY, OFOPERATION_REPLACE: The old actions, if the actions
* are changing. */
- struct ofpact *ofpacts;
- size_t ofpacts_len;
- uint32_t meter_id;
+ struct rule_actions *actions;
/* OFOPERATION_DELETE. */
enum ofp_flow_removed_reason reason; /* Reason flow was removed. */
const struct mf_subfield *fields,
size_t n_fields);
-static void oftable_remove_rule(struct rule *rule) OVS_RELEASES(rule->rwlock);
+static void oftable_remove_rule(struct rule *rule) OVS_RELEASES(rule->mutex);
static void oftable_remove_rule__(struct ofproto *ofproto,
struct classifier *cls, struct rule *rule)
- OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->rwlock);
+ OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->mutex);
static void oftable_insert_rule(struct rule *);
/* A set of rules within a single OpenFlow table (oftable) that have the same
};
static bool choose_rule_to_evict(struct oftable *table, struct rule **rulep)
- OVS_TRY_WRLOCK(true, (*rulep)->rwlock);
+ OVS_TRY_WRLOCK(true, (*rulep)->mutex);
static void ofproto_evict(struct ofproto *);
static uint32_t rule_eviction_priority(struct rule *);
static void eviction_group_add_rule(struct rule *);
ofp_port_t out_port, uint32_t out_group);
static void rule_criteria_destroy(struct rule_criteria *);
+/* A packet that needs to be passed to rule_execute(). */
+struct rule_execute {
+ struct list list_node; /* In struct ofproto's "rule_executes" list. */
+ struct rule *rule; /* Owns a reference to the rule. */
+ ofp_port_t in_port;
+ struct ofpbuf *packet; /* Owns the packet. */
+};
+
+static void run_rule_executes(struct ofproto *);
+static void destroy_rule_executes(struct ofproto *);
+
/* ofport. */
static void ofport_destroy__(struct ofport *);
static void ofport_destroy(struct ofport *);
static void reinit_ports(struct ofproto *);
/* rule. */
-static void ofproto_rule_destroy(struct rule *);
static void ofproto_rule_destroy__(struct rule *);
static void ofproto_rule_send_removed(struct rule *, uint8_t reason);
static bool rule_is_modifiable(const struct rule *);
const struct rule_collection *);
static void delete_flow__(struct rule *rule, struct ofopgroup *,
enum ofp_flow_removed_reason)
- OVS_RELEASES(rule->rwlock);
+ OVS_RELEASES(rule->mutex);
static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *);
static bool handle_openflow(struct ofconn *, const struct ofpbuf *);
static enum ofperr handle_flow_mod__(struct ofproto *, struct ofconn *,
static size_t n_ofproto_classes;
static size_t allocated_ofproto_classes;
+struct ovs_mutex ofproto_mutex;
+
unsigned flow_eviction_threshold = OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT;
unsigned n_handler_threads;
enum ofproto_flow_miss_model flow_miss_model = OFPROTO_HANDLE_MISS_AUTO;
struct shash_node *node;
size_t i;
+ ovs_mutex_init_recursive(&ofproto_mutex);
+
ofproto_class_register(&ofproto_dpif_class);
/* Make a local copy, since we don't own 'iface_hints' elements. */
}
/* Initialize. */
+ ovs_mutex_lock(&ofproto_mutex);
memset(ofproto, 0, sizeof *ofproto);
ofproto->ofproto_class = class;
ofproto->name = xstrdup(datapath_name);
ofproto->n_tables = 0;
hindex_init(&ofproto->cookies);
list_init(&ofproto->expirable);
- ovs_mutex_init_recursive(&ofproto->expirable_mutex);
ofproto->connmgr = connmgr_create(ofproto, datapath_name, datapath_name);
ofproto->state = S_OPENFLOW;
list_init(&ofproto->pending);
ofproto->n_pending = 0;
hmap_init(&ofproto->deletions);
+ guarded_list_init(&ofproto->rule_executes);
ofproto->n_add = ofproto->n_delete = ofproto->n_modify = 0;
ofproto->first_op = ofproto->last_op = LLONG_MIN;
ofproto->next_op_report = LLONG_MAX;
ofproto->min_mtu = INT_MAX;
ovs_rwlock_init(&ofproto->groups_rwlock);
hmap_init(&ofproto->groups);
+ ovs_mutex_unlock(&ofproto_mutex);
error = ofproto->ofproto_class->construct(ofproto);
if (error) {
group = ofopgroup_create_unattached(ofproto);
ofoperation_create(group, rule, OFOPERATION_DELETE, OFPRR_DELETE);
- ovs_rwlock_wrlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
oftable_remove_rule__(ofproto, cls, rule);
ofproto->ofproto_class->rule_delete(rule);
ofopgroup_submit(group);
ovs_assert(list_is_empty(&ofproto->pending));
ovs_assert(!ofproto->n_pending);
+ destroy_rule_executes(ofproto);
+ guarded_list_destroy(&ofproto->rule_executes);
+
delete_group(ofproto, OFPG_ALL);
ovs_rwlock_destroy(&ofproto->groups_rwlock);
hmap_destroy(&ofproto->groups);
free(ofproto->vlan_bitmap);
- ovs_mutex_destroy(&ofproto->expirable_mutex);
ofproto->ofproto_class->dealloc(ofproto);
}
}
}
+static bool
+any_pending_ops(const struct ofproto *p)
+{
+ return !list_is_empty(&p->pending);
+}
+
int
ofproto_run(struct ofproto *p)
{
VLOG_ERR_RL(&rl, "%s: run failed (%s)", p->name, ovs_strerror(error));
}
+ run_rule_executes(p);
+
/* Restore the eviction group heap invariant occasionally. */
if (p->eviction_group_timer < time_msec()) {
size_t i;
case S_EVICT:
connmgr_run(p->connmgr, NULL);
ofproto_evict(p);
- if (list_is_empty(&p->pending) && hmap_is_empty(&p->deletions)) {
+ if (!any_pending_ops(p)) {
p->state = S_OPENFLOW;
}
break;
case S_FLUSH:
connmgr_run(p->connmgr, NULL);
ofproto_flush__(p);
- if (list_is_empty(&p->pending) && hmap_is_empty(&p->deletions)) {
+ if (!any_pending_ops(p)) {
connmgr_flushed(p->connmgr);
p->state = S_OPENFLOW;
}
case S_EVICT:
case S_FLUSH:
connmgr_wait(p->connmgr, false);
- if (list_is_empty(&p->pending) && hmap_is_empty(&p->deletions)) {
+ if (!any_pending_ops(p)) {
poll_immediate_wake();
}
break;
return error;
}
+static int
+simple_flow_mod(struct ofproto *ofproto,
+ const struct match *match, unsigned int priority,
+ const struct ofpact *ofpacts, size_t ofpacts_len,
+ enum ofp_flow_mod_command command)
+{
+ struct ofputil_flow_mod fm;
+
+ 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.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;
+ return handle_flow_mod__(ofproto, NULL, &fm, NULL);
+}
+
/* Adds a flow to OpenFlow flow table 0 in 'p' that matches 'cls_rule' and
* performs the 'n_actions' actions in 'actions'. The new flow will not
* timeout.
const struct ofpact *ofpacts, size_t ofpacts_len)
{
const struct rule *rule;
+ bool must_add;
+ /* 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. */
ovs_rwlock_rdlock(&ofproto->tables[0].cls.rwlock);
rule = rule_from_cls_rule(classifier_find_match_exactly(
&ofproto->tables[0].cls, match, priority));
+ if (rule) {
+ ovs_mutex_lock(&rule->mutex);
+ must_add = !ofpacts_equal(rule->actions->ofpacts,
+ rule->actions->ofpacts_len,
+ ofpacts, ofpacts_len);
+ ovs_mutex_unlock(&rule->mutex);
+ } else {
+ must_add = true;
+ }
ovs_rwlock_unlock(&ofproto->tables[0].cls.rwlock);
- if (!rule || !ofpacts_equal(rule->ofpacts, rule->ofpacts_len,
- ofpacts, ofpacts_len)) {
- struct ofputil_flow_mod fm;
- memset(&fm, 0, sizeof fm);
- fm.match = *match;
- fm.priority = priority;
- fm.buffer_id = UINT32_MAX;
- fm.ofpacts = ofpacts;
- fm.ofpacts_len = ofpacts_len;
- add_flow(ofproto, NULL, &fm, NULL);
+ /* If there's no such rule or the rule doesn't have the actions we want,
+ * fall back to a executing a full flow mod. We can't optimize this at
+ * all because we didn't take enough locks above to ensure that the flow
+ * table didn't already change beneath us. */
+ if (must_add) {
+ simple_flow_mod(ofproto, match, priority, ofpacts, ofpacts_len,
+ OFPFC_MODIFY_STRICT);
}
}
struct classifier *cls = &ofproto->tables[0].cls;
struct rule *rule;
+ /* First do a cheap check whether the rule we're looking for has already
+ * been deleted. If so, then we're done. */
ovs_rwlock_rdlock(&cls->rwlock);
rule = rule_from_cls_rule(classifier_find_match_exactly(cls, target,
priority));
ovs_rwlock_unlock(&cls->rwlock);
if (!rule) {
- /* No such rule -> success. */
- return true;
- } else if (rule->pending) {
- /* An operation on the rule is already pending -> failure.
- * Caller must retry later if it's important. */
- return false;
- } else {
- /* Initiate deletion -> success. */
- ovs_rwlock_wrlock(&cls->rwlock);
- ofproto_rule_delete(ofproto, cls, rule);
- ovs_rwlock_unlock(&cls->rwlock);
-
return true;
}
+ /* Fall back to a executing a full flow mod. We can't optimize this at all
+ * because we didn't take enough locks above to ensure that the flow table
+ * didn't already change beneath us. */
+ return simple_flow_mod(ofproto, target, priority, NULL, 0,
+ OFPFC_DELETE_STRICT) != OFPROTO_POSTPONE;
}
/* Starts the process of deleting all of the flows from all of ofproto's flow
}
}
\f
-static void
-ofproto_rule_destroy(struct rule *rule)
+void
+ofproto_rule_ref(struct rule *rule)
{
if (rule) {
- rule->ofproto->ofproto_class->rule_destruct(rule);
- ofproto_rule_destroy__(rule);
+ unsigned int orig;
+
+ atomic_add(&rule->ref_count, 1, &orig);
+ ovs_assert(orig != 0);
+ }
+}
+
+void
+ofproto_rule_unref(struct rule *rule)
+{
+ if (rule) {
+ unsigned int orig;
+
+ atomic_sub(&rule->ref_count, 1, &orig);
+ if (orig == 1) {
+ rule->ofproto->ofproto_class->rule_destruct(rule);
+ ofproto_rule_destroy__(rule);
+ } else {
+ ovs_assert(orig != 0);
+ }
}
}
static void
ofproto_rule_destroy__(struct rule *rule)
{
- cls_rule_destroy(&rule->cr);
- free(rule->ofpacts);
- ovs_mutex_destroy(&rule->timeout_mutex);
- ovs_rwlock_destroy(&rule->rwlock);
+ cls_rule_destroy(CONST_CAST(struct cls_rule *, &rule->cr));
+ rule_actions_unref(rule->actions);
+ ovs_mutex_destroy(&rule->mutex);
rule->ofproto->ofproto_class->rule_dealloc(rule);
}
+/* Creates and returns a new 'struct rule_actions', with a ref_count of 1,
+ * whose actions are a copy of from the 'ofpacts_len' bytes of 'ofpacts'. */
+struct rule_actions *
+rule_actions_create(const struct ofpact *ofpacts, size_t ofpacts_len)
+{
+ struct rule_actions *actions;
+
+ actions = xmalloc(sizeof *actions);
+ atomic_init(&actions->ref_count, 1);
+ actions->ofpacts = xmemdup(ofpacts, ofpacts_len);
+ actions->ofpacts_len = ofpacts_len;
+ actions->meter_id = ofpacts_get_meter(ofpacts, ofpacts_len);
+ return actions;
+}
+
+/* Increments 'actions''s ref_count. */
+void
+rule_actions_ref(struct rule_actions *actions)
+{
+ if (actions) {
+ unsigned int orig;
+
+ atomic_add(&actions->ref_count, 1, &orig);
+ ovs_assert(orig != 0);
+ }
+}
+
+/* Decrements 'actions''s ref_count and frees 'actions' if the ref_count
+ * reaches 0. */
+void
+rule_actions_unref(struct rule_actions *actions)
+{
+ if (actions) {
+ unsigned int orig;
+
+ atomic_sub(&actions->ref_count, 1, &orig);
+ if (orig == 1) {
+ free(actions);
+ } else {
+ ovs_assert(orig != 0);
+ }
+ }
+}
+
/* Returns true if 'rule' has an OpenFlow OFPAT_OUTPUT or OFPAT_ENQUEUE action
* that outputs to 'port' (output to OFPP_FLOOD and OFPP_ALL doesn't count). */
-bool
+static bool
ofproto_rule_has_out_port(const struct rule *rule, ofp_port_t port)
{
return (port == OFPP_ANY
- || ofpacts_output_to_port(rule->ofpacts, rule->ofpacts_len, port));
+ || ofpacts_output_to_port(rule->actions->ofpacts,
+ rule->actions->ofpacts_len, port));
}
/* Returns true if 'rule' has group and equals group_id. */
-bool
+static bool
ofproto_rule_has_out_group(const struct rule *rule, uint32_t group_id)
{
return (group_id == OFPG11_ANY
- || ofpacts_output_to_group(rule->ofpacts, rule->ofpacts_len, group_id));
+ || ofpacts_output_to_group(rule->actions->ofpacts,
+ rule->actions->ofpacts_len, group_id));
}
/* Returns true if a rule related to 'op' has an OpenFlow OFPAT_OUTPUT or
case OFOPERATION_MODIFY:
case OFOPERATION_REPLACE:
- return ofpacts_output_to_port(op->ofpacts, op->ofpacts_len, out_port);
+ return ofpacts_output_to_port(op->actions->ofpacts,
+ op->actions->ofpacts_len, out_port);
}
NOT_REACHED();
}
-/* Executes the actions indicated by 'rule' on 'packet' and credits 'rule''s
- * statistics appropriately.
- *
- * 'packet' doesn't necessarily have to match 'rule'. 'rule' will be credited
- * with statistics for 'packet' either way.
- *
- * Takes ownership of 'packet'. */
-static int
-rule_execute(struct rule *rule, ofp_port_t in_port, struct ofpbuf *packet)
+static void
+rule_execute_destroy(struct rule_execute *e)
{
- struct flow flow;
- union flow_in_port in_port_;
+ ofproto_rule_unref(e->rule);
+ list_remove(&e->list_node);
+ free(e);
+}
+
+/* Executes all "rule_execute" operations queued up in ofproto->rule_executes,
+ * by passing them to the ofproto provider. */
+static void
+run_rule_executes(struct ofproto *ofproto)
+{
+ struct rule_execute *e, *next;
+ struct list executes;
+
+ guarded_list_pop_all(&ofproto->rule_executes, &executes);
+ LIST_FOR_EACH_SAFE (e, next, list_node, &executes) {
+ union flow_in_port in_port_;
+ struct flow flow;
- in_port_.ofp_port = in_port;
- flow_extract(packet, 0, 0, NULL, &in_port_, &flow);
- return rule->ofproto->ofproto_class->rule_execute(rule, &flow, packet);
+ in_port_.ofp_port = e->in_port;
+ flow_extract(e->packet, 0, 0, NULL, &in_port_, &flow);
+ ofproto->ofproto_class->rule_execute(e->rule, &flow, e->packet);
+
+ rule_execute_destroy(e);
+ }
+}
+
+/* Destroys and discards all "rule_execute" operations queued up in
+ * ofproto->rule_executes. */
+static void
+destroy_rule_executes(struct ofproto *ofproto)
+{
+ struct rule_execute *e, *next;
+ struct list executes;
+
+ guarded_list_pop_all(&ofproto->rule_executes, &executes);
+ LIST_FOR_EACH_SAFE (e, next, list_node, &executes) {
+ ofpbuf_delete(e->packet);
+ rule_execute_destroy(e);
+ }
}
/* Returns true if 'rule' should be hidden from the controller.
* Rules with priority higher than UINT16_MAX are set up by ofproto itself
* (e.g. by in-band control) and are intentionally hidden from the
* controller. */
-bool
+static bool
ofproto_rule_is_hidden(const struct rule *rule)
{
return rule->cr.priority > UINT16_MAX;
}
}
-/* Finds the OFPACT_METER action, if any, in the 'ofpacts_len' bytes of
- * 'ofpacts'. If found, returns its meter ID; if not, returns 0.
- *
- * This function relies on the order of 'ofpacts' being correct (as checked by
- * ofpacts_verify()). */
-static uint32_t
-find_meter(const struct ofpact ofpacts[], size_t ofpacts_len)
-{
- const struct ofpact *a;
-
- OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
- enum ovs_instruction_type inst;
-
- inst = ovs_instruction_type_from_ofpact_type(a->type);
- if (a->type == OFPACT_METER) {
- return ofpact_get_METER(a)->meter_id;
- } else if (inst > OVSINST_OFPIT13_METER) {
- break;
- }
- }
-
- return 0;
-}
-
/* Checks that the 'ofpacts_len' bytes of actions in 'ofpacts' are appropriate
* for a packet with the prerequisites satisfied by 'flow' in table 'table_id'.
* 'flow' may be temporarily modified, but is restored at return.
return error;
}
- mid = find_meter(ofpacts, ofpacts_len);
+ mid = ofpacts_get_meter(ofpacts, ofpacts_len);
if (mid && ofproto_get_provider_meter_id(ofproto, mid) == UINT32_MAX) {
return OFPERR_OFPMMFC_INVALID_METER;
}
static void
cookies_insert(struct ofproto *ofproto, struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
hindex_insert(&ofproto->cookies, &rule->cookie_node,
hash_cookie(rule->flow_cookie));
static void
cookies_remove(struct ofproto *ofproto, struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
hindex_remove(&ofproto->cookies, &rule->cookie_node);
}
ovs_be64 new_cookie)
{
if (new_cookie != rule->flow_cookie) {
+ ovs_mutex_lock(&ofproto_mutex);
cookies_remove(ofproto, rule);
- ovs_rwlock_wrlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
rule->flow_cookie = new_cookie;
- ovs_rwlock_unlock(&rule->rwlock);
+ ovs_mutex_unlock(&rule->mutex);
cookies_insert(ofproto, rule);
+ ovs_mutex_unlock(&ofproto_mutex);
}
}
if (criteria->cookie_mask == htonll(UINT64_MAX)) {
struct rule *rule;
+ ovs_mutex_lock(&ofproto_mutex);
HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node,
hash_cookie(criteria->cookie),
&ofproto->cookies) {
}
}
}
+ ovs_mutex_unlock(&ofproto_mutex);
} else {
FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) {
struct cls_cursor cursor;
if (criteria->cookie_mask == htonll(UINT64_MAX)) {
struct rule *rule;
+ ovs_mutex_lock(&ofproto_mutex);
HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node,
hash_cookie(criteria->cookie),
&ofproto->cookies) {
}
}
}
+ ovs_mutex_unlock(&ofproto_mutex);
} else {
FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) {
struct rule *rule;
fs.hard_age = age_secs(now - rule->modified);
ofproto->ofproto_class->rule_get_stats(rule, &fs.packet_count,
&fs.byte_count);
- fs.ofpacts = rule->ofpacts;
- fs.ofpacts_len = rule->ofpacts_len;
+ fs.ofpacts = rule->actions->ofpacts;
+ fs.ofpacts_len = rule->actions->ofpacts_len;
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
fs.idle_timeout = rule->idle_timeout;
fs.hard_timeout = rule->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
fs.flags = rule->flags;
ds_put_format(results, "n_bytes=%"PRIu64", ", byte_count);
cls_rule_format(&rule->cr, results);
ds_put_char(results, ',');
- ofpacts_format(rule->ofpacts, rule->ofpacts_len, results);
+ ofpacts_format(rule->actions->ofpacts, rule->actions->ofpacts_len,
+ results);
ds_put_cstr(results, "\n");
}
return false;
}
-static enum ofperr
-evict_rule_from_table(struct ofproto *ofproto, struct oftable *table)
+static bool
+should_evict_a_rule(struct oftable *table, unsigned int extra_space)
{
- struct rule *rule;
- size_t n_rules;
+ size_t count;
ovs_rwlock_rdlock(&table->cls.rwlock);
- n_rules = classifier_count(&table->cls);
+ count = classifier_count(&table->cls);
ovs_rwlock_unlock(&table->cls.rwlock);
- if (n_rules < table->max_flows) {
- return 0;
- } else if (!choose_rule_to_evict(table, &rule)) {
- return OFPERR_OFPFMFC_TABLE_FULL;
- } else if (rule->pending) {
- ovs_rwlock_unlock(&rule->rwlock);
- return OFPROTO_POSTPONE;
- } else {
- struct ofopgroup *group;
+ return count + extra_space > table->max_flows;
+}
- group = ofopgroup_create_unattached(ofproto);
- delete_flow__(rule, group, OFPRR_EVICTION);
- ofopgroup_submit(group);
+static enum ofperr
+evict_rules_from_table(struct ofproto *ofproto, struct oftable *table,
+ unsigned int extra_space)
+{
+ while (should_evict_a_rule(table, extra_space)) {
+ struct rule *rule;
- return 0;
+ if (!choose_rule_to_evict(table, &rule)) {
+ return OFPERR_OFPFMFC_TABLE_FULL;
+ } else if (rule->pending) {
+ ovs_mutex_unlock(&rule->mutex);
+ return OFPROTO_POSTPONE;
+ } else {
+ struct ofopgroup *group = ofopgroup_create_unattached(ofproto);
+ ofoperation_create(group, rule,
+ OFOPERATION_DELETE, OFPRR_EVICTION);
+ oftable_remove_rule(rule);
+ ofproto->ofproto_class->rule_delete(rule);
+ }
}
+
+ return 0;
}
/* Implements OFPFC_ADD and the cases for OFPFC_MODIFY and OFPFC_MODIFY_STRICT
}
/* If necessary, evict an existing rule to clear out space. */
- error = evict_rule_from_table(ofproto, table);
+ error = evict_rules_from_table(ofproto, table, 1);
if (error) {
cls_rule_destroy(&cr);
return error;
}
/* Initialize base state. */
- rule->ofproto = ofproto;
- cls_rule_move(&rule->cr, &cr);
+ *CONST_CAST(struct ofproto **, &rule->ofproto) = ofproto;
+ cls_rule_move(CONST_CAST(struct cls_rule *, &rule->cr), &cr);
+ atomic_init(&rule->ref_count, 1);
rule->pending = NULL;
rule->flow_cookie = fm->new_cookie;
rule->created = rule->modified = rule->used = time_msec();
- ovs_mutex_init(&rule->timeout_mutex);
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_init(&rule->mutex);
+ ovs_mutex_lock(&rule->mutex);
rule->idle_timeout = fm->idle_timeout;
rule->hard_timeout = fm->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
- rule->table_id = table - ofproto->tables;
+ *CONST_CAST(uint8_t *, &rule->table_id) = table - ofproto->tables;
rule->flags = fm->flags & OFPUTIL_FF_STATE;
-
- rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len);
- rule->ofpacts_len = fm->ofpacts_len;
- rule->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len);
+ 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_rwlock_init(&rule->rwlock);
/* Construct rule, initializing derived state. */
error = ofproto->ofproto_class->rule_construct(rule);
}
actions_changed = !ofpacts_equal(fm->ofpacts, fm->ofpacts_len,
- rule->ofpacts, rule->ofpacts_len);
+ rule->actions->ofpacts,
+ rule->actions->ofpacts_len);
op = ofoperation_create(group, rule, type, 0);
ofproto_rule_change_cookie(ofproto, rule, fm->new_cookie);
}
if (type == OFOPERATION_REPLACE) {
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
rule->idle_timeout = fm->idle_timeout;
rule->hard_timeout = fm->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
rule->flags = fm->flags & OFPUTIL_FF_STATE;
if (fm->idle_timeout || fm->hard_timeout) {
reset_counters = (fm->flags & OFPUTIL_FF_RESET_COUNTS) != 0;
if (actions_changed || reset_counters) {
- op->ofpacts = rule->ofpacts;
- op->ofpacts_len = rule->ofpacts_len;
- op->meter_id = rule->meter_id;
+ struct rule_actions *new_actions;
+
+ op->actions = rule->actions;
+ new_actions = rule_actions_create(fm->ofpacts, fm->ofpacts_len);
- ovs_rwlock_wrlock(&rule->rwlock);
- rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len);
- rule->ofpacts_len = fm->ofpacts_len;
- ovs_rwlock_unlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
+ rule->actions = new_actions;
+ ovs_mutex_unlock(&rule->mutex);
- rule->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len);
rule->ofproto->ofproto_class->rule_modify_actions(rule,
reset_counters);
} else {
group = ofopgroup_create(ofproto, ofconn, request, UINT32_MAX);
for (i = 0; i < rules->n; i++) {
struct rule *rule = rules->rules[i];
- ovs_rwlock_wrlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
delete_flow__(rule, group, reason);
}
ofopgroup_submit(group);
fr.table_id = rule->table_id;
calc_duration(rule->created, time_msec(),
&fr.duration_sec, &fr.duration_nsec);
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
fr.idle_timeout = rule->idle_timeout;
fr.hard_timeout = rule->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
rule->ofproto->ofproto_class->rule_get_stats(rule, &fr.packet_count,
&fr.byte_count);
void
ofproto_rule_reduce_timeouts(struct rule *rule,
uint16_t idle_timeout, uint16_t hard_timeout)
- OVS_EXCLUDED(rule->ofproto->expirable_mutex, rule->timeout_mutex)
+ OVS_EXCLUDED(ofproto_mutex, rule->mutex)
{
if (!idle_timeout && !hard_timeout) {
return;
}
- ovs_mutex_lock(&rule->ofproto->expirable_mutex);
+ ovs_mutex_lock(&ofproto_mutex);
if (list_is_empty(&rule->expirable)) {
list_insert(&rule->ofproto->expirable, &rule->expirable);
}
- ovs_mutex_unlock(&rule->ofproto->expirable_mutex);
+ ovs_mutex_unlock(&ofproto_mutex);
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
reduce_timeout(idle_timeout, &rule->idle_timeout);
reduce_timeout(hard_timeout, &rule->hard_timeout);
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
}
\f
static enum ofperr
handle_flow_mod__(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm, const struct ofp_header *oh)
{
- if (ofproto->n_pending >= 50) {
- ovs_assert(!list_is_empty(&ofproto->pending));
- return OFPROTO_POSTPONE;
- }
+ enum ofperr error;
- switch (fm->command) {
- case OFPFC_ADD:
- return add_flow(ofproto, ofconn, fm, oh);
+ if (ofproto->n_pending < 50) {
+ switch (fm->command) {
+ case OFPFC_ADD:
+ error = add_flow(ofproto, ofconn, fm, oh);
+ break;
- case OFPFC_MODIFY:
- return modify_flows_loose(ofproto, ofconn, fm, oh);
+ case OFPFC_MODIFY:
+ error = modify_flows_loose(ofproto, ofconn, fm, oh);
+ break;
- case OFPFC_MODIFY_STRICT:
- return modify_flow_strict(ofproto, ofconn, fm, oh);
+ case OFPFC_MODIFY_STRICT:
+ error = modify_flow_strict(ofproto, ofconn, fm, oh);
+ break;
- case OFPFC_DELETE:
- return delete_flows_loose(ofproto, ofconn, fm, oh);
+ case OFPFC_DELETE:
+ error = delete_flows_loose(ofproto, ofconn, fm, oh);
+ break;
- case OFPFC_DELETE_STRICT:
- return delete_flow_strict(ofproto, ofconn, fm, oh);
+ case OFPFC_DELETE_STRICT:
+ error = delete_flow_strict(ofproto, ofconn, fm, oh);
+ break;
- default:
- if (fm->command > 0xff) {
- VLOG_WARN_RL(&rl, "%s: flow_mod has explicit table_id but "
- "flow_mod_table_id extension is not enabled",
- ofproto->name);
+ default:
+ if (fm->command > 0xff) {
+ VLOG_WARN_RL(&rl, "%s: flow_mod has explicit table_id but "
+ "flow_mod_table_id extension is not enabled",
+ ofproto->name);
+ }
+ error = OFPERR_OFPFMFC_BAD_COMMAND;
+ break;
}
- return OFPERR_OFPFMFC_BAD_COMMAND;
+ } else {
+ ovs_assert(!list_is_empty(&ofproto->pending));
+ error = OFPROTO_POSTPONE;
}
+
+ run_rule_executes(ofproto);
+ return error;
}
static enum ofperr
struct list *msgs)
{
struct ofoperation *op = rule->pending;
+ const struct rule_actions *actions;
struct ofputil_flow_update fu;
struct match match;
fu.event = (flags & (NXFMF_INITIAL | NXFMF_ADD)
? NXFME_ADDED : NXFME_MODIFIED);
fu.reason = 0;
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
fu.idle_timeout = rule->idle_timeout;
fu.hard_timeout = rule->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
fu.table_id = rule->table_id;
fu.cookie = rule->flow_cookie;
minimatch_expand(&rule->cr.match, &match);
fu.match = &match;
fu.priority = rule->cr.priority;
+
if (!(flags & NXFMF_ACTIONS)) {
- fu.ofpacts = NULL;
- fu.ofpacts_len = 0;
+ actions = NULL;
} else if (!op) {
- fu.ofpacts = rule->ofpacts;
- fu.ofpacts_len = rule->ofpacts_len;
+ actions = rule->actions;
} else {
/* An operation is in progress. Use the previous version of the flow's
* actions, so that when the operation commits we report the change. */
case OFOPERATION_MODIFY:
case OFOPERATION_REPLACE:
- if (op->ofpacts) {
- fu.ofpacts = op->ofpacts;
- fu.ofpacts_len = op->ofpacts_len;
- } else {
- fu.ofpacts = rule->ofpacts;
- fu.ofpacts_len = rule->ofpacts_len;
- }
+ actions = op->actions ? op->actions : rule->actions;
break;
case OFOPERATION_DELETE:
- fu.ofpacts = rule->ofpacts;
- fu.ofpacts_len = rule->ofpacts_len;
+ actions = rule->actions;
break;
default:
NOT_REACHED();
}
}
+ fu.ofpacts = actions ? actions->ofpacts : NULL;
+ fu.ofpacts_len = actions ? actions->ofpacts_len : 0;
if (list_is_empty(msgs)) {
ofputil_start_flow_update(msgs);
error = ofconn_pktbuf_retrieve(group->ofconn, group->buffer_id,
&packet, &in_port);
if (packet) {
+ struct rule_execute *re;
+
ovs_assert(!error);
- error = rule_execute(op->rule, in_port, packet);
+
+ ofproto_rule_ref(op->rule);
+
+ re = xmalloc(sizeof *re);
+ re->rule = op->rule;
+ re->in_port = in_port;
+ re->packet = packet;
+
+ if (!guarded_list_push_back(&ofproto->rule_executes,
+ &re->list_node, 1024)) {
+ ofproto_rule_unref(op->rule);
+ ofpbuf_delete(re->packet);
+ free(re);
+ }
}
break;
}
if (!(op->error
|| ofproto_rule_is_hidden(rule)
|| (op->type == OFOPERATION_MODIFY
- && op->ofpacts
+ && op->actions
&& rule->flow_cookie == op->flow_cookie))) {
/* Check that we can just cast from ofoperation_type to
* nx_flow_update_event. */
}
}
} else {
- ovs_rwlock_wrlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
oftable_remove_rule(rule);
- ofproto_rule_destroy(rule);
+ ofproto_rule_unref(rule);
}
break;
case OFOPERATION_DELETE:
ovs_assert(!op->error);
- ofproto_rule_destroy(rule);
+ ofproto_rule_unref(rule);
op->rule = NULL;
break;
}
} else {
ofproto_rule_change_cookie(ofproto, rule, op->flow_cookie);
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
rule->idle_timeout = op->idle_timeout;
rule->hard_timeout = op->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
- if (op->ofpacts) {
- free(rule->ofpacts);
+ ovs_mutex_unlock(&rule->mutex);
+ if (op->actions) {
+ struct rule_actions *old_actions;
- ovs_rwlock_wrlock(&rule->rwlock);
- rule->ofpacts = op->ofpacts;
- rule->ofpacts_len = op->ofpacts_len;
- ovs_rwlock_unlock(&rule->rwlock);
+ ovs_mutex_lock(&rule->mutex);
+ old_actions = rule->actions;
+ rule->actions = op->actions;
+ ovs_mutex_unlock(&rule->mutex);
- op->ofpacts = NULL;
- op->ofpacts_len = 0;
+ op->actions = NULL;
+ rule_actions_unref(old_actions);
}
rule->flags = op->flags;
}
op->type = type;
op->reason = reason;
op->flow_cookie = rule->flow_cookie;
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
op->idle_timeout = rule->idle_timeout;
op->hard_timeout = rule->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
op->flags = rule->flags;
group->n_running++;
hmap_remove(&group->ofproto->deletions, &op->hmap_node);
}
list_remove(&op->group_node);
- free(op->ofpacts);
+ rule_actions_unref(op->actions);
free(op);
}
struct rule *rule;
HEAP_FOR_EACH (rule, evg_node, &evg->rules) {
- if (!ovs_rwlock_trywrlock(&rule->rwlock)) {
+ if (!ovs_mutex_trylock(&rule->mutex)) {
*rulep = rule;
return true;
}
static void
ofproto_evict(struct ofproto *ofproto)
{
- struct ofopgroup *group;
struct oftable *table;
- group = ofopgroup_create_unattached(ofproto);
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
- while (table->eviction_fields) {
- struct rule *rule;
- size_t n_rules;
-
- ovs_rwlock_rdlock(&table->cls.rwlock);
- n_rules = classifier_count(&table->cls);
- ovs_rwlock_unlock(&table->cls.rwlock);
-
- if (n_rules <= table->max_flows) {
- break;
- }
-
- if (!choose_rule_to_evict(table, &rule)) {
- break;
- }
-
- if (rule->pending) {
- ovs_rwlock_unlock(&rule->rwlock);
- break;
- }
-
- ofoperation_create(group, rule,
- OFOPERATION_DELETE, OFPRR_EVICTION);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_delete(rule);
- }
+ evict_rules_from_table(ofproto, table, 0);
}
- ofopgroup_submit(group);
}
\f
/* Eviction groups. */
uint32_t expiration_offset;
/* Calculate time of expiration. */
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
hard_expiration = (rule->hard_timeout
? rule->modified + rule->hard_timeout * 1000
: LLONG_MAX);
? rule->used + rule->idle_timeout * 1000
: LLONG_MAX);
expiration = MIN(hard_expiration, idle_expiration);
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
if (expiration == LLONG_MAX) {
return 0;
}
struct oftable *table = &ofproto->tables[rule->table_id];
bool has_timeout;
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
has_timeout = rule->hard_timeout || rule->idle_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
if (table->eviction_fields && has_timeout) {
struct eviction_group *evg;
static void
oftable_remove_rule__(struct ofproto *ofproto, struct classifier *cls,
struct rule *rule)
- OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->rwlock)
+ OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->mutex)
{
- classifier_remove(cls, &rule->cr);
+ classifier_remove(cls, CONST_CAST(struct cls_rule *, &rule->cr));
+
+ ovs_mutex_lock(&ofproto_mutex);
cookies_remove(ofproto, rule);
+ ovs_mutex_unlock(&ofproto_mutex);
+
eviction_group_remove_rule(rule);
- ovs_mutex_lock(&ofproto->expirable_mutex);
+ ovs_mutex_lock(&ofproto_mutex);
if (!list_is_empty(&rule->expirable)) {
list_remove(&rule->expirable);
}
- ovs_mutex_unlock(&ofproto->expirable_mutex);
+ ovs_mutex_unlock(&ofproto_mutex);
if (!list_is_empty(&rule->meter_list_node)) {
list_remove(&rule->meter_list_node);
list_init(&rule->meter_list_node);
}
- ovs_rwlock_unlock(&rule->rwlock);
+ ovs_mutex_unlock(&rule->mutex);
}
static void
struct oftable *table = &ofproto->tables[rule->table_id];
bool may_expire;
- ovs_mutex_lock(&rule->timeout_mutex);
+ ovs_mutex_lock(&rule->mutex);
may_expire = rule->hard_timeout || rule->idle_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
+ ovs_mutex_unlock(&rule->mutex);
if (may_expire) {
- ovs_mutex_lock(&ofproto->expirable_mutex);
+ ovs_mutex_lock(&ofproto_mutex);
list_insert(&ofproto->expirable, &rule->expirable);
- ovs_mutex_unlock(&ofproto->expirable_mutex);
+ ovs_mutex_unlock(&ofproto_mutex);
}
+
+ ovs_mutex_lock(&ofproto_mutex);
cookies_insert(ofproto, rule);
- if (rule->meter_id) {
- struct meter *meter = ofproto->meters[rule->meter_id];
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ if (rule->actions->meter_id) {
+ struct meter *meter = ofproto->meters[rule->actions->meter_id];
list_insert(&meter->rules, &rule->meter_list_node);
}
ovs_rwlock_wrlock(&table->cls.rwlock);
- classifier_insert(&table->cls, &rule->cr);
+ classifier_insert(&table->cls, CONST_CAST(struct cls_rule *, &rule->cr));
ovs_rwlock_unlock(&table->cls.rwlock);
eviction_group_add_rule(rule);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff