#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
+#include <unistd.h>
#include "bitmap.h"
#include "byte-order.h"
#include "classifier.h"
#include "random.h"
#include "shash.h"
#include "simap.h"
+#include "smap.h"
#include "sset.h"
#include "timeval.h"
#include "unaligned.h"
VLOG_DEFINE_THIS_MODULE(ofproto);
-COVERAGE_DEFINE(ofproto_error);
COVERAGE_DEFINE(ofproto_flush);
-COVERAGE_DEFINE(ofproto_no_packet_in);
COVERAGE_DEFINE(ofproto_packet_out);
COVERAGE_DEFINE(ofproto_queue_req);
COVERAGE_DEFINE(ofproto_recv_openflow);
COVERAGE_DEFINE(ofproto_reinit_ports);
-COVERAGE_DEFINE(ofproto_uninstallable);
COVERAGE_DEFINE(ofproto_update_port);
enum ofproto_state {
enum ofoperation_type {
OFOPERATION_ADD,
OFOPERATION_DELETE,
- OFOPERATION_MODIFY
+ OFOPERATION_MODIFY,
+ OFOPERATION_REPLACE
};
/* A single OpenFlow request can execute any number of operations. The
struct rule *rule; /* Rule being operated upon. */
enum ofoperation_type type; /* Type of operation. */
- /* OFOPERATION_ADD. */
- struct rule *victim; /* Rule being replaced, if any.. */
-
- /* OFOPERATION_MODIFY: The old actions, if the actions are changing. */
- struct ofpact *ofpacts;
- size_t ofpacts_len;
- uint32_t meter_id;
+ /* OFOPERATION_MODIFY, OFOPERATION_REPLACE: The old actions, if the actions
+ * are changing. */
+ struct rule_actions *actions;
/* OFOPERATION_DELETE. */
enum ofp_flow_removed_reason reason; /* Reason flow was removed. */
- ovs_be64 flow_cookie; /* Rule's old flow cookie. */
- enum ofperr error; /* 0 if no error. */
+ ovs_be64 flow_cookie; /* Rule's old flow cookie. */
+ uint16_t idle_timeout; /* Rule's old idle timeout. */
+ uint16_t hard_timeout; /* Rule's old hard timeout. */
+ enum ofputil_flow_mod_flags flags; /* Rule's old flags. */
+ enum ofperr error; /* 0 if no error. */
};
static struct ofoperation *ofoperation_create(struct ofopgroup *,
const struct mf_subfield *fields,
size_t n_fields);
-static void oftable_remove_rule(struct rule *);
-static struct rule *oftable_replace_rule(struct rule *);
-static void oftable_substitute_rule(struct rule *old, struct rule *new);
+static void oftable_remove_rule(struct rule *rule) OVS_REQUIRES(ofproto_mutex);
+static void oftable_remove_rule__(struct ofproto *, struct rule *)
+ OVS_REQUIRES(ofproto_mutex);
+static void oftable_insert_rule(struct rule *);
/* 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
struct heap rules; /* Contains "struct rule"s. */
};
-static struct rule *choose_rule_to_evict(struct oftable *);
-static void ofproto_evict(struct ofproto *);
+static bool choose_rule_to_evict(struct oftable *table, struct rule **rulep);
+static void ofproto_evict(struct ofproto *) OVS_EXCLUDED(ofproto_mutex);
static uint32_t rule_eviction_priority(struct rule *);
+static void eviction_group_add_rule(struct rule *);
+static void eviction_group_remove_rule(struct rule *);
+
+/* Criteria that flow_mod and other operations use for selecting rules on
+ * which to operate. */
+struct rule_criteria {
+ /* An OpenFlow table or 255 for all tables. */
+ uint8_t table_id;
+
+ /* OpenFlow matching criteria. Interpreted different in "loose" way by
+ * collect_rules_loose() and "strict" way by collect_rules_strict(), as
+ * defined in the OpenFlow spec. */
+ struct cls_rule cr;
+
+ /* 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'.
+ * The rule will not be selected if M is 1 and B != C. */
+ ovs_be64 cookie;
+ ovs_be64 cookie_mask;
+
+ /* Selection based on actions within a rule:
+ *
+ * If out_port != OFPP_ANY, selects only rules that output to out_port.
+ * If out_group != OFPG_ALL, select only rules that output to out_group. */
+ ofp_port_t out_port;
+ uint32_t out_group;
+};
+
+static void rule_criteria_init(struct rule_criteria *, uint8_t table_id,
+ const struct match *match,
+ unsigned int priority,
+ ovs_be64 cookie, ovs_be64 cookie_mask,
+ 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().
+ *
+ * (We can't do this immediately from ofopgroup_complete() because that holds
+ * ofproto_mutex, which rule_execute() needs released.) */
+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 *) OVS_EXCLUDED(ofproto_mutex);
+static void destroy_rule_executes(struct ofproto *);
/* ofport. */
-static void ofport_destroy__(struct ofport *);
+static void ofport_destroy__(struct ofport *) OVS_EXCLUDED(ofproto_mutex);
static void ofport_destroy(struct ofport *);
static void update_port(struct ofproto *, const char *devname);
static int init_ports(struct ofproto *);
static void reinit_ports(struct ofproto *);
+static long long int ofport_get_usage(const struct ofproto *,
+ ofp_port_t ofp_port);
+static void ofport_set_usage(struct ofproto *, ofp_port_t ofp_port,
+ long long int last_used);
+static void ofport_remove_usage(struct ofproto *, ofp_port_t ofp_port);
+
+/* Ofport usage.
+ *
+ * Keeps track of the currently used and recently used ofport values and is
+ * used to prevent immediate recycling of ofport values. */
+struct ofport_usage {
+ struct hmap_node hmap_node; /* In struct ofproto's "ofport_usage" hmap. */
+ ofp_port_t ofp_port; /* OpenFlow port number. */
+ long long int last_used; /* Last time the 'ofp_port' was used. LLONG_MAX
+ represents in-use ofports. */
+};
+
/* rule. */
static void ofproto_rule_destroy__(struct rule *);
static void ofproto_rule_send_removed(struct rule *, uint8_t reason);
static enum ofperr add_flow(struct ofproto *, struct ofconn *,
struct ofputil_flow_mod *,
const struct ofp_header *);
-static void delete_flow__(struct rule *, struct ofopgroup *,
- enum ofp_flow_removed_reason);
+static enum ofperr modify_flows__(struct ofproto *, struct ofconn *,
+ struct ofputil_flow_mod *,
+ const struct ofp_header *,
+ const struct rule_collection *);
+static void delete_flow__(struct rule *rule, struct ofopgroup *,
+ enum ofp_flow_removed_reason)
+ OVS_REQUIRES(ofproto_mutex);
+static bool ofproto_group_exists__(const struct ofproto *ofproto,
+ uint32_t group_id)
+ OVS_REQ_RDLOCK(ofproto->groups_rwlock);
+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 bool handle_openflow(struct ofconn *, const struct ofpbuf *);
static enum ofperr handle_flow_mod__(struct ofproto *, struct ofconn *,
struct ofputil_flow_mod *,
- const struct ofp_header *);
+ const struct ofp_header *)
+ OVS_EXCLUDED(ofproto_mutex);
static void calc_duration(long long int start, long long int now,
uint32_t *sec, uint32_t *nsec);
static size_t n_ofproto_classes;
static size_t allocated_ofproto_classes;
+/* Global lock that protects all flow table operations. */
+struct ovs_mutex ofproto_mutex = OVS_MUTEX_INITIALIZER;
+
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;
/* Map from datapath name to struct ofproto, for use by unixctl commands. */
{
const struct ofproto_class *class = ofproto_class_find__(type);
return class ? class->enumerate_names(type, names) : EAFNOSUPPORT;
- }
+}
int
ofproto_create(const char *datapath_name, const char *datapath_type,
}
/* Initialize. */
+ ovs_mutex_lock(&ofproto_mutex);
memset(ofproto, 0, sizeof *ofproto);
ofproto->ofproto_class = class;
ofproto->name = xstrdup(datapath_name);
ofproto->dp_desc = NULL;
ofproto->frag_handling = OFPC_FRAG_NORMAL;
hmap_init(&ofproto->ports);
+ hmap_init(&ofproto->ofport_usage);
shash_init(&ofproto->port_by_name);
simap_init(&ofproto->ofp_requests);
- ofproto->max_ports = OFPP_MAX;
+ ofproto->max_ports = ofp_to_u16(OFPP_MAX);
+ ofproto->eviction_group_timer = LLONG_MIN;
ofproto->tables = NULL;
ofproto->n_tables = 0;
hindex_init(&ofproto->cookies);
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->vlan_bitmap = NULL;
ofproto->vlans_changed = false;
ofproto->min_mtu = INT_MAX;
+ ovs_rwlock_init(&ofproto->groups_rwlock);
+ hmap_init(&ofproto->groups);
+ ovs_mutex_unlock(&ofproto_mutex);
+ ofproto->ogf.capabilities = OFPGFC_CHAINING | OFPGFC_SELECT_LIVENESS |
+ OFPGFC_SELECT_WEIGHT;
+ ofproto->ogf.max_groups[OFPGT11_ALL] = OFPG_MAX;
+ ofproto->ogf.max_groups[OFPGT11_SELECT] = OFPG_MAX;
+ ofproto->ogf.max_groups[OFPGT11_INDIRECT] = OFPG_MAX;
+ ofproto->ogf.max_groups[OFPGT11_FF] = OFPG_MAX;
+ ofproto->ogf.actions[0] =
+ (1 << OFPAT11_OUTPUT) |
+ (1 << OFPAT11_COPY_TTL_OUT) |
+ (1 << OFPAT11_COPY_TTL_IN) |
+ (1 << OFPAT11_SET_MPLS_TTL) |
+ (1 << OFPAT11_DEC_MPLS_TTL) |
+ (1 << OFPAT11_PUSH_VLAN) |
+ (1 << OFPAT11_POP_VLAN) |
+ (1 << OFPAT11_PUSH_MPLS) |
+ (1 << OFPAT11_POP_MPLS) |
+ (1 << OFPAT11_SET_QUEUE) |
+ (1 << OFPAT11_GROUP) |
+ (1 << OFPAT11_SET_NW_TTL) |
+ (1 << OFPAT11_DEC_NW_TTL) |
+ (1 << OFPAT12_SET_FIELD);
+/* not supported:
+ * (1 << OFPAT13_PUSH_PBB) |
+ * (1 << OFPAT13_POP_PBB) */
error = ofproto->ofproto_class->construct(ofproto);
if (error) {
return error;
}
- /* The "max_ports" member should have been set by ->construct(ofproto).
- * Port 0 is not a valid OpenFlow port, so mark that as unavailable. */
- ofproto->ofp_port_ids = bitmap_allocate(ofp_to_u16(ofproto->max_ports));
- bitmap_set1(ofproto->ofp_port_ids, 0);
-
/* Check that hidden tables, if any, are at the end. */
ovs_assert(ofproto->n_tables);
for (i = 0; i + 1 < ofproto->n_tables; i++) {
* Reserved ports numbered OFPP_MAX and higher are special and not subject to
* the 'max_ports' restriction. */
void
-ofproto_init_max_ports(struct ofproto *ofproto, ofp_port_t max_ports)
+ofproto_init_max_ports(struct ofproto *ofproto, uint16_t max_ports)
{
- ovs_assert(ofp_to_u16(max_ports) <= ofp_to_u16(OFPP_MAX));
+ ovs_assert(max_ports <= ofp_to_u16(OFPP_MAX));
ofproto->max_ports = max_ports;
}
}
}
+/* Sets number of upcall handler threads. The default is
+ * (number of online cores - 2). */
+void
+ofproto_set_n_handler_threads(unsigned limit)
+{
+ if (limit) {
+ n_handler_threads = limit;
+ } else {
+ int n_proc = sysconf(_SC_NPROCESSORS_ONLN);
+ n_handler_threads = n_proc > 2 ? n_proc - 2 : 1;
+ }
+}
+
void
ofproto_set_dp_desc(struct ofproto *p, const char *dp_desc)
{
}
table->max_flows = s->max_flows;
+ ovs_rwlock_rdlock(&table->cls.rwlock);
if (classifier_count(&table->cls) > table->max_flows
&& table->eviction_fields) {
/* 'table' contains more flows than allowed. We might not be able to
break;
}
}
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
\f
bool
}
static void
-ofproto_flush__(struct ofproto *ofproto)
+ofproto_rule_delete__(struct ofproto *ofproto, struct rule *rule,
+ uint8_t reason)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ struct ofopgroup *group;
+
+ ovs_assert(!rule->pending);
+
+ group = ofopgroup_create_unattached(ofproto);
+ delete_flow__(rule, group, reason);
+ ofopgroup_submit(group);
+}
+
+/* Deletes 'rule' from 'cls' within 'ofproto'.
+ *
+ * Within an ofproto implementation, this function allows an ofproto
+ * implementation to destroy any rules that remain when its ->destruct()
+ * function is called. This function is not suitable for use elsewhere in an
+ * ofproto implementation.
+ *
+ * This function implements steps 4.4 and 4.5 in the section titled "Rule Life
+ * Cycle" in ofproto-provider.h. */
+void
+ofproto_rule_delete(struct ofproto *ofproto, struct rule *rule)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofopgroup *group;
+
+ ovs_mutex_lock(&ofproto_mutex);
+ ovs_assert(!rule->pending);
+
+ group = ofopgroup_create_unattached(ofproto);
+ ofoperation_create(group, rule, OFOPERATION_DELETE, OFPRR_DELETE);
+ oftable_remove_rule__(ofproto, rule);
+ ofproto->ofproto_class->rule_delete(rule);
+ ofopgroup_submit(group);
+
+ ovs_mutex_unlock(&ofproto_mutex);
+}
+
+static void
+ofproto_flush__(struct ofproto *ofproto)
+ OVS_EXCLUDED(ofproto_mutex)
+{
struct oftable *table;
if (ofproto->ofproto_class->flush) {
ofproto->ofproto_class->flush(ofproto);
}
- group = ofopgroup_create_unattached(ofproto);
+ ovs_mutex_lock(&ofproto_mutex);
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
struct rule *rule, *next_rule;
struct cls_cursor cursor;
continue;
}
+ ovs_rwlock_rdlock(&table->cls.rwlock);
cls_cursor_init(&cursor, &table->cls, NULL);
+ ovs_rwlock_unlock(&table->cls.rwlock);
CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cr, &cursor) {
if (!rule->pending) {
- ofoperation_create(group, rule, OFOPERATION_DELETE,
- OFPRR_DELETE);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_destruct(rule);
+ ofproto_rule_delete__(ofproto, rule, OFPRR_DELETE);
}
}
}
- ofopgroup_submit(group);
+ ovs_mutex_unlock(&ofproto_mutex);
}
+static void delete_group(struct ofproto *ofproto, uint32_t group_id);
+
static void
ofproto_destroy__(struct ofproto *ofproto)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct oftable *table;
ovs_assert(list_is_empty(&ofproto->pending));
- ovs_assert(!ofproto->n_pending);
- if (ofproto->meters) {
- meter_delete(ofproto, 1, ofproto->meter_features.max_meters);
- free(ofproto->meters);
- }
+ 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);
connmgr_destroy(ofproto->connmgr);
free(ofproto->serial_desc);
free(ofproto->dp_desc);
hmap_destroy(&ofproto->ports);
+ hmap_destroy(&ofproto->ofport_usage);
shash_destroy(&ofproto->port_by_name);
- bitmap_free(ofproto->ofp_port_ids);
simap_destroy(&ofproto->ofp_requests);
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
void
ofproto_destroy(struct ofproto *p)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofport *ofport, *next_ofport;
+ struct ofport_usage *usage, *next_usage;
if (!p) {
return;
}
+ if (p->meters) {
+ meter_delete(p, 1, p->meter_features.max_meters);
+ p->meter_features.max_meters = 0;
+ free(p->meters);
+ p->meters = NULL;
+ }
+
ofproto_flush__(p);
HMAP_FOR_EACH_SAFE (ofport, next_ofport, hmap_node, &p->ports) {
ofport_destroy(ofport);
}
+ HMAP_FOR_EACH_SAFE (usage, next_usage, hmap_node, &p->ofport_usage) {
+ hmap_remove(&p->ofport_usage, &usage->hmap_node);
+ free(usage);
+ }
+
p->ofproto_class->destruct(p);
ofproto_destroy__(p);
}
}
}
+static bool
+any_pending_ops(const struct ofproto *p)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ bool b;
+
+ ovs_mutex_lock(&ofproto_mutex);
+ b = !list_is_empty(&p->pending);
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ return b;
+}
+
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;
+
+ p->eviction_group_timer = time_msec() + 1000;
+
+ for (i = 0; i < p->n_tables; i++) {
+ struct oftable *table = &p->tables[i];
+ struct eviction_group *evg;
+ struct cls_cursor cursor;
+ struct rule *rule;
+
+ if (!table->eviction_fields) {
+ continue;
+ }
+
+ ovs_mutex_lock(&ofproto_mutex);
+ HEAP_FOR_EACH (evg, size_node, &table->eviction_groups_by_size) {
+ heap_rebuild(&evg->rules);
+ }
+
+ ovs_rwlock_rdlock(&table->cls.rwlock);
+ cls_cursor_init(&cursor, &table->cls, NULL);
+ CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
+ if (!rule->eviction_group
+ && (rule->idle_timeout || rule->hard_timeout)) {
+ eviction_group_add_rule(rule);
+ }
+ }
+ ovs_rwlock_unlock(&table->cls.rwlock);
+ ovs_mutex_unlock(&ofproto_mutex);
+ }
+ }
+
if (p->ofproto_class->port_poll) {
char *devname;
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;
unsigned int n_rules;
simap_increase(usage, "ports", hmap_count(&ofproto->ports));
+
+ ovs_mutex_lock(&ofproto_mutex);
simap_increase(usage, "ops",
ofproto->n_pending + hmap_count(&ofproto->deletions));
+ ovs_mutex_unlock(&ofproto_mutex);
n_rules = 0;
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
+ ovs_rwlock_rdlock(&table->cls.rwlock);
n_rules += classifier_count(&table->cls);
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
simap_increase(usage, "rules", n_rules);
update_port(ofproto, netdev_name);
}
if (ofp_portp) {
- struct ofproto_port ofproto_port;
-
- ofproto_port_query_by_name(ofproto, netdev_get_name(netdev),
- &ofproto_port);
- *ofp_portp = error ? OFPP_NONE : ofproto_port.ofp_port;
- ofproto_port_destroy(&ofproto_port);
+ *ofp_portp = OFPP_NONE;
+ if (!error) {
+ struct ofproto_port ofproto_port;
+
+ error = ofproto_port_query_by_name(ofproto,
+ netdev_get_name(netdev),
+ &ofproto_port);
+ if (!error) {
+ *ofp_portp = ofproto_port.ofp_port;
+ ofproto_port_destroy(&ofproto_port);
+ }
+ }
}
return error;
}
return error;
}
+static void
+flow_mod_init(struct ofputil_flow_mod *fm,
+ const struct match *match, unsigned int priority,
+ 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->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;
+}
+
+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;
+
+ flow_mod_init(&fm, match, priority, ofpacts, ofpacts_len, command);
+
+ 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.
ofproto_add_flow(struct ofproto *ofproto, const struct match *match,
unsigned int priority,
const struct ofpact *ofpacts, size_t ofpacts_len)
+ OVS_EXCLUDED(ofproto_mutex)
{
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 || !ofpacts_equal(rule->ofpacts, rule->ofpacts_len,
- ofpacts, ofpacts_len)) {
- struct ofputil_flow_mod fm;
+ 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);
- memset(&fm, 0, sizeof fm);
- fm.match = *match;
- fm.priority = priority;
- fm.buffer_id = UINT32_MAX;
- fm.ofpacts = xmemdup(ofpacts, ofpacts_len);
- fm.ofpacts_len = ofpacts_len;
- add_flow(ofproto, NULL, &fm, NULL);
- free(fm.ofpacts);
+ /* 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);
}
}
* OFPERR_* OpenFlow error code on failure, or OFPROTO_POSTPONE if the
* operation cannot be initiated now but may be retried later.
*
- * This is a helper function for in-band control and fail-open. */
+ * This is a helper function for in-band control and fail-open and the "learn"
+ * action. */
int
ofproto_flow_mod(struct ofproto *ofproto, struct ofputil_flow_mod *fm)
+ OVS_EXCLUDED(ofproto_mutex)
{
return handle_flow_mod__(ofproto, NULL, fm, NULL);
}
bool
ofproto_delete_flow(struct ofproto *ofproto,
const struct match *target, unsigned int priority)
+ OVS_EXCLUDED(ofproto_mutex)
{
+ struct classifier *cls = &ofproto->tables[0].cls;
struct rule *rule;
- rule = rule_from_cls_rule(classifier_find_match_exactly(
- &ofproto->tables[0].cls, target, priority));
+ /* 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. */
- struct ofopgroup *group = ofopgroup_create_unattached(ofproto);
- ofoperation_create(group, rule, OFOPERATION_DELETE, OFPRR_DELETE);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_destruct(rule);
- ofopgroup_submit(group);
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
static ofp_port_t
alloc_ofp_port(struct ofproto *ofproto, const char *netdev_name)
{
- uint16_t max_ports = ofp_to_u16(ofproto->max_ports);
uint16_t port_idx;
port_idx = simap_get(&ofproto->ofp_requests, netdev_name);
- if (!port_idx) {
- port_idx = UINT16_MAX;
- }
+ port_idx = port_idx ? port_idx : UINT16_MAX;
- if (port_idx >= max_ports
- || bitmap_is_set(ofproto->ofp_port_ids, port_idx)) {
- uint16_t end_port_no = ofp_to_u16(ofproto->alloc_port_no);
- uint16_t alloc_port_no = end_port_no;
+ if (port_idx >= ofproto->max_ports
+ || ofport_get_usage(ofproto, u16_to_ofp(port_idx)) == LLONG_MAX) {
+ uint16_t lru_ofport = 0, end_port_no = ofproto->alloc_port_no;
+ long long int last_used_at, lru = LLONG_MAX;
/* Search for a free OpenFlow port number. We try not to
* immediately reuse them to prevent problems due to old
- * flows. */
+ * flows.
+ *
+ * We limit the automatically assigned port numbers to the lower half
+ * of the port range, to reserve the upper half for assignment by
+ * controllers. */
for (;;) {
- if (++alloc_port_no >= max_ports) {
- alloc_port_no = 0;
+ if (++ofproto->alloc_port_no >= MIN(ofproto->max_ports, 32768)) {
+ ofproto->alloc_port_no = 1;
}
- if (!bitmap_is_set(ofproto->ofp_port_ids, alloc_port_no)) {
- port_idx = alloc_port_no;
- ofproto->alloc_port_no = u16_to_ofp(alloc_port_no);
+ last_used_at = ofport_get_usage(ofproto,
+ u16_to_ofp(ofproto->alloc_port_no));
+ if (!last_used_at) {
+ port_idx = ofproto->alloc_port_no;
break;
+ } else if ( last_used_at < time_msec() - 60*60*1000) {
+ /* If the port with ofport 'ofproto->alloc_port_no' was deleted
+ * more than an hour ago, consider it usable. */
+ ofport_remove_usage(ofproto,
+ u16_to_ofp(ofproto->alloc_port_no));
+ port_idx = ofproto->alloc_port_no;
+ break;
+ } else if (last_used_at < lru) {
+ lru = last_used_at;
+ lru_ofport = ofproto->alloc_port_no;
}
- if (alloc_port_no == end_port_no) {
+
+ if (ofproto->alloc_port_no == end_port_no) {
+ if (lru_ofport) {
+ port_idx = lru_ofport;
+ break;
+ }
return OFPP_NONE;
}
}
}
- bitmap_set1(ofproto->ofp_port_ids, port_idx);
+ ofport_set_usage(ofproto, u16_to_ofp(port_idx), LLONG_MAX);
return u16_to_ofp(port_idx);
}
static void
-dealloc_ofp_port(const struct ofproto *ofproto, ofp_port_t ofp_port)
+dealloc_ofp_port(struct ofproto *ofproto, ofp_port_t ofp_port)
{
- if (ofp_to_u16(ofp_port) < ofp_to_u16(ofproto->max_ports)) {
- bitmap_set0(ofproto->ofp_port_ids, ofp_to_u16(ofp_port));
+ if (ofp_to_u16(ofp_port) < ofproto->max_ports) {
+ ofport_set_usage(ofproto, ofp_port, time_msec());
}
}
pp->state = netdev_get_carrier(netdev) ? 0 : OFPUTIL_PS_LINK_DOWN;
netdev_get_features(netdev, &pp->curr, &pp->advertised,
&pp->supported, &pp->peer);
- pp->curr_speed = netdev_features_to_bps(pp->curr, 0);
- pp->max_speed = netdev_features_to_bps(pp->supported, 0);
+ pp->curr_speed = netdev_features_to_bps(pp->curr, 0) / 1000;
+ pp->max_speed = netdev_features_to_bps(pp->supported, 0) / 1000;
return netdev;
}
return NULL;
}
+static long long int
+ofport_get_usage(const struct ofproto *ofproto, ofp_port_t ofp_port)
+{
+ struct ofport_usage *usage;
+
+ HMAP_FOR_EACH_IN_BUCKET (usage, hmap_node, hash_ofp_port(ofp_port),
+ &ofproto->ofport_usage) {
+ if (usage->ofp_port == ofp_port) {
+ return usage->last_used;
+ }
+ }
+ return 0;
+}
+
+static void
+ofport_set_usage(struct ofproto *ofproto, ofp_port_t ofp_port,
+ long long int last_used)
+{
+ struct ofport_usage *usage;
+ HMAP_FOR_EACH_IN_BUCKET (usage, hmap_node, hash_ofp_port(ofp_port),
+ &ofproto->ofport_usage) {
+ if (usage->ofp_port == ofp_port) {
+ usage->last_used = last_used;
+ return;
+ }
+ }
+ ovs_assert(last_used == LLONG_MAX);
+
+ usage = xmalloc(sizeof *usage);
+ usage->ofp_port = ofp_port;
+ usage->last_used = last_used;
+ hmap_insert(&ofproto->ofport_usage, &usage->hmap_node,
+ hash_ofp_port(ofp_port));
+}
+
+static void
+ofport_remove_usage(struct ofproto *ofproto, ofp_port_t ofp_port)
+{
+ struct ofport_usage *usage;
+ HMAP_FOR_EACH_IN_BUCKET (usage, hmap_node, hash_ofp_port(ofp_port),
+ &ofproto->ofport_usage) {
+ if (usage->ofp_port == ofp_port) {
+ hmap_remove(&ofproto->ofport_usage, &usage->hmap_node);
+ free(usage);
+ break;
+ }
+ }
+}
+
int
ofproto_port_get_stats(const struct ofport *port, struct netdev_stats *stats)
{
netdev = ofport_open(p, &ofproto_port, &pp);
if (netdev) {
ofport_install(p, netdev, &pp);
+ if (ofp_to_u16(ofproto_port.ofp_port) < p->max_ports) {
+ p->alloc_port_no = MAX(p->alloc_port_no,
+ ofp_to_u16(ofproto_port.ofp_port));
+ }
}
}
}
}
}
\f
+void
+ofproto_rule_ref(struct rule *rule)
+{
+ if (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);
+ }
+ }
+}
+
+struct rule_actions *
+rule_get_actions(const struct rule *rule)
+ OVS_EXCLUDED(rule->mutex)
+{
+ struct rule_actions *actions;
+
+ ovs_mutex_lock(&rule->mutex);
+ actions = rule_get_actions__(rule);
+ ovs_mutex_unlock(&rule->mutex);
+
+ return actions;
+}
+
+struct rule_actions *
+rule_get_actions__(const struct rule *rule)
+ OVS_REQUIRES(rule->mutex)
+{
+ rule_actions_ref(rule->actions);
+ return rule->actions;
+}
+
static void
ofproto_rule_destroy__(struct rule *rule)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
- if (rule) {
- cls_rule_destroy(&rule->cr);
- free(rule->ofpacts);
- ovs_mutex_destroy(&rule->timeout_mutex);
- rule->ofproto->ofproto_class->rule_dealloc(rule);
+ 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);
+}
+
+static uint32_t get_provider_meter_id(const struct ofproto *,
+ uint32_t of_meter_id);
+
+/* 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 ofproto *ofproto,
+ 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->provider_meter_id
+ = get_provider_meter_id(ofproto,
+ 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);
}
}
-/* This function allows an ofproto implementation to destroy any rules that
- * remain when its ->destruct() function is called. The caller must have
- * already uninitialized any derived members of 'rule' (step 5 described in the
- * large comment in ofproto/ofproto-provider.h titled "Life Cycle").
- * This function implements steps 6 and 7.
- *
- * This function should only be called from an ofproto implementation's
- * ->destruct() function. It is not suitable elsewhere. */
+/* Decrements 'actions''s ref_count and frees 'actions' if the ref_count
+ * reaches 0. */
void
-ofproto_rule_destroy(struct rule *rule)
+rule_actions_unref(struct rule_actions *actions)
{
- ovs_assert(!rule->pending);
- oftable_remove_rule(rule);
- ofproto_rule_destroy__(rule);
+ if (actions) {
+ unsigned int orig;
+
+ atomic_sub(&actions->ref_count, 1, &orig);
+ if (orig == 1) {
+ free(actions->ofpacts);
+ 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)
+ OVS_REQUIRES(ofproto_mutex)
{
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. */
+static bool
+ofproto_rule_has_out_group(const struct rule *rule, uint32_t group_id)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ return (group_id == OFPG11_ANY
+ || 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
* OFPAT_ENQUEUE action that outputs to 'out_port'. */
bool
ofoperation_has_out_port(const struct ofoperation *op, ofp_port_t out_port)
+ OVS_REQUIRES(ofproto_mutex)
{
if (ofproto_rule_has_out_port(op->rule, out_port)) {
return true;
switch (op->type) {
case OFOPERATION_ADD:
- return op->victim && ofproto_rule_has_out_port(op->victim, out_port);
-
case OFOPERATION_DELETE:
return false;
case OFOPERATION_MODIFY:
- return ofpacts_output_to_port(op->ofpacts, op->ofpacts_len, out_port);
+ case OFOPERATION_REPLACE:
+ 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' must have at least sizeof(struct
- * ofp10_packet_in) bytes of headroom.
- *
- * '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)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ 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 = 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);
+ }
+}
- ovs_assert(ofpbuf_headroom(packet) >= sizeof(struct ofp10_packet_in));
+/* 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;
- 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);
+ 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.
+/* Checks that the 'ofpacts_len' bytes of action in 'ofpacts' are appropriate
+ * for 'ofproto':
*
- * 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.
- */
+ * - If they use a meter, then 'ofproto' has that meter configured.
+ *
+ * - If they use any groups, then 'ofproto' has that group configured.
+ *
+ * Returns 0 if successful, otherwise an OpenFlow error. */
static enum ofperr
ofproto_check_ofpacts(struct ofproto *ofproto,
- const struct ofpact ofpacts[], size_t ofpacts_len,
- struct flow *flow, uint8_t table_id)
+ const struct ofpact ofpacts[], size_t ofpacts_len)
{
- enum ofperr error;
+ const struct ofpact *a;
uint32_t mid;
- error = ofpacts_check(ofpacts, ofpacts_len, flow, ofproto->max_ports,
- table_id);
- if (error) {
- return error;
+ mid = ofpacts_get_meter(ofpacts, ofpacts_len);
+ if (mid && get_provider_meter_id(ofproto, mid) == UINT32_MAX) {
+ return OFPERR_OFPMMFC_INVALID_METER;
}
- mid = find_meter(ofpacts, ofpacts_len);
- if (mid && ofproto_get_provider_meter_id(ofproto, mid) == UINT32_MAX) {
- return OFPERR_OFPMMFC_INVALID_METER;
+ OFPACT_FOR_EACH (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;
+ }
}
+
return 0;
}
if (error) {
goto exit_free_ofpacts;
}
- if (ofp_to_u16(po.in_port) >= ofp_to_u16(p->max_ports)
+ if (ofp_to_u16(po.in_port) >= p->max_ports
&& ofp_to_u16(po.in_port) < ofp_to_u16(OFPP_MAX)) {
error = OFPERR_OFPBRC_BAD_PORT;
goto exit_free_ofpacts;
}
-
/* Get payload. */
if (po.buffer_id != UINT32_MAX) {
error = ofconn_pktbuf_retrieve(ofconn, po.buffer_id, &payload, NULL);
goto exit_free_ofpacts;
}
} else {
- payload = xmalloc(sizeof *payload);
- ofpbuf_use_const(payload, po.packet, po.packet_len);
+ /* Ensure that the L3 header is 32-bit aligned. */
+ payload = ofpbuf_clone_data_with_headroom(po.packet, po.packet_len, 2);
}
/* Verify actions against packet, then send packet if successful. */
in_port_.ofp_port = po.in_port;
flow_extract(payload, 0, 0, NULL, &in_port_, &flow);
- error = ofproto_check_ofpacts(p, po.ofpacts, po.ofpacts_len, &flow, 0);
+ 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);
ots = xcalloc(p->n_tables, sizeof *ots);
for (i = 0; i < p->n_tables; i++) {
ots[i].table_id = i;
- sprintf(ots[i].name, "table%zu", i);
- ots[i].match = htonll(OFPXMT12_MASK);
- ots[i].wildcards = htonll(OFPXMT12_MASK);
+ sprintf(ots[i].name, "table%"PRIuSIZE, i);
+ ots[i].match = htonll(OFPXMT13_MASK);
+ ots[i].wildcards = htonll(OFPXMT13_MASK);
ots[i].write_actions = htonl(OFPAT11_OUTPUT);
ots[i].apply_actions = htonl(OFPAT11_OUTPUT);
- ots[i].write_setfields = htonll(OFPXMT12_MASK);
- ots[i].apply_setfields = htonll(OFPXMT12_MASK);
- ots[i].metadata_match = htonll(UINT64_MAX);
- ots[i].metadata_write = htonll(UINT64_MAX);
+ ots[i].write_setfields = htonll(OFPXMT13_MASK);
+ ots[i].apply_setfields = htonll(OFPXMT13_MASK);
+ ots[i].metadata_match = OVS_BE64_MAX;
+ ots[i].metadata_write = OVS_BE64_MAX;
ots[i].instructions = htonl(OFPIT11_ALL);
ots[i].config = htonl(OFPTC11_TABLE_MISS_MASK);
ots[i].max_entries = htonl(1000000); /* An arbitrary big number. */
+ ovs_rwlock_rdlock(&p->tables[i].cls.rwlock);
ots[i].active_count = htonl(classifier_count(&p->tables[i].cls));
+ ovs_rwlock_unlock(&p->tables[i].cls.rwlock);
}
p->ofproto_class->get_tables(p, ots);
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);
}
static void
ofproto_rule_change_cookie(struct ofproto *ofproto, struct rule *rule,
ovs_be64 new_cookie)
+ OVS_REQUIRES(ofproto_mutex)
{
if (new_cookie != rule->flow_cookie) {
cookies_remove(ofproto, rule);
+ ovs_mutex_lock(&rule->mutex);
rule->flow_cookie = new_cookie;
+ ovs_mutex_unlock(&rule->mutex);
cookies_insert(ofproto, rule);
}
(TABLE) != NULL; \
(TABLE) = next_matching_table(OFPROTO, TABLE, TABLE_ID))
-/* Searches 'ofproto' for rules in table 'table_id' (or in all tables, if
- * 'table_id' is 0xff) that match 'match' in the "loose" way required for
- * OpenFlow OFPFC_MODIFY and OFPFC_DELETE requests and puts them on list
- * 'rules'.
- *
- * If 'out_port' is anything other than OFPP_ANY, then only rules that output
- * to 'out_port' are included.
- *
- * Hidden rules are always omitted.
+/* Initializes 'criteria' in a straightforward way based on the other
+ * parameters.
*
- * Returns 0 on success, otherwise an OpenFlow error code. */
-static enum ofperr
-collect_rules_loose(struct ofproto *ofproto, uint8_t table_id,
- const struct match *match,
- ovs_be64 cookie, ovs_be64 cookie_mask,
- ofp_port_t out_port, struct list *rules)
+ * For "loose" matching, the 'priority' parameter is unimportant and may be
+ * supplied as 0. */
+static void
+rule_criteria_init(struct rule_criteria *criteria, uint8_t table_id,
+ const struct match *match, unsigned int priority,
+ ovs_be64 cookie, ovs_be64 cookie_mask,
+ ofp_port_t out_port, uint32_t out_group)
{
- struct oftable *table;
- struct cls_rule cr;
- enum ofperr error;
+ criteria->table_id = table_id;
+ cls_rule_init(&criteria->cr, match, priority);
+ criteria->cookie = cookie;
+ criteria->cookie_mask = cookie_mask;
+ criteria->out_port = out_port;
+ criteria->out_group = out_group;
+}
- error = check_table_id(ofproto, table_id);
- if (error) {
- return error;
- }
+static void
+rule_criteria_destroy(struct rule_criteria *criteria)
+{
+ cls_rule_destroy(&criteria->cr);
+}
- list_init(rules);
- cls_rule_init(&cr, match, 0);
+void
+rule_collection_init(struct rule_collection *rules)
+{
+ rules->rules = rules->stub;
+ rules->n = 0;
+ rules->capacity = ARRAY_SIZE(rules->stub);
+}
- if (cookie_mask == htonll(UINT64_MAX)) {
- struct rule *rule;
+void
+rule_collection_add(struct rule_collection *rules, struct rule *rule)
+{
+ if (rules->n >= rules->capacity) {
+ size_t old_size, new_size;
- HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, hash_cookie(cookie),
- &ofproto->cookies) {
- if (table_id != rule->table_id && table_id != 0xff) {
- continue;
- }
- if (ofproto_rule_is_hidden(rule)) {
- continue;
- }
- if (cls_rule_is_loose_match(&rule->cr, &cr.match)) {
- if (rule->pending) {
- error = OFPROTO_POSTPONE;
- goto exit;
- }
- if (rule->flow_cookie == cookie /* Hash collisions possible. */
- && ofproto_rule_has_out_port(rule, out_port)) {
- list_push_back(rules, &rule->ofproto_node);
- }
- }
+ old_size = rules->capacity * sizeof *rules->rules;
+ rules->capacity *= 2;
+ new_size = rules->capacity * sizeof *rules->rules;
+
+ if (rules->rules == rules->stub) {
+ rules->rules = xmalloc(new_size);
+ memcpy(rules->rules, rules->stub, old_size);
+ } else {
+ rules->rules = xrealloc(rules->rules, new_size);
+ }
+ }
+
+ rules->rules[rules->n++] = rule;
+}
+
+void
+rule_collection_ref(struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ size_t i;
+
+ for (i = 0; i < rules->n; i++) {
+ ofproto_rule_ref(rules->rules[i]);
+ }
+}
+
+void
+rule_collection_unref(struct rule_collection *rules)
+{
+ size_t i;
+
+ for (i = 0; i < rules->n; i++) {
+ ofproto_rule_unref(rules->rules[i]);
+ }
+}
+
+void
+rule_collection_destroy(struct rule_collection *rules)
+{
+ if (rules->rules != rules->stub) {
+ free(rules->rules);
+ }
+}
+
+static enum ofperr
+collect_rule(struct rule *rule, const struct rule_criteria *c,
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ /* We ordinarily want to skip hidden rules, but there has to be a way for
+ * code internal to OVS to modify and delete them, so if the criteria
+ * specify a priority that can only be for a hidden flow, then allow hidden
+ * rules to be selected. (This doesn't allow OpenFlow clients to meddle
+ * with hidden flows because OpenFlow uses only a 16-bit field to specify
+ * priority.) */
+ if (ofproto_rule_is_hidden(rule) && c->cr.priority <= UINT16_MAX) {
+ return 0;
+ } else if (rule->pending) {
+ return OFPROTO_POSTPONE;
+ } else {
+ if ((c->table_id == rule->table_id || c->table_id == 0xff)
+ && ofproto_rule_has_out_port(rule, c->out_port)
+ && ofproto_rule_has_out_group(rule, c->out_group)
+ && !((rule->flow_cookie ^ c->cookie) & c->cookie_mask)) {
+ rule_collection_add(rules, rule);
}
+ return 0;
+ }
+}
+
+/* Searches 'ofproto' for rules that match the criteria in 'criteria'. Matches
+ * on classifiers rules are done in the "loose" way required for OpenFlow
+ * OFPFC_MODIFY and OFPFC_DELETE requests. Puts the selected rules on list
+ * 'rules'.
+ *
+ * Hidden rules are always omitted.
+ *
+ * Returns 0 on success, otherwise an OpenFlow error code. */
+static enum ofperr
+collect_rules_loose(struct ofproto *ofproto,
+ const struct rule_criteria *criteria,
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ struct oftable *table;
+ enum ofperr error;
+
+ rule_collection_init(rules);
+
+ error = check_table_id(ofproto, criteria->table_id);
+ if (error) {
goto exit;
}
- FOR_EACH_MATCHING_TABLE (table, table_id, ofproto) {
- struct cls_cursor cursor;
+ if (criteria->cookie_mask == OVS_BE64_MAX) {
struct rule *rule;
- cls_cursor_init(&cursor, &table->cls, &cr);
- CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
- if (rule->pending) {
- error = OFPROTO_POSTPONE;
- goto exit;
+ HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node,
+ hash_cookie(criteria->cookie),
+ &ofproto->cookies) {
+ if (cls_rule_is_loose_match(&rule->cr, &criteria->cr.match)) {
+ error = collect_rule(rule, criteria, rules);
+ if (error) {
+ break;
+ }
}
- if (!ofproto_rule_is_hidden(rule)
- && ofproto_rule_has_out_port(rule, out_port)
- && !((rule->flow_cookie ^ cookie) & cookie_mask)) {
- list_push_back(rules, &rule->ofproto_node);
+ }
+ } else {
+ FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) {
+ struct cls_cursor cursor;
+ struct rule *rule;
+
+ ovs_rwlock_rdlock(&table->cls.rwlock);
+ cls_cursor_init(&cursor, &table->cls, &criteria->cr);
+ CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
+ error = collect_rule(rule, criteria, rules);
+ if (error) {
+ break;
+ }
}
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
}
exit:
- cls_rule_destroy(&cr);
+ if (error) {
+ rule_collection_destroy(rules);
+ }
return error;
}
-/* Searches 'ofproto' for rules in table 'table_id' (or in all tables, if
- * 'table_id' is 0xff) that match 'match' in the "strict" way required for
- * OpenFlow OFPFC_MODIFY_STRICT and OFPFC_DELETE_STRICT requests and puts them
- * on list 'rules'.
- *
- * If 'out_port' is anything other than OFPP_ANY, then only rules that output
- * to 'out_port' are included.
+/* Searches 'ofproto' for rules that match the criteria in 'criteria'. Matches
+ * on classifiers rules are done in the "strict" way required for OpenFlow
+ * OFPFC_MODIFY_STRICT and OFPFC_DELETE_STRICT requests. Puts the selected
+ * rules on list 'rules'.
*
* Hidden rules are always omitted.
*
* Returns 0 on success, otherwise an OpenFlow error code. */
static enum ofperr
-collect_rules_strict(struct ofproto *ofproto, uint8_t table_id,
- const struct match *match, unsigned int priority,
- ovs_be64 cookie, ovs_be64 cookie_mask,
- ofp_port_t out_port, struct list *rules)
+collect_rules_strict(struct ofproto *ofproto,
+ const struct rule_criteria *criteria,
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
struct oftable *table;
- struct cls_rule cr;
int error;
- error = check_table_id(ofproto, table_id);
+ rule_collection_init(rules);
+
+ error = check_table_id(ofproto, criteria->table_id);
if (error) {
- return error;
+ goto exit;
}
- list_init(rules);
- cls_rule_init(&cr, match, priority);
-
- if (cookie_mask == htonll(UINT64_MAX)) {
+ if (criteria->cookie_mask == OVS_BE64_MAX) {
struct rule *rule;
- HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, hash_cookie(cookie),
+ HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node,
+ hash_cookie(criteria->cookie),
&ofproto->cookies) {
- if (table_id != rule->table_id && table_id != 0xff) {
- continue;
- }
- if (ofproto_rule_is_hidden(rule)) {
- continue;
- }
- if (cls_rule_equal(&rule->cr, &cr)) {
- if (rule->pending) {
- error = OFPROTO_POSTPONE;
- goto exit;
- }
- if (rule->flow_cookie == cookie /* Hash collisions possible. */
- && ofproto_rule_has_out_port(rule, out_port)) {
- list_push_back(rules, &rule->ofproto_node);
+ if (cls_rule_equal(&rule->cr, &criteria->cr)) {
+ error = collect_rule(rule, criteria, rules);
+ if (error) {
+ break;
}
}
}
- goto exit;
- }
-
- FOR_EACH_MATCHING_TABLE (table, table_id, ofproto) {
- struct rule *rule;
+ } else {
+ FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) {
+ struct rule *rule;
- rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls,
- &cr));
- if (rule) {
- if (rule->pending) {
- error = OFPROTO_POSTPONE;
- goto exit;
- }
- if (!ofproto_rule_is_hidden(rule)
- && ofproto_rule_has_out_port(rule, out_port)
- && !((rule->flow_cookie ^ cookie) & cookie_mask)) {
- list_push_back(rules, &rule->ofproto_node);
+ ovs_rwlock_rdlock(&table->cls.rwlock);
+ rule = rule_from_cls_rule(classifier_find_rule_exactly(
+ &table->cls, &criteria->cr));
+ ovs_rwlock_unlock(&table->cls.rwlock);
+ if (rule) {
+ error = collect_rule(rule, criteria, rules);
+ if (error) {
+ break;
+ }
}
}
}
exit:
- cls_rule_destroy(&cr);
- return 0;
+ if (error) {
+ rule_collection_destroy(rules);
+ }
+ return error;
}
/* Returns 'age_ms' (a duration in milliseconds), converted to seconds and
static enum ofperr
handle_flow_stats_request(struct ofconn *ofconn,
const struct ofp_header *request)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
struct ofputil_flow_stats_request fsr;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
struct list replies;
- struct list rules;
- struct rule *rule;
enum ofperr error;
+ size_t i;
error = ofputil_decode_flow_stats_request(&fsr, request);
if (error) {
return error;
}
- error = collect_rules_loose(ofproto, fsr.table_id, &fsr.match,
- fsr.cookie, fsr.cookie_mask,
- fsr.out_port, &rules);
+ rule_criteria_init(&criteria, fsr.table_id, &fsr.match, 0, 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_destroy(&criteria);
+ if (!error) {
+ rule_collection_ref(&rules);
+ }
+ ovs_mutex_unlock(&ofproto_mutex);
+
if (error) {
return error;
}
ofpmp_init(&replies, request);
- LIST_FOR_EACH (rule, ofproto_node, &rules) {
+ for (i = 0; i < rules.n; i++) {
+ struct rule *rule = rules.rules[i];
long long int now = time_msec();
struct ofputil_flow_stats fs;
+ long long int created, used, modified;
+ struct rule_actions *actions;
+ enum ofputil_flow_mod_flags flags;
- minimatch_expand(&rule->cr.match, &fs.match);
- fs.priority = rule->cr.priority;
+ ovs_mutex_lock(&rule->mutex);
fs.cookie = rule->flow_cookie;
+ fs.idle_timeout = rule->idle_timeout;
+ fs.hard_timeout = rule->hard_timeout;
+ created = rule->created;
+ used = rule->used;
+ modified = rule->modified;
+ actions = rule_get_actions__(rule);
+ flags = rule->flags;
+ ovs_mutex_unlock(&rule->mutex);
+
+ minimatch_expand(&rule->cr.match, &fs.match);
fs.table_id = rule->table_id;
- calc_duration(rule->created, now, &fs.duration_sec, &fs.duration_nsec);
- fs.idle_age = age_secs(now - rule->used);
- fs.hard_age = age_secs(now - rule->modified);
+ calc_duration(created, now, &fs.duration_sec, &fs.duration_nsec);
+ fs.priority = rule->cr.priority;
+ fs.idle_age = age_secs(now - used);
+ fs.hard_age = age_secs(now - 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.flags = 0;
+ fs.ofpacts = actions->ofpacts;
+ fs.ofpacts_len = actions->ofpacts_len;
- ovs_mutex_lock(&rule->timeout_mutex);
- fs.idle_timeout = rule->idle_timeout;
- fs.hard_timeout = rule->hard_timeout;
- ovs_mutex_unlock(&rule->timeout_mutex);
-
- if (rule->send_flow_removed) {
- fs.flags |= OFPFF_SEND_FLOW_REM;
- /* FIXME: Implement OF 1.3 flags OFPFF13_NO_PKT_COUNTS
- and OFPFF13_NO_BYT_COUNTS */
- }
+ fs.flags = flags;
ofputil_append_flow_stats_reply(&fs, &replies);
+
+ rule_actions_unref(actions);
}
+
+ rule_collection_unref(&rules);
+ rule_collection_destroy(&rules);
+
ofconn_send_replies(ofconn, &replies);
return 0;
flow_stats_ds(struct rule *rule, struct ds *results)
{
uint64_t packet_count, byte_count;
+ struct rule_actions *actions;
+ long long int created;
rule->ofproto->ofproto_class->rule_get_stats(rule,
&packet_count, &byte_count);
+ ovs_mutex_lock(&rule->mutex);
+ actions = rule_get_actions__(rule);
+ created = rule->created;
+ ovs_mutex_unlock(&rule->mutex);
+
if (rule->table_id != 0) {
ds_put_format(results, "table_id=%"PRIu8", ", rule->table_id);
}
- ds_put_format(results, "duration=%llds, ",
- (time_msec() - rule->created) / 1000);
- ds_put_format(results, "priority=%u, ", rule->cr.priority);
+ ds_put_format(results, "duration=%llds, ", (time_msec() - created) / 1000);
ds_put_format(results, "n_packets=%"PRIu64", ", packet_count);
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);
+
+ ds_put_cstr(results, "actions=");
+ ofpacts_format(actions->ofpacts, actions->ofpacts_len, results);
+
ds_put_cstr(results, "\n");
+
+ rule_actions_unref(actions);
}
/* Adds a pretty-printed description of all flows to 'results', including
struct cls_cursor cursor;
struct rule *rule;
+ ovs_rwlock_rdlock(&table->cls.rwlock);
cls_cursor_init(&cursor, &table->cls, NULL);
CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
flow_stats_ds(rule, results);
}
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
}
static enum ofperr
handle_aggregate_stats_request(struct ofconn *ofconn,
const struct ofp_header *oh)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
struct ofputil_flow_stats_request request;
struct ofputil_aggregate_stats stats;
bool unknown_packets, unknown_bytes;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
struct ofpbuf *reply;
- struct list rules;
- struct rule *rule;
enum ofperr error;
+ size_t i;
error = ofputil_decode_flow_stats_request(&request, oh);
if (error) {
return error;
}
- error = collect_rules_loose(ofproto, request.table_id, &request.match,
- request.cookie, request.cookie_mask,
- request.out_port, &rules);
+ rule_criteria_init(&criteria, request.table_id, &request.match, 0,
+ request.cookie, request.cookie_mask,
+ request.out_port, request.out_group);
+
+ ovs_mutex_lock(&ofproto_mutex);
+ error = collect_rules_loose(ofproto, &criteria, &rules);
+ rule_criteria_destroy(&criteria);
+ if (!error) {
+ rule_collection_ref(&rules);
+ }
+ ovs_mutex_unlock(&ofproto_mutex);
+
if (error) {
return error;
}
memset(&stats, 0, sizeof stats);
unknown_packets = unknown_bytes = false;
- LIST_FOR_EACH (rule, ofproto_node, &rules) {
+ for (i = 0; i < rules.n; i++) {
+ struct rule *rule = rules.rules[i];
uint64_t packet_count;
uint64_t byte_count;
stats.byte_count = UINT64_MAX;
}
+ rule_collection_unref(&rules);
+ rule_collection_destroy(&rules);
+
reply = ofputil_encode_aggregate_stats_reply(&stats, oh);
ofconn_send_reply(ofconn, reply);
is_flow_deletion_pending(const struct ofproto *ofproto,
const struct cls_rule *cls_rule,
uint8_t table_id)
+ OVS_REQUIRES(ofproto_mutex)
{
if (!hmap_is_empty(&ofproto->deletions)) {
struct ofoperation *op;
return false;
}
+static bool
+should_evict_a_rule(struct oftable *table, unsigned int extra_space)
+ OVS_REQUIRES(ofproto_mutex)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
+{
+ return classifier_count(&table->cls) + extra_space > table->max_flows;
+}
+
+static enum ofperr
+evict_rules_from_table(struct ofproto *ofproto, struct oftable *table,
+ unsigned int extra_space)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ while (should_evict_a_rule(table, extra_space)) {
+ struct rule *rule;
+
+ if (!choose_rule_to_evict(table, &rule)) {
+ return OFPERR_OFPFMFC_TABLE_FULL;
+ } else if (rule->pending) {
+ return OFPROTO_POSTPONE;
+ } else {
+ struct ofopgroup *group = ofopgroup_create_unattached(ofproto);
+ delete_flow__(rule, group, OFPRR_EVICTION);
+ ofopgroup_submit(group);
+ }
+ }
+
+ return 0;
+}
+
/* Implements OFPFC_ADD and the cases for OFPFC_MODIFY and OFPFC_MODIFY_STRICT
* in which no matching flow already exists in the flow table.
*
* error code on failure, or OFPROTO_POSTPONE if the operation cannot be
* initiated now but may be retried later.
*
- * Upon successful return, takes ownership of 'fm->ofpacts'. On failure,
- * ownership remains with the caller.
+ * The caller retains ownership of 'fm->ofpacts'.
*
* 'ofconn' is used to retrieve the packet buffer specified in ofm->buffer_id,
* if any. */
static enum ofperr
add_flow(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm, const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
struct oftable *table;
struct ofopgroup *group;
- struct rule *victim;
+ struct cls_rule cr;
struct rule *rule;
uint8_t table_id;
int error;
return OFPERR_OFPBRC_EPERM;
}
- /* Verify actions. */
- error = ofproto_check_ofpacts(ofproto, fm->ofpacts, fm->ofpacts_len,
- &fm->match.flow, table_id);
- if (error) {
- return error;
- }
+ cls_rule_init(&cr, &fm->match, fm->priority);
- /* Allocate new rule and initialize classifier rule. */
- rule = ofproto->ofproto_class->rule_alloc();
- if (!rule) {
- VLOG_WARN_RL(&rl, "%s: failed to create rule (%s)",
- ofproto->name, ovs_strerror(error));
- return ENOMEM;
+ /* Transform "add" into "modify" if there's an existing identical flow. */
+ ovs_rwlock_rdlock(&table->cls.rwlock);
+ rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, &cr));
+ ovs_rwlock_unlock(&table->cls.rwlock);
+ if (rule) {
+ cls_rule_destroy(&cr);
+ if (!rule_is_modifiable(rule)) {
+ return OFPERR_OFPBRC_EPERM;
+ } else if (rule->pending) {
+ return OFPROTO_POSTPONE;
+ } else {
+ struct rule_collection rules;
+
+ rule_collection_init(&rules);
+ rule_collection_add(&rules, rule);
+ fm->modify_cookie = true;
+ error = modify_flows__(ofproto, ofconn, fm, request, &rules);
+ rule_collection_destroy(&rules);
+
+ return error;
+ }
}
- cls_rule_init(&rule->cr, &fm->match, fm->priority);
/* Serialize against pending deletion. */
- if (is_flow_deletion_pending(ofproto, &rule->cr, table_id)) {
- cls_rule_destroy(&rule->cr);
- ofproto->ofproto_class->rule_dealloc(rule);
+ if (is_flow_deletion_pending(ofproto, &cr, table_id)) {
+ cls_rule_destroy(&cr);
return OFPROTO_POSTPONE;
}
/* Check for overlap, if requested. */
- if (fm->flags & OFPFF_CHECK_OVERLAP
- && classifier_rule_overlaps(&table->cls, &rule->cr)) {
- cls_rule_destroy(&rule->cr);
- ofproto->ofproto_class->rule_dealloc(rule);
- return OFPERR_OFPFMFC_OVERLAP;
+ if (fm->flags & OFPUTIL_FF_CHECK_OVERLAP) {
+ bool overlaps;
+
+ ovs_rwlock_rdlock(&table->cls.rwlock);
+ overlaps = classifier_rule_overlaps(&table->cls, &cr);
+ ovs_rwlock_unlock(&table->cls.rwlock);
+
+ if (overlaps) {
+ cls_rule_destroy(&cr);
+ return OFPERR_OFPFMFC_OVERLAP;
+ }
+ }
+
+ /* If necessary, evict an existing rule to clear out space. */
+ error = evict_rules_from_table(ofproto, table, 1);
+ if (error) {
+ cls_rule_destroy(&cr);
+ return error;
}
- /* FIXME: Implement OFPFF12_RESET_COUNTS */
+ /* Allocate new rule. */
+ rule = ofproto->ofproto_class->rule_alloc();
+ if (!rule) {
+ cls_rule_destroy(&cr);
+ VLOG_WARN_RL(&rl, "%s: failed to create rule (%s)",
+ ofproto->name, ovs_strerror(error));
+ return ENOMEM;
+ }
- rule->ofproto = ofproto;
+ /* Initialize base state. */
+ *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_ADAPTIVE);
- 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);
-
- rule->table_id = table - ofproto->tables;
- rule->send_flow_removed = (fm->flags & OFPFF_SEND_FLOW_REM) != 0;
- /* FIXME: Implement OF 1.3 flags OFPFF13_NO_PKT_COUNTS
- and OFPFF13_NO_BYT_COUNTS */
- rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len);
- rule->ofpacts_len = fm->ofpacts_len;
- rule->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len);
+ ovs_mutex_unlock(&rule->mutex);
+
+ *CONST_CAST(uint8_t *, &rule->table_id) = table - ofproto->tables;
+ rule->flags = fm->flags & OFPUTIL_FF_STATE;
+ rule->actions = rule_actions_create(ofproto, fm->ofpacts, fm->ofpacts_len);
list_init(&rule->meter_list_node);
- rule->evictable = true;
rule->eviction_group = NULL;
list_init(&rule->expirable);
rule->monitor_flags = 0;
rule->add_seqno = 0;
rule->modify_seqno = 0;
- /* Insert new rule. */
- victim = oftable_replace_rule(rule);
- if (victim && !rule_is_modifiable(victim)) {
- error = OFPERR_OFPBRC_EPERM;
- } else if (victim && victim->pending) {
- error = OFPROTO_POSTPONE;
- } else {
- struct ofoperation *op;
- struct rule *evict;
-
- if (classifier_count(&table->cls) > table->max_flows) {
- bool was_evictable;
-
- was_evictable = rule->evictable;
- rule->evictable = false;
- evict = choose_rule_to_evict(table);
- rule->evictable = was_evictable;
-
- if (!evict) {
- error = OFPERR_OFPFMFC_TABLE_FULL;
- goto exit;
- } else if (evict->pending) {
- error = OFPROTO_POSTPONE;
- goto exit;
- }
- } else {
- evict = NULL;
- }
-
- group = ofopgroup_create(ofproto, ofconn, request, fm->buffer_id);
- op = ofoperation_create(group, rule, OFOPERATION_ADD, 0);
- op->victim = victim;
-
- error = ofproto->ofproto_class->rule_construct(rule);
- if (error) {
- op->group->n_running--;
- ofoperation_destroy(rule->pending);
- } else if (evict) {
- delete_flow__(evict, group, OFPRR_EVICTION);
- }
- ofopgroup_submit(group);
- }
-
-exit:
- /* Back out if an error occurred. */
+ /* Construct rule, initializing derived state. */
+ error = ofproto->ofproto_class->rule_construct(rule);
if (error) {
- oftable_substitute_rule(rule, victim);
ofproto_rule_destroy__(rule);
+ return error;
}
+
+ /* Insert rule. */
+ oftable_insert_rule(rule);
+
+ group = ofopgroup_create(ofproto, ofconn, request, fm->buffer_id);
+ ofoperation_create(group, rule, OFOPERATION_ADD, 0);
+ ofproto->ofproto_class->rule_insert(rule);
+ ofopgroup_submit(group);
+
return error;
}
\f
static enum ofperr
modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm, const struct ofp_header *request,
- struct list *rules)
+ const struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
+ enum ofoperation_type type;
struct ofopgroup *group;
- struct rule *rule;
enum ofperr error;
+ size_t i;
+ type = fm->command == OFPFC_ADD ? OFOPERATION_REPLACE : OFOPERATION_MODIFY;
group = ofopgroup_create(ofproto, ofconn, request, fm->buffer_id);
error = OFPERR_OFPBRC_EPERM;
- LIST_FOR_EACH (rule, ofproto_node, rules) {
+ for (i = 0; i < rules->n; i++) {
+ struct rule *rule = rules->rules[i];
struct ofoperation *op;
bool actions_changed;
+ bool reset_counters;
- /* FIXME: Implement OFPFF12_RESET_COUNTS */
+ /* FIXME: Implement OFPFUTIL_FF_RESET_COUNTS */
if (rule_is_modifiable(rule)) {
/* At least one rule is modifiable, don't report EPERM error. */
continue;
}
- /* Verify actions. */
- error = ofpacts_check(fm->ofpacts, fm->ofpacts_len, &fm->match.flow,
- ofproto->max_ports, rule->table_id);
- if (error) {
- return error;
- }
-
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, OFOPERATION_MODIFY, 0);
+ op = ofoperation_create(group, rule, type, 0);
- if (fm->modify_cookie && fm->new_cookie != htonll(UINT64_MAX)) {
+ if (fm->modify_cookie && fm->new_cookie != OVS_BE64_MAX) {
ofproto_rule_change_cookie(ofproto, rule, fm->new_cookie);
}
- if (actions_changed) {
- op->ofpacts = rule->ofpacts;
- op->ofpacts_len = rule->ofpacts_len;
- op->meter_id = rule->meter_id;
- 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->ofproto->ofproto_class->rule_modify_actions(rule);
+ if (type == OFOPERATION_REPLACE) {
+ ovs_mutex_lock(&rule->mutex);
+ rule->idle_timeout = fm->idle_timeout;
+ rule->hard_timeout = fm->hard_timeout;
+ ovs_mutex_unlock(&rule->mutex);
+
+ rule->flags = fm->flags & OFPUTIL_FF_STATE;
+ if (fm->idle_timeout || fm->hard_timeout) {
+ if (!rule->eviction_group) {
+ eviction_group_add_rule(rule);
+ }
+ } else {
+ eviction_group_remove_rule(rule);
+ }
+ }
+
+ reset_counters = (fm->flags & OFPUTIL_FF_RESET_COUNTS) != 0;
+ if (actions_changed || reset_counters) {
+ struct rule_actions *new_actions;
+
+ op->actions = rule->actions;
+ new_actions = rule_actions_create(ofproto,
+ fm->ofpacts, fm->ofpacts_len);
+
+ ovs_mutex_lock(&rule->mutex);
+ rule->actions = new_actions;
+ ovs_mutex_unlock(&rule->mutex);
+
+ rule->ofproto->ofproto_class->rule_modify_actions(rule,
+ reset_counters);
} else {
ofoperation_complete(op, 0);
}
static enum ofperr
modify_flows_add(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm, const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
- if (fm->cookie_mask != htonll(0) || fm->new_cookie == htonll(UINT64_MAX)) {
+ if (fm->cookie_mask != htonll(0) || fm->new_cookie == OVS_BE64_MAX) {
return 0;
}
return add_flow(ofproto, ofconn, fm, request);
modify_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm,
const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct list rules;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
int error;
- error = collect_rules_loose(ofproto, fm->table_id, &fm->match,
- fm->cookie, fm->cookie_mask,
- OFPP_ANY, &rules);
- if (error) {
- return error;
- } else if (list_is_empty(&rules)) {
- return modify_flows_add(ofproto, ofconn, fm, request);
- } else {
- return modify_flows__(ofproto, ofconn, fm, request, &rules);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, 0,
+ fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY);
+ error = collect_rules_loose(ofproto, &criteria, &rules);
+ rule_criteria_destroy(&criteria);
+
+ if (!error) {
+ error = (rules.n > 0
+ ? modify_flows__(ofproto, ofconn, fm, request, &rules)
+ : modify_flows_add(ofproto, ofconn, fm, request));
}
+
+ rule_collection_destroy(&rules);
+
+ return error;
}
/* Implements OFPFC_MODIFY_STRICT. Returns 0 on success or an OpenFlow error
modify_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm,
const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct list rules;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
int error;
- error = collect_rules_strict(ofproto, fm->table_id, &fm->match,
- fm->priority, fm->cookie, fm->cookie_mask,
- OFPP_ANY, &rules);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority,
+ fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY);
+ error = collect_rules_strict(ofproto, &criteria, &rules);
+ rule_criteria_destroy(&criteria);
- if (error) {
- return error;
- } else if (list_is_empty(&rules)) {
- return modify_flows_add(ofproto, ofconn, fm, request);
- } else {
- return list_is_singleton(&rules) ? modify_flows__(ofproto, ofconn,
- fm, request, &rules)
- : 0;
+ if (!error) {
+ if (rules.n == 0) {
+ error = modify_flows_add(ofproto, ofconn, fm, request);
+ } else if (rules.n == 1) {
+ error = modify_flows__(ofproto, ofconn, fm, request, &rules);
+ }
}
+
+ rule_collection_destroy(&rules);
+
+ return error;
}
\f
/* OFPFC_DELETE implementation. */
static void
delete_flow__(struct rule *rule, struct ofopgroup *group,
enum ofp_flow_removed_reason reason)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = rule->ofproto;
ofoperation_create(group, rule, OFOPERATION_DELETE, reason);
oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_destruct(rule);
+ ofproto->ofproto_class->rule_delete(rule);
}
/* Deletes the rules listed in 'rules'.
* Returns 0 on success, otherwise an OpenFlow error code. */
static enum ofperr
delete_flows__(struct ofproto *ofproto, struct ofconn *ofconn,
- const struct ofp_header *request, struct list *rules,
+ const struct ofp_header *request,
+ const struct rule_collection *rules,
enum ofp_flow_removed_reason reason)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct rule *rule, *next;
struct ofopgroup *group;
+ size_t i;
group = ofopgroup_create(ofproto, ofconn, request, UINT32_MAX);
- LIST_FOR_EACH_SAFE (rule, next, ofproto_node, rules) {
- delete_flow__(rule, group, reason);
+ for (i = 0; i < rules->n; i++) {
+ delete_flow__(rules->rules[i], group, reason);
}
ofopgroup_submit(group);
delete_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn,
const struct ofputil_flow_mod *fm,
const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct list rules;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
enum ofperr error;
- error = collect_rules_loose(ofproto, fm->table_id, &fm->match,
- fm->cookie, fm->cookie_mask,
- fm->out_port, &rules);
- return (error ? error
- : !list_is_empty(&rules) ? delete_flows__(ofproto, ofconn, request,
- &rules, OFPRR_DELETE)
- : 0);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, 0,
+ fm->cookie, fm->cookie_mask,
+ fm->out_port, fm->out_group);
+ error = collect_rules_loose(ofproto, &criteria, &rules);
+ rule_criteria_destroy(&criteria);
+
+ if (!error && rules.n > 0) {
+ error = delete_flows__(ofproto, ofconn, request, &rules, OFPRR_DELETE);
+ }
+ rule_collection_destroy(&rules);
+
+ return error;
}
/* Implements OFPFC_DELETE_STRICT. */
delete_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn,
const struct ofputil_flow_mod *fm,
const struct ofp_header *request)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct list rules;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
enum ofperr error;
- error = collect_rules_strict(ofproto, fm->table_id, &fm->match,
- fm->priority, fm->cookie, fm->cookie_mask,
- fm->out_port, &rules);
- return (error ? error
- : list_is_singleton(&rules) ? delete_flows__(ofproto, ofconn,
- request, &rules,
- OFPRR_DELETE)
- : 0);
+ rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority,
+ fm->cookie, fm->cookie_mask,
+ fm->out_port, fm->out_group);
+ error = collect_rules_strict(ofproto, &criteria, &rules);
+ rule_criteria_destroy(&criteria);
+
+ if (!error && rules.n > 0) {
+ error = delete_flows__(ofproto, ofconn, request, &rules, OFPRR_DELETE);
+ }
+ rule_collection_destroy(&rules);
+
+ return error;
}
static void
ofproto_rule_send_removed(struct rule *rule, uint8_t reason)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofputil_flow_removed fr;
- if (ofproto_rule_is_hidden(rule) || !rule->send_flow_removed) {
+ if (ofproto_rule_is_hidden(rule) ||
+ !(rule->flags & OFPUTIL_FF_SEND_FLOW_REM)) {
return;
}
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);
connmgr_send_flow_removed(rule->ofproto->connmgr, &fr);
}
-void
-ofproto_rule_update_used(struct rule *rule, long long int used)
-{
- if (used > rule->used) {
- struct eviction_group *evg = rule->eviction_group;
-
- rule->used = used;
- if (evg) {
- heap_change(&evg->rules, &rule->evg_node,
- rule_eviction_priority(rule));
- }
- }
-}
-
/* Sends an OpenFlow "flow removed" message with the given 'reason' (either
* OFPRR_HARD_TIMEOUT or OFPRR_IDLE_TIMEOUT), and then removes 'rule' from its
* ofproto.
* OpenFlow flows. */
void
ofproto_rule_expire(struct rule *rule, uint8_t reason)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = rule->ofproto;
- struct ofopgroup *group;
- ovs_assert(reason == OFPRR_HARD_TIMEOUT || reason == OFPRR_IDLE_TIMEOUT);
+ ovs_assert(reason == OFPRR_HARD_TIMEOUT || reason == OFPRR_IDLE_TIMEOUT
+ || reason == OFPRR_DELETE || reason == OFPRR_GROUP_DELETE);
- ofproto_rule_send_removed(rule, reason);
+ ofproto_rule_delete__(ofproto, rule, reason);
+}
- group = ofopgroup_create_unattached(ofproto);
- ofoperation_create(group, rule, OFOPERATION_DELETE, reason);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_destruct(rule);
- ofopgroup_submit(group);
+/* Reduces '*timeout' to no more than 'max'. A value of zero in either case
+ * means "infinite". */
+static void
+reduce_timeout(uint16_t max, uint16_t *timeout)
+{
+ if (max && (!*timeout || *timeout > max)) {
+ *timeout = max;
+ }
+}
+
+/* If 'idle_timeout' is nonzero, and 'rule' has no idle timeout or an idle
+ * timeout greater than 'idle_timeout', lowers 'rule''s idle timeout to
+ * 'idle_timeout' seconds. Similarly for 'hard_timeout'.
+ *
+ * Suitable for implementing OFPACT_FIN_TIMEOUT. */
+void
+ofproto_rule_reduce_timeouts(struct rule *rule,
+ uint16_t idle_timeout, uint16_t hard_timeout)
+ OVS_EXCLUDED(ofproto_mutex, rule->mutex)
+{
+ if (!idle_timeout && !hard_timeout) {
+ return;
+ }
+
+ ovs_mutex_lock(&ofproto_mutex);
+ if (list_is_empty(&rule->expirable)) {
+ list_insert(&rule->ofproto->expirable, &rule->expirable);
+ }
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ ovs_mutex_lock(&rule->mutex);
+ reduce_timeout(idle_timeout, &rule->idle_timeout);
+ reduce_timeout(hard_timeout, &rule->hard_timeout);
+ ovs_mutex_unlock(&rule->mutex);
}
\f
static enum ofperr
handle_flow_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
struct ofputil_flow_mod fm;
ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub);
error = ofputil_decode_flow_mod(&fm, oh, ofconn_get_protocol(ofconn),
- &ofpacts);
+ &ofpacts,
+ u16_to_ofp(ofproto->max_ports),
+ ofproto->n_tables);
+ if (!error) {
+ error = ofproto_check_ofpacts(ofproto, fm.ofpacts, fm.ofpacts_len);
+ }
if (!error) {
error = handle_flow_mod__(ofproto, ofconn, &fm, oh);
}
static enum ofperr
handle_flow_mod__(struct ofproto *ofproto, struct ofconn *ofconn,
struct ofputil_flow_mod *fm, const struct ofp_header *oh)
+ OVS_EXCLUDED(ofproto_mutex)
{
- 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);
+ ovs_mutex_lock(&ofproto_mutex);
+ 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;
}
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ run_rule_executes(ofproto);
+ return error;
}
static enum ofperr
return 0;
}
+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);
+
+ return 0;
+}
+
static enum ofperr
handle_nxt_set_controller_id(struct ofconn *ofconn,
const struct ofp_header *oh)
ofproto_compose_flow_refresh_update(const struct rule *rule,
enum nx_flow_monitor_flags flags,
struct list *msgs)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofoperation *op = rule->pending;
+ const struct rule_actions *actions;
struct ofputil_flow_update fu;
struct match match;
- if (op && op->type == OFOPERATION_ADD && !op->victim) {
+ if (op && op->type == OFOPERATION_ADD) {
/* We'll report the final flow when the operation completes. Reporting
* it now would cause a duplicate report later. */
return;
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. */
switch (op->type) {
case OFOPERATION_ADD:
- /* We already verified that there was a victim. */
- fu.ofpacts = op->victim->ofpacts;
- fu.ofpacts_len = op->victim->ofpacts_len;
- break;
+ NOT_REACHED();
case OFOPERATION_MODIFY:
- if (op->ofpacts) {
- fu.ofpacts = op->ofpacts;
- fu.ofpacts_len = op->ofpacts_len;
- } else {
- fu.ofpacts = rule->ofpacts;
- fu.ofpacts_len = rule->ofpacts_len;
- }
+ case OFOPERATION_REPLACE:
+ 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);
}
void
-ofmonitor_compose_refresh_updates(struct list *rules, struct list *msgs)
+ofmonitor_compose_refresh_updates(struct rule_collection *rules,
+ struct list *msgs)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct rule *rule;
+ size_t i;
- LIST_FOR_EACH (rule, ofproto_node, rules) {
+ for (i = 0; i < rules->n; i++) {
+ struct rule *rule = rules->rules[i];
enum nx_flow_monitor_flags flags = rule->monitor_flags;
rule->monitor_flags = 0;
static void
ofproto_collect_ofmonitor_refresh_rule(const struct ofmonitor *m,
struct rule *rule, uint64_t seqno,
- struct list *rules)
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
enum nx_flow_monitor_flags update;
}
if (!rule->monitor_flags) {
- list_push_back(rules, &rule->ofproto_node);
+ rule_collection_add(rules, rule);
}
rule->monitor_flags |= update | (m->flags & NXFMF_ACTIONS);
}
static void
ofproto_collect_ofmonitor_refresh_rules(const struct ofmonitor *m,
uint64_t seqno,
- struct list *rules)
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
const struct ofproto *ofproto = ofconn_get_ofproto(m->ofconn);
const struct ofoperation *op;
struct cls_cursor cursor;
struct rule *rule;
+ ovs_rwlock_rdlock(&table->cls.rwlock);
cls_cursor_init(&cursor, &table->cls, &target);
CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
ovs_assert(!rule->pending); /* XXX */
ofproto_collect_ofmonitor_refresh_rule(m, rule, seqno, rules);
}
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
HMAP_FOR_EACH (op, hmap_node, &ofproto->deletions) {
static void
ofproto_collect_ofmonitor_initial_rules(struct ofmonitor *m,
- struct list *rules)
+ struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
if (m->flags & NXFMF_INITIAL) {
ofproto_collect_ofmonitor_refresh_rules(m, 0, rules);
void
ofmonitor_collect_resume_rules(struct ofmonitor *m,
- uint64_t seqno, struct list *rules)
+ uint64_t seqno, struct rule_collection *rules)
+ OVS_REQUIRES(ofproto_mutex)
{
ofproto_collect_ofmonitor_refresh_rules(m, seqno, rules);
}
static enum ofperr
handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh)
+ 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 list replies;
enum ofperr error;
- struct list rules;
struct ofpbuf b;
size_t i;
ofpbuf_use_const(&b, oh, ntohs(oh->length));
monitors = NULL;
n_monitors = allocated_monitors = 0;
+
+ ovs_mutex_lock(&ofproto_mutex);
for (;;) {
struct ofputil_flow_monitor_request request;
struct ofmonitor *m;
monitors[n_monitors++] = m;
}
- list_init(&rules);
+ rule_collection_init(&rules);
for (i = 0; i < n_monitors; i++) {
ofproto_collect_ofmonitor_initial_rules(monitors[i], &rules);
}
ofpmp_init(&replies, oh);
ofmonitor_compose_refresh_updates(&rules, &replies);
- ofconn_send_replies(ofconn, &replies);
+ ovs_mutex_unlock(&ofproto_mutex);
+
+ rule_collection_destroy(&rules);
+ ofconn_send_replies(ofconn, &replies);
free(monitors);
return 0;
ofmonitor_destroy(monitors[i]);
}
free(monitors);
+ ovs_mutex_unlock(&ofproto_mutex);
+
return error;
}
static enum ofperr
handle_flow_monitor_cancel(struct ofconn *ofconn, const struct ofp_header *oh)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofmonitor *m;
+ enum ofperr error;
uint32_t id;
id = ofputil_decode_flow_monitor_cancel(oh);
+
+ ovs_mutex_lock(&ofproto_mutex);
m = ofmonitor_lookup(ofconn, id);
- if (!m) {
- return OFPERR_NXBRC_FM_BAD_ID;
+ if (m) {
+ ofmonitor_destroy(m);
+ error = 0;
+ } else {
+ error = OFPERR_NXBRC_FM_BAD_ID;
}
+ ovs_mutex_unlock(&ofproto_mutex);
- ofmonitor_destroy(m);
- return 0;
+ return error;
}
/* Meters implementation.
/*
* This is used in instruction validation at flow set-up time,
* as flows may not use non-existing meters.
- * This is also used by ofproto-providers to translate OpenFlow meter_ids
- * in METER instructions to the corresponding provider meter IDs.
* Return value of UINT32_MAX signifies an invalid meter.
*/
-uint32_t
-ofproto_get_provider_meter_id(const struct ofproto * ofproto,
- uint32_t of_meter_id)
+static uint32_t
+get_provider_meter_id(const struct ofproto *ofproto, uint32_t of_meter_id)
{
if (of_meter_id && of_meter_id <= ofproto->meter_features.max_meters) {
const struct meter *meter = ofproto->meters[of_meter_id];
static void
meter_delete(struct ofproto *ofproto, uint32_t first, uint32_t last)
+ OVS_REQUIRES(ofproto_mutex)
{
uint32_t mid;
for (mid = first; mid <= last; ++mid) {
ovs_assert(provider_meter_id.uint32 != UINT32_MAX);
*meterp = meter_create(&mm->meter, provider_meter_id);
}
- return 0;
+ return error;
}
static enum ofperr
{
struct meter *meter = ofproto->meters[mm->meter.meter_id];
enum ofperr error;
+ uint32_t provider_meter_id;
if (!meter) {
return OFPERR_OFPMMFC_UNKNOWN_METER;
}
+ provider_meter_id = meter->provider_meter_id.uint32;
error = ofproto->ofproto_class->meter_set(ofproto,
&meter->provider_meter_id,
&mm->meter);
- ovs_assert(meter->provider_meter_id.uint32 != UINT32_MAX);
+ ovs_assert(meter->provider_meter_id.uint32 == provider_meter_id);
if (!error) {
meter_update(meter, &mm->meter);
}
static enum ofperr
handle_delete_meter(struct ofconn *ofconn, const struct ofp_header *oh,
struct ofputil_meter_mod *mm)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
uint32_t meter_id = mm->meter.meter_id;
+ struct rule_collection rules;
+ enum ofperr error = 0;
uint32_t first, last;
- struct list rules;
if (meter_id == OFPM13_ALL) {
first = 1;
first = last = meter_id;
}
- /* First delete the rules that use this meter. If any of those rules are
- * currently being modified, postpone the whole operation until later. */
- list_init(&rules);
- for (meter_id = first; meter_id <= last; ++meter_id) {
- struct meter *meter = ofproto->meters[meter_id];
- if (meter && !list_is_empty(&meter->rules)) {
- struct rule *rule;
+ /* First delete the rules that use this meter. If any of those rules are
+ * currently being modified, postpone the whole operation until later. */
+ rule_collection_init(&rules);
+ ovs_mutex_lock(&ofproto_mutex);
+ for (meter_id = first; meter_id <= last; ++meter_id) {
+ struct meter *meter = ofproto->meters[meter_id];
+ if (meter && !list_is_empty(&meter->rules)) {
+ struct rule *rule;
+
+ LIST_FOR_EACH (rule, meter_list_node, &meter->rules) {
+ if (rule->pending) {
+ error = OFPROTO_POSTPONE;
+ goto exit;
+ }
+ rule_collection_add(&rules, rule);
+ }
+ }
+ }
+ if (rules.n > 0) {
+ delete_flows__(ofproto, ofconn, oh, &rules, OFPRR_METER_DELETE);
+ }
+
+ /* Delete the meters. */
+ meter_delete(ofproto, first, last);
+
+exit:
+ ovs_mutex_unlock(&ofproto_mutex);
+ rule_collection_destroy(&rules);
+
+ return error;
+}
+
+static enum ofperr
+handle_meter_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct ofputil_meter_mod mm;
+ uint64_t bands_stub[256 / 8];
+ struct ofpbuf bands;
+ uint32_t meter_id;
+ enum ofperr error;
+
+ error = reject_slave_controller(ofconn);
+ if (error) {
+ return error;
+ }
+
+ ofpbuf_use_stub(&bands, bands_stub, sizeof bands_stub);
+
+ error = ofputil_decode_meter_mod(oh, &mm, &bands);
+ if (error) {
+ goto exit_free_bands;
+ }
+
+ meter_id = mm.meter.meter_id;
+
+ if (mm.command != OFPMC13_DELETE) {
+ /* Fails also when meters are not implemented by the provider. */
+ if (meter_id == 0 || meter_id > OFPM13_MAX) {
+ error = OFPERR_OFPMMFC_INVALID_METER;
+ goto exit_free_bands;
+ } else if (meter_id > ofproto->meter_features.max_meters) {
+ error = OFPERR_OFPMMFC_OUT_OF_METERS;
+ goto exit_free_bands;
+ }
+ if (mm.meter.n_bands > ofproto->meter_features.max_bands) {
+ error = OFPERR_OFPMMFC_OUT_OF_BANDS;
+ goto exit_free_bands;
+ }
+ }
+
+ switch (mm.command) {
+ case OFPMC13_ADD:
+ error = handle_add_meter(ofproto, &mm);
+ break;
+
+ case OFPMC13_MODIFY:
+ error = handle_modify_meter(ofproto, &mm);
+ break;
+
+ case OFPMC13_DELETE:
+ error = handle_delete_meter(ofconn, oh, &mm);
+ break;
+
+ default:
+ error = OFPERR_OFPMMFC_BAD_COMMAND;
+ break;
+ }
+
+exit_free_bands:
+ ofpbuf_uninit(&bands);
+ return error;
+}
+
+static enum ofperr
+handle_meter_features_request(struct ofconn *ofconn,
+ const struct ofp_header *request)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct ofputil_meter_features features;
+ struct ofpbuf *b;
+
+ if (ofproto->ofproto_class->meter_get_features) {
+ ofproto->ofproto_class->meter_get_features(ofproto, &features);
+ } else {
+ memset(&features, 0, sizeof features);
+ }
+ b = ofputil_encode_meter_features_reply(&features, request);
+
+ ofconn_send_reply(ofconn, b);
+ return 0;
+}
+
+static enum ofperr
+handle_meter_request(struct ofconn *ofconn, const struct ofp_header *request,
+ enum ofptype type)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct list replies;
+ uint64_t bands_stub[256 / 8];
+ struct ofpbuf bands;
+ uint32_t meter_id, first, last;
+
+ ofputil_decode_meter_request(request, &meter_id);
+
+ if (meter_id == OFPM13_ALL) {
+ first = 1;
+ last = ofproto->meter_features.max_meters;
+ } else {
+ if (!meter_id || meter_id > ofproto->meter_features.max_meters ||
+ !ofproto->meters[meter_id]) {
+ return OFPERR_OFPMMFC_UNKNOWN_METER;
+ }
+ first = last = meter_id;
+ }
+
+ ofpbuf_use_stub(&bands, bands_stub, sizeof bands_stub);
+ ofpmp_init(&replies, request);
+
+ for (meter_id = first; meter_id <= last; ++meter_id) {
+ struct meter *meter = ofproto->meters[meter_id];
+ if (!meter) {
+ continue; /* Skip non-existing meters. */
+ }
+ if (type == OFPTYPE_METER_STATS_REQUEST) {
+ struct ofputil_meter_stats stats;
+
+ stats.meter_id = meter_id;
+
+ /* Provider sets the packet and byte counts, we do the rest. */
+ stats.flow_count = list_size(&meter->rules);
+ calc_duration(meter->created, time_msec(),
+ &stats.duration_sec, &stats.duration_nsec);
+ stats.n_bands = meter->n_bands;
+ ofpbuf_clear(&bands);
+ stats.bands
+ = ofpbuf_put_uninit(&bands,
+ meter->n_bands * sizeof *stats.bands);
+
+ if (!ofproto->ofproto_class->meter_get(ofproto,
+ meter->provider_meter_id,
+ &stats)) {
+ ofputil_append_meter_stats(&replies, &stats);
+ }
+ } else { /* type == OFPTYPE_METER_CONFIG_REQUEST */
+ struct ofputil_meter_config config;
+
+ config.meter_id = meter_id;
+ config.flags = meter->flags;
+ config.n_bands = meter->n_bands;
+ config.bands = meter->bands;
+ ofputil_append_meter_config(&replies, &config);
+ }
+ }
+
+ ofconn_send_replies(ofconn, &replies);
+ ofpbuf_uninit(&bands);
+ return 0;
+}
+
+bool
+ofproto_group_lookup(const struct ofproto *ofproto, uint32_t group_id,
+ struct ofgroup **group)
+ OVS_TRY_RDLOCK(true, (*group)->rwlock)
+{
+ ovs_rwlock_rdlock(&ofproto->groups_rwlock);
+ HMAP_FOR_EACH_IN_BUCKET (*group, hmap_node,
+ hash_int(group_id, 0), &ofproto->groups) {
+ if ((*group)->group_id == group_id) {
+ ovs_rwlock_rdlock(&(*group)->rwlock);
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ return true;
+ }
+ }
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ return false;
+}
+
+void
+ofproto_group_release(struct ofgroup *group)
+ OVS_RELEASES(group->rwlock)
+{
+ ovs_rwlock_unlock(&group->rwlock);
+}
+
+static bool
+ofproto_group_write_lookup(const struct ofproto *ofproto, uint32_t group_id,
+ struct ofgroup **group)
+ OVS_TRY_WRLOCK(true, ofproto->groups_rwlock)
+ OVS_TRY_WRLOCK(true, (*group)->rwlock)
+{
+ ovs_rwlock_wrlock(&ofproto->groups_rwlock);
+ HMAP_FOR_EACH_IN_BUCKET (*group, hmap_node,
+ hash_int(group_id, 0), &ofproto->groups) {
+ if ((*group)->group_id == group_id) {
+ ovs_rwlock_wrlock(&(*group)->rwlock);
+ return true;
+ }
+ }
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ return false;
+}
+
+static bool
+ofproto_group_exists__(const struct ofproto *ofproto, uint32_t group_id)
+ OVS_REQ_RDLOCK(ofproto->groups_rwlock)
+{
+ struct ofgroup *grp;
+
+ HMAP_FOR_EACH_IN_BUCKET (grp, hmap_node,
+ hash_int(group_id, 0), &ofproto->groups) {
+ if (grp->group_id == group_id) {
+ return true;
+ }
+ }
+ return false;
+}
+
+static bool
+ofproto_group_exists(const struct ofproto *ofproto, uint32_t group_id)
+ OVS_EXCLUDED(ofproto->groups_rwlock)
+{
+ bool exists;
+
+ ovs_rwlock_rdlock(&ofproto->groups_rwlock);
+ exists = ofproto_group_exists__(ofproto, group_id);
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+
+ return exists;
+}
+
+static uint32_t
+group_get_ref_count(struct ofgroup *group)
+ OVS_EXCLUDED(ofproto_mutex)
+{
+ struct ofproto *ofproto = group->ofproto;
+ struct rule_criteria criteria;
+ struct rule_collection rules;
+ struct match match;
+ enum ofperr error;
+ uint32_t count;
+
+ match_init_catchall(&match);
+ rule_criteria_init(&criteria, 0xff, &match, 0, 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);
+ rule_criteria_destroy(&criteria);
+
+ count = !error && rules.n < UINT32_MAX ? rules.n : UINT32_MAX;
+
+ rule_collection_destroy(&rules);
+ return count;
+}
+
+static void
+append_group_stats(struct ofgroup *group, struct list *replies)
+ OVS_REQ_RDLOCK(group->rwlock)
+{
+ struct ofputil_group_stats ogs;
+ struct ofproto *ofproto = group->ofproto;
+ long long int now = time_msec();
+ int error;
+
+ ogs.bucket_stats = xmalloc(group->n_buckets * sizeof *ogs.bucket_stats);
+
+ /* Provider sets the packet and byte counts, we do the rest. */
+ ogs.ref_count = group_get_ref_count(group);
+ ogs.n_buckets = group->n_buckets;
+
+ error = (ofproto->ofproto_class->group_get_stats
+ ? ofproto->ofproto_class->group_get_stats(group, &ogs)
+ : EOPNOTSUPP);
+ if (error) {
+ ogs.packet_count = UINT64_MAX;
+ ogs.byte_count = UINT64_MAX;
+ memset(ogs.bucket_stats, 0xff,
+ ogs.n_buckets * sizeof *ogs.bucket_stats);
+ }
+
+ ogs.group_id = group->group_id;
+ calc_duration(group->created, now, &ogs.duration_sec, &ogs.duration_nsec);
+
+ ofputil_append_group_stats(replies, &ogs);
+
+ free(ogs.bucket_stats);
+}
+
+static enum ofperr
+handle_group_stats_request(struct ofconn *ofconn,
+ const struct ofp_header *request)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct list replies;
+ enum ofperr error;
+ struct ofgroup *group;
+ uint32_t group_id;
+
+ error = ofputil_decode_group_stats_request(request, &group_id);
+ if (error) {
+ return error;
+ }
+
+ ofpmp_init(&replies, request);
+
+ if (group_id == OFPG_ALL) {
+ ovs_rwlock_rdlock(&ofproto->groups_rwlock);
+ HMAP_FOR_EACH (group, hmap_node, &ofproto->groups) {
+ ovs_rwlock_rdlock(&group->rwlock);
+ append_group_stats(group, &replies);
+ ovs_rwlock_unlock(&group->rwlock);
+ }
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ } else {
+ if (ofproto_group_lookup(ofproto, group_id, &group)) {
+ append_group_stats(group, &replies);
+ ofproto_group_release(group);
+ }
+ }
+
+ ofconn_send_replies(ofconn, &replies);
+
+ return 0;
+}
+
+static enum ofperr
+handle_group_desc_stats_request(struct ofconn *ofconn,
+ const struct ofp_header *request)
+{
+ struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
+ struct list replies;
+ struct ofputil_group_desc gds;
+ struct ofgroup *group;
+
+ ofpmp_init(&replies, request);
+
+ ovs_rwlock_rdlock(&ofproto->groups_rwlock);
+ HMAP_FOR_EACH (group, hmap_node, &ofproto->groups) {
+ gds.group_id = group->group_id;
+ gds.type = group->type;
+ ofputil_append_group_desc_reply(&gds, &group->buckets, &replies);
+ }
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+
+ ofconn_send_replies(ofconn, &replies);
+
+ return 0;
+}
+
+static enum ofperr
+handle_group_features_stats_request(struct ofconn *ofconn,
+ const struct ofp_header *request)
+{
+ struct ofproto *p = ofconn_get_ofproto(ofconn);
+ struct ofpbuf *msg;
+
+ msg = ofputil_encode_group_features_reply(&p->ogf, request);
+ if (msg) {
+ ofconn_send_reply(ofconn, msg);
+ }
+
+ return 0;
+}
+
+static enum ofperr
+handle_queue_get_config_request(struct ofconn *ofconn,
+ const struct ofp_header *oh)
+{
+ 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;
+
+ error = ofputil_decode_queue_get_config_request(oh, &request);
+ if (error) {
+ return error;
+ }
+
+ ofport = ofproto_get_port(p, request);
+ if (!ofport) {
+ return OFPERR_OFPQOFC_BAD_PORT;
+ }
+
+ reply = ofputil_encode_queue_get_config_reply(oh);
+
+ smap_init(&details);
+ NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &queue_dump, ofport->netdev) {
+ struct ofputil_queue_config queue;
+
+ /* 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);
+
+ ofconn_send_reply(ofconn, reply);
+
+ return 0;
+}
+
+/* Implements OFPGC11_ADD
+ * in which no matching flow already exists in the flow table.
+ *
+ * Adds the flow specified by 'ofm', which is followed by 'n_actions'
+ * ofp_actions, to the ofproto's flow table. Returns 0 on success, an OpenFlow
+ * error code on failure, or OFPROTO_POSTPONE if the operation cannot be
+ * initiated now but may be retried later.
+ *
+ * Upon successful return, takes ownership of 'fm->ofpacts'. On failure,
+ * ownership remains with the caller.
+ *
+ * 'ofconn' is used to retrieve the packet buffer specified in ofm->buffer_id,
+ * if any. */
+static enum ofperr
+add_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
+{
+ struct ofgroup *ofgroup;
+ enum ofperr error;
+
+ if (gm->group_id > OFPG_MAX) {
+ return OFPERR_OFPGMFC_INVALID_GROUP;
+ }
+ if (gm->type > OFPGT11_FF) {
+ return OFPERR_OFPGMFC_BAD_TYPE;
+ }
+
+ /* Allocate new group and initialize it. */
+ ofgroup = ofproto->ofproto_class->group_alloc();
+ if (!ofgroup) {
+ VLOG_WARN_RL(&rl, "%s: failed to create group", ofproto->name);
+ return OFPERR_OFPGMFC_OUT_OF_GROUPS;
+ }
+
+ ovs_rwlock_init(&ofgroup->rwlock);
+ ofgroup->ofproto = ofproto;
+ ofgroup->group_id = gm->group_id;
+ ofgroup->type = gm->type;
+ ofgroup->created = ofgroup->modified = time_msec();
- LIST_FOR_EACH (rule, meter_list_node, &meter->rules) {
- if (rule->pending) {
- return OFPROTO_POSTPONE;
- }
- list_push_back(&rules, &rule->ofproto_node);
- }
- }
+ list_move(&ofgroup->buckets, &gm->buckets);
+ ofgroup->n_buckets = list_size(&ofgroup->buckets);
+
+ /* Construct called BEFORE any locks are held. */
+ error = ofproto->ofproto_class->group_construct(ofgroup);
+ if (error) {
+ goto free_out;
}
- if (!list_is_empty(&rules)) {
- delete_flows__(ofproto, ofconn, oh, &rules, OFPRR_METER_DELETE);
+
+ /* We wrlock as late as possible to minimize the time we jam any other
+ * threads: No visible state changes before acquiring the lock. */
+ ovs_rwlock_wrlock(&ofproto->groups_rwlock);
+
+ if (ofproto->n_groups[gm->type] >= ofproto->ogf.max_groups[gm->type]) {
+ error = OFPERR_OFPGMFC_OUT_OF_GROUPS;
+ goto unlock_out;
}
- /* Delete the meters. */
- meter_delete(ofproto, first, last);
+ if (ofproto_group_exists__(ofproto, gm->group_id)) {
+ error = OFPERR_OFPGMFC_GROUP_EXISTS;
+ goto unlock_out;
+ }
- return 0;
+ if (!error) {
+ /* Insert new group. */
+ hmap_insert(&ofproto->groups, &ofgroup->hmap_node,
+ hash_int(ofgroup->group_id, 0));
+ ofproto->n_groups[ofgroup->type]++;
+
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ return error;
+ }
+
+ unlock_out:
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ ofproto->ofproto_class->group_destruct(ofgroup);
+ free_out:
+ ofputil_bucket_list_destroy(&ofgroup->buckets);
+ ofproto->ofproto_class->group_dealloc(ofgroup);
+
+ return error;
}
+/* Implements OFPFC_MODIFY. Returns 0 on success or an OpenFlow error code on
+ * failure.
+ *
+ * 'ofconn' is used to retrieve the packet buffer specified in fm->buffer_id,
+ * if any. */
static enum ofperr
-handle_meter_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+modify_group(struct ofproto *ofproto, struct ofputil_group_mod *gm)
{
- struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofputil_meter_mod mm;
- uint64_t bands_stub[256 / 8];
- struct ofpbuf bands;
- uint32_t meter_id;
+ struct ofgroup *ofgroup;
+ struct ofgroup *victim;
enum ofperr error;
- error = reject_slave_controller(ofconn);
- if (error) {
- return error;
+ if (gm->group_id > OFPG_MAX) {
+ return OFPERR_OFPGMFC_INVALID_GROUP;
}
- ofpbuf_use_stub(&bands, bands_stub, sizeof bands_stub);
-
- error = ofputil_decode_meter_mod(oh, &mm, &bands);
- if (error) {
- goto exit_free_bands;
+ if (gm->type > OFPGT11_FF) {
+ return OFPERR_OFPGMFC_BAD_TYPE;
}
- meter_id = mm.meter.meter_id;
+ victim = ofproto->ofproto_class->group_alloc();
+ if (!victim) {
+ VLOG_WARN_RL(&rl, "%s: failed to allocate group", ofproto->name);
+ return OFPERR_OFPGMFC_OUT_OF_GROUPS;
+ }
- if (mm.command != OFPMC13_DELETE) {
- /* Fails also when meters are not implemented by the provider. */
- if (!meter_id || meter_id > ofproto->meter_features.max_meters) {
- error = OFPERR_OFPMMFC_INVALID_METER;
- goto exit_free_bands;
- }
- if (mm.meter.n_bands > ofproto->meter_features.max_bands) {
- error = OFPERR_OFPMMFC_OUT_OF_BANDS;
- goto exit_free_bands;
- }
+ if (!ofproto_group_write_lookup(ofproto, gm->group_id, &ofgroup)) {
+ error = OFPERR_OFPGMFC_UNKNOWN_GROUP;
+ goto free_out;
+ }
+ /* Both group's and its container's write locks held now.
+ * Also, n_groups[] is protected by ofproto->groups_rwlock. */
+ if (ofgroup->type != gm->type
+ && ofproto->n_groups[gm->type] >= ofproto->ogf.max_groups[gm->type]) {
+ error = OFPERR_OFPGMFC_OUT_OF_GROUPS;
+ goto unlock_out;
}
- switch (mm.command) {
- case OFPMC13_ADD:
- error = handle_add_meter(ofproto, &mm);
- break;
+ *victim = *ofgroup;
+ list_move(&victim->buckets, &ofgroup->buckets);
- case OFPMC13_MODIFY:
- error = handle_modify_meter(ofproto, &mm);
- break;
+ ofgroup->type = gm->type;
+ list_move(&ofgroup->buckets, &gm->buckets);
+ ofgroup->n_buckets = list_size(&ofgroup->buckets);
- case OFPMC13_DELETE:
- error = handle_delete_meter(ofconn, oh, &mm);
- break;
+ error = ofproto->ofproto_class->group_modify(ofgroup, victim);
+ if (!error) {
+ ofputil_bucket_list_destroy(&victim->buckets);
+ ofproto->n_groups[victim->type]--;
+ ofproto->n_groups[ofgroup->type]++;
+ ofgroup->modified = time_msec();
+ } else {
+ ofputil_bucket_list_destroy(&ofgroup->buckets);
- default:
- error = OFPERR_OFPMMFC_BAD_COMMAND;
- break;
+ *ofgroup = *victim;
+ list_move(&ofgroup->buckets, &victim->buckets);
}
-exit_free_bands:
- ofpbuf_uninit(&bands);
+ unlock_out:
+ ovs_rwlock_unlock(&ofgroup->rwlock);
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+ free_out:
+ ofproto->ofproto_class->group_dealloc(victim);
return error;
}
-static enum ofperr
-handle_meter_features_request(struct ofconn *ofconn,
- const struct ofp_header *request)
+static void
+delete_group__(struct ofproto *ofproto, struct ofgroup *ofgroup)
+ OVS_RELEASES(ofproto->groups_rwlock)
{
- struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct ofputil_meter_features features;
- struct ofpbuf *b;
+ struct match match;
+ struct ofputil_flow_mod fm;
- if (ofproto->ofproto_class->meter_get_features) {
- ofproto->ofproto_class->meter_get_features(ofproto, &features);
+ /* 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.out_group = ofgroup->group_id;
+ handle_flow_mod__(ofproto, NULL, &fm, NULL);
+
+ /* Must wait until existing readers are done,
+ * while holding the container's write lock at the same time. */
+ ovs_rwlock_wrlock(&ofgroup->rwlock);
+ hmap_remove(&ofproto->groups, &ofgroup->hmap_node);
+ /* No-one can find this group any more. */
+ ofproto->n_groups[ofgroup->type]--;
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
+
+ ofproto->ofproto_class->group_destruct(ofgroup);
+ ofputil_bucket_list_destroy(&ofgroup->buckets);
+ ovs_rwlock_unlock(&ofgroup->rwlock);
+ ovs_rwlock_destroy(&ofgroup->rwlock);
+ ofproto->ofproto_class->group_dealloc(ofgroup);
+}
+
+/* Implements OFPGC_DELETE. */
+static void
+delete_group(struct ofproto *ofproto, uint32_t group_id)
+{
+ struct ofgroup *ofgroup;
+
+ ovs_rwlock_wrlock(&ofproto->groups_rwlock);
+ if (group_id == OFPG_ALL) {
+ for (;;) {
+ struct hmap_node *node = hmap_first(&ofproto->groups);
+ if (!node) {
+ break;
+ }
+ ofgroup = CONTAINER_OF(node, struct ofgroup, hmap_node);
+ delete_group__(ofproto, ofgroup);
+ /* Lock for each node separately, so that we will not jam the
+ * other threads for too long time. */
+ ovs_rwlock_wrlock(&ofproto->groups_rwlock);
+ }
} else {
- memset(&features, 0, sizeof features);
+ HMAP_FOR_EACH_IN_BUCKET (ofgroup, hmap_node,
+ hash_int(group_id, 0), &ofproto->groups) {
+ if (ofgroup->group_id == group_id) {
+ delete_group__(ofproto, ofgroup);
+ return;
+ }
+ }
}
- b = ofputil_encode_meter_features_reply(&features, request);
-
- ofconn_send_reply(ofconn, b);
- return 0;
+ ovs_rwlock_unlock(&ofproto->groups_rwlock);
}
static enum ofperr
-handle_meter_request(struct ofconn *ofconn, const struct ofp_header *request,
- enum ofptype type)
+handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
- struct list replies;
- uint64_t bands_stub[256 / 8];
- struct ofpbuf bands;
- uint32_t meter_id, first, last;
+ struct ofputil_group_mod gm;
+ enum ofperr error;
- ofputil_decode_meter_request(request, &meter_id);
+ error = reject_slave_controller(ofconn);
+ if (error) {
+ return error;
+ }
- if (meter_id == OFPM13_ALL) {
- first = 1;
- last = ofproto->meter_features.max_meters;
- } else {
- if (!meter_id || meter_id > ofproto->meter_features.max_meters ||
- !ofproto->meters[meter_id]) {
- return OFPERR_OFPMMFC_UNKNOWN_METER;
- }
- first = last = meter_id;
+ error = ofputil_decode_group_mod(oh, &gm);
+ if (error) {
+ return error;
}
- ofpbuf_use_stub(&bands, bands_stub, sizeof bands_stub);
- ofpmp_init(&replies, request);
+ switch (gm.command) {
+ case OFPGC11_ADD:
+ return add_group(ofproto, &gm);
- for (meter_id = first; meter_id <= last; ++meter_id) {
- struct meter *meter = ofproto->meters[meter_id];
- if (!meter) {
- continue; /* Skip non-existing meters. */
- }
- if (type == OFPTYPE_METER_STATS_REQUEST) {
- struct ofputil_meter_stats stats;
+ case OFPGC11_MODIFY:
+ return modify_group(ofproto, &gm);
- stats.meter_id = meter_id;
+ case OFPGC11_DELETE:
+ delete_group(ofproto, gm.group_id);
+ return 0;
- /* Provider sets the packet and byte counts, we do the rest. */
- stats.flow_count = list_size(&meter->rules);
- calc_duration(meter->created, time_msec(),
- &stats.duration_sec, &stats.duration_nsec);
- stats.n_bands = meter->n_bands;
- ofpbuf_clear(&bands);
- stats.bands
- = ofpbuf_put_uninit(&bands,
- meter->n_bands * sizeof *stats.bands);
+ default:
+ if (gm.command > OFPGC11_DELETE) {
+ VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d",
+ ofproto->name, gm.command);
+ }
+ return OFPERR_OFPGMFC_BAD_COMMAND;
+ }
+}
- if (!ofproto->ofproto_class->meter_get(ofproto,
- meter->provider_meter_id,
- &stats)) {
- ofputil_append_meter_stats(&replies, &stats);
- }
- } else { /* type == OFPTYPE_METER_CONFIG_REQUEST */
- struct ofputil_meter_config config;
+static enum ofperr
+handle_table_mod(struct ofconn *ofconn, const struct ofp_header *oh)
+{
+ struct ofputil_table_mod tm;
+ enum ofperr error;
- config.meter_id = meter_id;
- config.flags = meter->flags;
- config.n_bands = meter->n_bands;
- config.bands = meter->bands;
- ofputil_append_meter_config(&replies, &config);
- }
+ error = reject_slave_controller(ofconn);
+ if (error) {
+ return error;
}
- ofconn_send_replies(ofconn, &replies);
- ofpbuf_uninit(&bands);
+ error = ofputil_decode_table_mod(oh, &tm);
+ if (error) {
+ return error;
+ }
+
+ /* XXX Actual table mod support is not implemented yet. */
return 0;
}
static enum ofperr
handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg)
+ OVS_EXCLUDED(ofproto_mutex)
{
const struct ofp_header *oh = msg->data;
enum ofptype type;
if (error) {
return error;
}
+ if (oh->version >= OFP13_VERSION && ofpmsg_is_stat_request(oh)
+ && ofpmp_more(oh)) {
+ /* We have no buffer implementation for multipart requests.
+ * Report overflow for requests which consists of multiple
+ * messages. */
+ return OFPERR_OFPBRC_MULTIPART_BUFFER_OVERFLOW;
+ }
switch (type) {
/* OpenFlow requests. */
case OFPTYPE_FLOW_MOD:
return handle_flow_mod(ofconn, oh);
+ case OFPTYPE_GROUP_MOD:
+ return handle_group_mod(ofconn, oh);
+
+ case OFPTYPE_TABLE_MOD:
+ return handle_table_mod(ofconn, oh);
+
case OFPTYPE_METER_MOD:
return handle_meter_mod(ofconn, oh);
case OFPTYPE_SET_ASYNC_CONFIG:
return handle_nxt_set_async_config(ofconn, oh);
+ case OFPTYPE_GET_ASYNC_REQUEST:
+ return handle_nxt_get_async_request(ofconn, oh);
+
/* Statistics requests. */
case OFPTYPE_DESC_STATS_REQUEST:
return handle_desc_stats_request(ofconn, oh);
case OFPTYPE_METER_FEATURES_STATS_REQUEST:
return handle_meter_features_request(ofconn, oh);
- /* FIXME: Change the following once they are implemented: */
- case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
- case OFPTYPE_GET_ASYNC_REQUEST:
case OFPTYPE_GROUP_STATS_REQUEST:
+ return handle_group_stats_request(ofconn, oh);
+
case OFPTYPE_GROUP_DESC_STATS_REQUEST:
+ return handle_group_desc_stats_request(ofconn, oh);
+
case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
- case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
- return OFPERR_OFPBRC_BAD_TYPE;
+ return handle_group_features_stats_request(ofconn, oh);
+
+ case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
+ return handle_queue_get_config_request(ofconn, oh);
case OFPTYPE_HELLO:
case OFPTYPE_ERROR:
case OFPTYPE_METER_STATS_REPLY:
case OFPTYPE_METER_CONFIG_STATS_REPLY:
case OFPTYPE_METER_FEATURES_STATS_REPLY:
+ case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
+ case OFPTYPE_ROLE_STATUS:
default:
- return OFPERR_OFPBRC_BAD_TYPE;
+ if (ofpmsg_is_stat_request(oh)) {
+ return OFPERR_OFPBRC_BAD_STAT;
+ } else {
+ return OFPERR_OFPBRC_BAD_TYPE;
+ }
}
}
static bool
handle_openflow(struct ofconn *ofconn, const struct ofpbuf *ofp_msg)
+ OVS_EXCLUDED(ofproto_mutex)
{
int error = handle_openflow__(ofconn, ofp_msg);
if (error && error != OFPROTO_POSTPONE) {
* ofoperation_create() and then submit it with ofopgroup_submit(). */
static struct ofopgroup *
ofopgroup_create_unattached(struct ofproto *ofproto)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofopgroup *group = xzalloc(sizeof *group);
group->ofproto = ofproto;
static struct ofopgroup *
ofopgroup_create(struct ofproto *ofproto, struct ofconn *ofconn,
const struct ofp_header *request, uint32_t buffer_id)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofopgroup *group = ofopgroup_create_unattached(ofproto);
if (ofconn) {
* groups. */
static void
ofopgroup_submit(struct ofopgroup *group)
+ OVS_REQUIRES(ofproto_mutex)
{
if (!group->n_running) {
ofopgroup_complete(group);
static void
ofopgroup_complete(struct ofopgroup *group)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = group->ofproto;
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. */
- BUILD_ASSERT_DECL((enum nx_flow_update_event) OFOPERATION_ADD
- == NXFME_ADDED);
- BUILD_ASSERT_DECL((enum nx_flow_update_event) OFOPERATION_DELETE
- == NXFME_DELETED);
- BUILD_ASSERT_DECL((enum nx_flow_update_event) OFOPERATION_MODIFY
- == NXFME_MODIFIED);
-
- ofmonitor_report(ofproto->connmgr, rule,
- (enum nx_flow_update_event) op->type,
+ enum nx_flow_update_event event_type;
+
+ switch (op->type) {
+ case OFOPERATION_ADD:
+ case OFOPERATION_REPLACE:
+ event_type = NXFME_ADDED;
+ break;
+
+ case OFOPERATION_DELETE:
+ event_type = NXFME_DELETED;
+ break;
+
+ case OFOPERATION_MODIFY:
+ event_type = NXFME_MODIFIED;
+ break;
+
+ default:
+ NOT_REACHED();
+ }
+
+ ofmonitor_report(ofproto->connmgr, rule, event_type,
op->reason, abbrev_ofconn, abbrev_xid);
}
if (!op->error) {
uint16_t vid_mask;
- ofproto_rule_destroy__(op->victim);
vid_mask = minimask_get_vid_mask(&rule->cr.match.mask);
if (vid_mask == VLAN_VID_MASK) {
if (ofproto->vlan_bitmap) {
}
}
} else {
- oftable_substitute_rule(rule, op->victim);
- ofproto_rule_destroy__(rule);
+ oftable_remove_rule(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;
case OFOPERATION_MODIFY:
+ case OFOPERATION_REPLACE:
if (!op->error) {
- rule->modified = time_msec();
+ long long int now = time_msec();
+
+ rule->modified = now;
+ if (op->type == OFOPERATION_REPLACE) {
+ rule->created = rule->used = now;
+ }
} else {
ofproto_rule_change_cookie(ofproto, rule, op->flow_cookie);
- if (op->ofpacts) {
- free(rule->ofpacts);
- rule->ofpacts = op->ofpacts;
- rule->ofpacts_len = op->ofpacts_len;
- op->ofpacts = NULL;
- op->ofpacts_len = 0;
+ ovs_mutex_lock(&rule->mutex);
+ rule->idle_timeout = op->idle_timeout;
+ rule->hard_timeout = op->hard_timeout;
+ ovs_mutex_unlock(&rule->mutex);
+ if (op->actions) {
+ struct rule_actions *old_actions;
+
+ ovs_mutex_lock(&rule->mutex);
+ old_actions = rule->actions;
+ rule->actions = op->actions;
+ ovs_mutex_unlock(&rule->mutex);
+
+ op->actions = NULL;
+ rule_actions_unref(old_actions);
}
+ rule->flags = op->flags;
}
break;
ofoperation_create(struct ofopgroup *group, struct rule *rule,
enum ofoperation_type type,
enum ofp_flow_removed_reason reason)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = group->ofproto;
struct ofoperation *op;
op->type = type;
op->reason = reason;
op->flow_cookie = rule->flow_cookie;
+ ovs_mutex_lock(&rule->mutex);
+ op->idle_timeout = rule->idle_timeout;
+ op->hard_timeout = rule->hard_timeout;
+ ovs_mutex_unlock(&rule->mutex);
+ op->flags = rule->flags;
group->n_running++;
static void
ofoperation_destroy(struct ofoperation *op)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofopgroup *group = op->group;
hmap_remove(&group->ofproto->deletions, &op->hmap_node);
}
list_remove(&op->group_node);
- free(op->ofpacts);
+ rule_actions_unref(op->actions);
free(op);
}
* indicate success or an OpenFlow error code on failure.
*
* If 'error' is 0, indicating success, the operation will be committed
- * permanently to the flow table. There is one interesting subcase:
- *
- * - If 'op' is an "add flow" operation that is replacing an existing rule in
- * the flow table (the "victim" rule) by a new one, then the caller must
- * have uninitialized any derived state in the victim rule, as in step 5 in
- * the "Life Cycle" in ofproto/ofproto-provider.h. ofoperation_complete()
- * performs steps 6 and 7 for the victim rule, most notably by calling its
- * ->rule_dealloc() function.
+ * permanently to the flow table.
*
* If 'error' is nonzero, then generally the operation will be rolled back:
*
{
struct ofopgroup *group = op->group;
- ovs_assert(op->rule->pending == op);
ovs_assert(group->n_running > 0);
ovs_assert(!error || op->type != OFOPERATION_DELETE);
op->error = error;
if (!--group->n_running && !list_is_empty(&group->ofproto_node)) {
+ /* This function can be called from ->rule_construct(), in which case
+ * ofproto_mutex is held, or it can be called from ->run(), in which
+ * case ofproto_mutex is not held. But only in the latter case can we
+ * arrive here, so we can safely take ofproto_mutex now. */
+ ovs_mutex_lock(&ofproto_mutex);
+ ovs_assert(op->rule->pending == op);
ofopgroup_complete(group);
+ ovs_mutex_unlock(&ofproto_mutex);
}
}
-
-struct rule *
-ofoperation_get_victim(struct ofoperation *op)
-{
- ovs_assert(op->type == OFOPERATION_ADD);
- return op->victim;
-}
\f
static uint64_t
pick_datapath_id(const struct ofproto *ofproto)
\f
/* Table overflow policy. */
-/* Chooses and returns a rule to evict from 'table'. Returns NULL if the table
- * is not configured to evict rules or if the table contains no evictable
- * rules. (Rules with 'evictable' set to false or with no timeouts are not
- * evictable.) */
-static struct rule *
-choose_rule_to_evict(struct oftable *table)
+/* Chooses and updates 'rulep' with a rule to evict from 'table'. Sets 'rulep'
+ * to NULL if the table is not configured to evict rules or if the table
+ * contains no evictable rules. (Rules with a readlock on their evict rwlock,
+ * or with no timeouts are not evictable.) */
+static bool
+choose_rule_to_evict(struct oftable *table, struct rule **rulep)
+ OVS_REQUIRES(ofproto_mutex)
{
struct eviction_group *evg;
+ *rulep = NULL;
if (!table->eviction_fields) {
- return NULL;
+ return false;
}
/* In the common case, the outer and inner loops here will each be entered
* group has no evictable rules.
*
* - The outer loop can exit only if table's 'max_flows' is all filled up
- * by unevictable rules'. */
+ * by unevictable rules. */
HEAP_FOR_EACH (evg, size_node, &table->eviction_groups_by_size) {
struct rule *rule;
HEAP_FOR_EACH (rule, evg_node, &evg->rules) {
- if (rule->evictable) {
- return rule;
- }
+ *rulep = rule;
+ return true;
}
}
- return NULL;
+ return false;
}
/* Searches 'ofproto' for tables that have more flows than their configured
static void
ofproto_evict(struct ofproto *ofproto)
{
- struct ofopgroup *group;
struct oftable *table;
- group = ofopgroup_create_unattached(ofproto);
+ ovs_mutex_lock(&ofproto_mutex);
OFPROTO_FOR_EACH_TABLE (table, ofproto) {
- while (classifier_count(&table->cls) > table->max_flows
- && table->eviction_fields) {
- struct rule *rule;
-
- rule = choose_rule_to_evict(table);
- if (!rule || rule->pending) {
- break;
- }
-
- ofoperation_create(group, rule,
- OFOPERATION_DELETE, OFPRR_EVICTION);
- oftable_remove_rule(rule);
- ofproto->ofproto_class->rule_destruct(rule);
- }
+ evict_rules_from_table(ofproto, table, 0);
}
- ofopgroup_submit(group);
+ ovs_mutex_unlock(&ofproto_mutex);
}
\f
/* Eviction groups. */
* adds or removes rules in 'evg'. */
static void
eviction_group_resized(struct oftable *table, struct eviction_group *evg)
+ OVS_REQUIRES(ofproto_mutex)
{
heap_change(&table->eviction_groups_by_size, &evg->size_node,
eviction_group_priority(heap_count(&evg->rules)));
* - Frees 'evg'. */
static void
eviction_group_destroy(struct oftable *table, struct eviction_group *evg)
+ OVS_REQUIRES(ofproto_mutex)
{
while (!heap_is_empty(&evg->rules)) {
struct rule *rule;
/* Removes 'rule' from its eviction group, if any. */
static void
eviction_group_remove_rule(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
if (rule->eviction_group) {
struct oftable *table = &rule->ofproto->tables[rule->table_id];
* returns the hash value. */
static uint32_t
eviction_group_hash_rule(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
struct oftable *table = &rule->ofproto->tables[rule->table_id];
const struct mf_subfield *sf;
* if necessary. */
static struct eviction_group *
eviction_group_find(struct oftable *table, uint32_t id)
+ OVS_REQUIRES(ofproto_mutex)
{
struct eviction_group *evg;
* for eviction. */
static uint32_t
rule_eviction_priority(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
long long int hard_expiration;
long long int idle_expiration;
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;
}
* The caller must ensure that 'rule' is not already in an eviction group. */
static void
eviction_group_add_rule(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = rule->ofproto;
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;
oftable_init(struct oftable *table)
{
memset(table, 0, sizeof *table);
- classifier_init(&table->cls);
+ classifier_init(&table->cls, flow_segment_u32s);
table->max_flows = UINT_MAX;
}
static void
oftable_destroy(struct oftable *table)
{
+ ovs_rwlock_rdlock(&table->cls.rwlock);
ovs_assert(classifier_is_empty(&table->cls));
+ ovs_rwlock_unlock(&table->cls.rwlock);
oftable_disable_eviction(table);
classifier_destroy(&table->cls);
free(table->name);
* 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;
static void
oftable_enable_eviction(struct oftable *table,
const struct mf_subfield *fields, size_t n_fields)
+ OVS_REQUIRES(ofproto_mutex)
{
struct cls_cursor cursor;
struct rule *rule;
hmap_init(&table->eviction_groups_by_id);
heap_init(&table->eviction_groups_by_size);
+ ovs_rwlock_rdlock(&table->cls.rwlock);
cls_cursor_init(&cursor, &table->cls, NULL);
CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
eviction_group_add_rule(rule);
}
+ ovs_rwlock_unlock(&table->cls.rwlock);
}
/* Removes 'rule' from the oftable that contains it. */
static void
-oftable_remove_rule(struct rule *rule)
+oftable_remove_rule__(struct ofproto *ofproto, struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
- struct ofproto *ofproto = rule->ofproto;
- struct oftable *table = &ofproto->tables[rule->table_id];
+ struct classifier *cls = &ofproto->tables[rule->table_id].cls;
+
+ ovs_rwlock_wrlock(&cls->rwlock);
+ classifier_remove(cls, CONST_CAST(struct cls_rule *, &rule->cr));
+ ovs_rwlock_unlock(&cls->rwlock);
- classifier_remove(&table->cls, &rule->cr);
- if (rule->meter_id) {
- list_remove(&rule->meter_list_node);
- }
cookies_remove(ofproto, rule);
+
eviction_group_remove_rule(rule);
if (!list_is_empty(&rule->expirable)) {
list_remove(&rule->expirable);
}
if (!list_is_empty(&rule->meter_list_node)) {
list_remove(&rule->meter_list_node);
+ list_init(&rule->meter_list_node);
}
}
-/* Inserts 'rule' into its oftable. Removes any existing rule from 'rule''s
- * oftable that has an identical cls_rule. Returns the rule that was removed,
- * if any, and otherwise NULL. */
-static struct rule *
-oftable_replace_rule(struct rule *rule)
+static void
+oftable_remove_rule(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
+{
+ oftable_remove_rule__(rule->ofproto, rule);
+}
+
+/* Inserts 'rule' into its oftable, which must not already contain any rule for
+ * the same cls_rule. */
+static void
+oftable_insert_rule(struct rule *rule)
+ OVS_REQUIRES(ofproto_mutex)
{
struct ofproto *ofproto = rule->ofproto;
struct oftable *table = &ofproto->tables[rule->table_id];
- struct rule *victim;
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) {
list_insert(&ofproto->expirable, &rule->expirable);
}
+
cookies_insert(ofproto, rule);
- if (rule->meter_id) {
- struct meter *meter = ofproto->meters[rule->meter_id];
- list_insert(&meter->rules, &rule->meter_list_node);
- }
- victim = rule_from_cls_rule(classifier_replace(&table->cls, &rule->cr));
- if (victim) {
- if (victim->meter_id) {
- list_remove(&victim->meter_list_node);
- }
- cookies_remove(ofproto, victim);
- if (!list_is_empty(&victim->expirable)) {
- list_remove(&victim->expirable);
- }
- eviction_group_remove_rule(victim);
+ if (rule->actions->provider_meter_id != UINT32_MAX) {
+ uint32_t meter_id = ofpacts_get_meter(rule->actions->ofpacts,
+ rule->actions->ofpacts_len);
+ struct meter *meter = ofproto->meters[meter_id];
+ list_insert(&meter->rules, &rule->meter_list_node);
}
+ ovs_rwlock_wrlock(&table->cls.rwlock);
+ classifier_insert(&table->cls, CONST_CAST(struct cls_rule *, &rule->cr));
+ ovs_rwlock_unlock(&table->cls.rwlock);
eviction_group_add_rule(rule);
- return victim;
-}
-
-/* Removes 'old' from its oftable then, if 'new' is nonnull, inserts 'new'. */
-static void
-oftable_substitute_rule(struct rule *old, struct rule *new)
-{
- if (new) {
- oftable_replace_rule(new);
- } else {
- oftable_remove_rule(old);
- }
}
\f
/* unixctl commands. */
ofproto->vlans_changed = false;
OFPROTO_FOR_EACH_TABLE (oftable, ofproto) {
- const struct cls_table *table;
+ const struct cls_subtable *table;
- HMAP_FOR_EACH (table, hmap_node, &oftable->cls.tables) {
+ ovs_rwlock_rdlock(&oftable->cls.rwlock);
+ HMAP_FOR_EACH (table, hmap_node, &oftable->cls.subtables) {
if (minimask_get_vid_mask(&table->mask) == VLAN_VID_MASK) {
const struct cls_rule *rule;
}
}
}
+ ovs_rwlock_unlock(&oftable->cls.rwlock);
}
}
projects / cascardo / ovs.git / blobdiff