X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=8fa5e8473df1368aec4a9338c42927becbad5161;hb=2431be1b68d386bd616378d2c528242775c4d54a;hp=26f8069e946d557c08ba65f71fec8f6dd5eb0db5;hpb=a9b22b7f1757c93b3d540c4c43d35d56b4e17c57;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 26f8069e9..8fa5e8473 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -57,14 +57,11 @@ 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 { @@ -124,9 +121,7 @@ struct ofoperation { /* OFOPERATION_MODIFY, OFOPERATION_REPLACE: The old actions, if the actions * are changing. */ - struct ofpact *ofpacts; - size_t ofpacts_len; - uint32_t meter_id; + struct rule_actions *actions; /* OFOPERATION_DELETE. */ enum ofp_flow_removed_reason reason; /* Reason flow was removed. */ @@ -155,10 +150,9 @@ static void oftable_enable_eviction(struct oftable *, const struct mf_subfield *fields, size_t n_fields); -static void oftable_remove_rule(struct rule *rule) OVS_RELEASES(rule->rwlock); -static void oftable_remove_rule__(struct ofproto *ofproto, - struct classifier *cls, struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->rwlock); +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 @@ -183,9 +177,8 @@ struct eviction_group { struct heap rules; /* Contains "struct rule"s. */ }; -static bool choose_rule_to_evict(struct oftable *table, struct rule **rulep) - OVS_TRY_WRLOCK(true, (*rulep)->rwlock); -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 *); @@ -222,16 +215,46 @@ static void rule_criteria_init(struct rule_criteria *, uint8_t table_id, 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_destroy__(struct rule *); static void ofproto_rule_send_removed(struct rule *, uint8_t reason); static bool rule_is_modifiable(const struct rule *); @@ -242,15 +265,17 @@ static enum ofperr add_flow(struct ofproto *, struct ofconn *, const struct ofp_header *); static enum ofperr modify_flows__(struct ofproto *, struct ofconn *, struct ofputil_flow_mod *, - const struct ofp_header *, struct list *); + const struct ofp_header *, + const struct rule_collection *); static void delete_flow__(struct rule *rule, struct ofopgroup *, enum ofp_flow_removed_reason) - OVS_RELEASES(rule->rwlock); + OVS_REQUIRES(ofproto_mutex); static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *); static bool handle_openflow(struct ofconn *, const struct ofpbuf *); static enum ofperr handle_flow_mod__(struct ofproto *, struct ofconn *, 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); @@ -269,6 +294,9 @@ static const struct ofproto_class **ofproto_classes; 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; @@ -423,7 +451,7 @@ ofproto_enumerate_names(const char *type, struct sset *names) { 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, @@ -454,6 +482,7 @@ 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); @@ -470,6 +499,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type, 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 = ofp_to_u16(OFPP_MAX); @@ -478,12 +508,12 @@ ofproto_create(const char *datapath_name, const char *datapath_type, ofproto->n_tables = 0; hindex_init(&ofproto->cookies); list_init(&ofproto->expirable); - ovs_mutex_init_recursive(&ofproto->expirable_mutex); ofproto->connmgr = connmgr_create(ofproto, datapath_name, datapath_name); ofproto->state = S_OPENFLOW; list_init(&ofproto->pending); ofproto->n_pending = 0; hmap_init(&ofproto->deletions); + guarded_list_init(&ofproto->rule_executes); ofproto->n_add = ofproto->n_delete = ofproto->n_modify = 0; ofproto->first_op = ofproto->last_op = LLONG_MIN; ofproto->next_op_report = LLONG_MAX; @@ -493,6 +523,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type, ofproto->min_mtu = INT_MAX; ovs_rwlock_init(&ofproto->groups_rwlock); hmap_init(&ofproto->groups); + ovs_mutex_unlock(&ofproto_mutex); error = ofproto->ofproto_class->construct(ofproto); if (error) { @@ -502,11 +533,6 @@ ofproto_create(const char *datapath_name, const char *datapath_type, 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(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++) { @@ -1112,30 +1138,50 @@ ofproto_get_snoops(const struct ofproto *ofproto, struct sset *snoops) connmgr_get_snoops(ofproto->connmgr, snoops); } +static void +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'. * - * The 'cls' argument is redundant (it is &ofproto->tables[rule->table_id].cls) - * but it allows Clang to do better checking. */ -static void -ofproto_delete_rule(struct ofproto *ofproto, struct classifier *cls, - struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) + * 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); - ovs_assert(cls == &ofproto->tables[rule->table_id].cls); group = ofopgroup_create_unattached(ofproto); ofoperation_create(group, rule, OFOPERATION_DELETE, OFPRR_DELETE); - ovs_rwlock_wrlock(&rule->rwlock); - oftable_remove_rule__(ofproto, cls, rule); + 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; @@ -1143,6 +1189,7 @@ ofproto_flush__(struct ofproto *ofproto) ofproto->ofproto_class->flush(ofproto); } + ovs_mutex_lock(&ofproto_mutex); OFPROTO_FOR_EACH_TABLE (table, ofproto) { struct rule *rule, *next_rule; struct cls_cursor cursor; @@ -1151,26 +1198,30 @@ ofproto_flush__(struct ofproto *ofproto) continue; } - ovs_rwlock_wrlock(&table->cls.rwlock); + 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) { - ofproto_delete_rule(ofproto, &table->cls, rule); + ofproto_rule_delete__(ofproto, rule, OFPRR_DELETE); } } - ovs_rwlock_unlock(&table->cls.rwlock); } + 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); + + destroy_rule_executes(ofproto); + guarded_list_destroy(&ofproto->rule_executes); delete_group(ofproto, OFPG_ALL); ovs_rwlock_destroy(&ofproto->groups_rwlock); @@ -1187,8 +1238,8 @@ ofproto_destroy__(struct ofproto *ofproto) 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) { @@ -1200,14 +1251,15 @@ ofproto_destroy__(struct ofproto *ofproto) free(ofproto->vlan_bitmap); - ovs_mutex_destroy(&ofproto->expirable_mutex); ofproto->ofproto_class->dealloc(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; @@ -1225,6 +1277,11 @@ ofproto_destroy(struct ofproto *p) 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); } @@ -1302,6 +1359,19 @@ ofproto_type_wait(const char *datapath_type) } } +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) { @@ -1315,6 +1385,8 @@ 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; @@ -1331,6 +1403,7 @@ ofproto_run(struct ofproto *p) continue; } + ovs_mutex_lock(&ofproto_mutex); HEAP_FOR_EACH (evg, size_node, &table->eviction_groups_by_size) { heap_rebuild(&evg->rules); } @@ -1344,6 +1417,7 @@ ofproto_run(struct ofproto *p) } } ovs_rwlock_unlock(&table->cls.rwlock); + ovs_mutex_unlock(&ofproto_mutex); } } @@ -1382,7 +1456,7 @@ ofproto_run(struct ofproto *p) 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; @@ -1390,7 +1464,7 @@ ofproto_run(struct ofproto *p) 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; } @@ -1483,7 +1557,7 @@ ofproto_wait(struct ofproto *p) 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; @@ -1505,8 +1579,11 @@ ofproto_get_memory_usage(const struct ofproto *ofproto, struct simap *usage) 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) { @@ -1721,6 +1798,34 @@ ofproto_port_del(struct ofproto *ofproto, ofp_port_t ofp_port) return error; } +static int +simple_flow_mod(struct ofproto *ofproto, + const struct match *match, unsigned int priority, + const struct ofpact *ofpacts, size_t ofpacts_len, + enum ofp_flow_mod_command command) +{ + struct ofputil_flow_mod fm; + + memset(&fm, 0, sizeof fm); + fm.match = *match; + fm.priority = priority; + fm.cookie = 0; + fm.new_cookie = 0; + fm.modify_cookie = false; + fm.table_id = 0; + fm.command = command; + fm.idle_timeout = 0; + fm.hard_timeout = 0; + fm.buffer_id = UINT32_MAX; + fm.out_port = OFPP_ANY; + fm.out_group = OFPG_ANY; + fm.flags = 0; + fm.ofpacts = CONST_CAST(struct ofpact *, ofpacts); + fm.ofpacts_len = ofpacts_len; + + return handle_flow_mod__(ofproto, NULL, &fm, NULL); +} + /* Adds a flow to OpenFlow flow table 0 in 'p' that matches 'cls_rule' and * performs the 'n_actions' actions in 'actions'. The new flow will not * timeout. @@ -1736,25 +1841,34 @@ void 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) { + ovs_mutex_lock(&rule->mutex); + must_add = !ofpacts_equal(rule->actions->ofpacts, + rule->actions->ofpacts_len, + ofpacts, ofpacts_len); + ovs_mutex_unlock(&rule->mutex); + } else { + must_add = true; + } ovs_rwlock_unlock(&ofproto->tables[0].cls.rwlock); - if (!rule || !ofpacts_equal(rule->ofpacts, rule->ofpacts_len, - ofpacts, ofpacts_len)) { - struct ofputil_flow_mod fm; - memset(&fm, 0, sizeof fm); - fm.match = *match; - fm.priority = priority; - fm.buffer_id = UINT32_MAX; - fm.ofpacts = 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); } } @@ -1762,9 +1876,11 @@ ofproto_add_flow(struct ofproto *ofproto, const struct match *match, * 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); } @@ -1776,30 +1892,26 @@ ofproto_flow_mod(struct ofproto *ofproto, struct ofputil_flow_mod *fm) 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; + /* First do a cheap check whether the rule we're looking for has already + * been deleted. If so, then we're done. */ ovs_rwlock_rdlock(&cls->rwlock); rule = rule_from_cls_rule(classifier_find_match_exactly(cls, target, priority)); ovs_rwlock_unlock(&cls->rwlock); if (!rule) { - /* No such rule -> success. */ - return true; - } else if (rule->pending) { - /* An operation on the rule is already pending -> failure. - * Caller must retry later if it's important. */ - return false; - } else { - /* Initiate deletion -> success. */ - ovs_rwlock_wrlock(&cls->rwlock); - ofproto_delete_rule(ofproto, cls, rule); - ovs_rwlock_unlock(&cls->rwlock); - return true; } + /* Fall back to a executing a full flow mod. We can't optimize this at all + * because we didn't take enough locks above to ensure that the flow table + * didn't already change beneath us. */ + return simple_flow_mod(ofproto, target, priority, NULL, 0, + OFPFC_DELETE_STRICT) != OFPROTO_POSTPONE; } /* Starts the process of deleting all of the flows from all of ofproto's flow @@ -1846,35 +1958,52 @@ alloc_ofp_port(struct ofproto *ofproto, const char *netdev_name) port_idx = port_idx ? port_idx : UINT16_MAX; if (port_idx >= ofproto->max_ports - || bitmap_is_set(ofproto->ofp_port_ids, port_idx)) { - uint16_t end_port_no = ofproto->alloc_port_no; + || 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. */ for (;;) { if (++ofproto->alloc_port_no >= ofproto->max_ports) { - ofproto->alloc_port_no = 0; + ofproto->alloc_port_no = 1; } - if (!bitmap_is_set(ofproto->ofp_port_ids, - ofproto->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 (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) < ofproto->max_ports) { - bitmap_set0(ofproto->ofp_port_ids, ofp_to_u16(ofp_port)); + ofport_set_usage(ofproto, ofp_port, time_msec()); } } @@ -2099,6 +2228,55 @@ ofproto_get_port(const struct ofproto *ofproto, ofp_port_t ofp_port) 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) { @@ -2290,61 +2468,142 @@ update_mtu(struct ofproto *p, struct ofport *port) } } -static void -ofproto_rule_destroy(struct rule *rule) +void +ofproto_rule_ref(struct rule *rule) { if (rule) { - rule->ofproto->ofproto_class->rule_destruct(rule); - ofproto_rule_destroy__(rule); + unsigned int orig; + + atomic_add(&rule->ref_count, 1, &orig); + ovs_assert(orig != 0); } } +void +ofproto_rule_unref(struct rule *rule) +{ + if (rule) { + unsigned int orig; + + atomic_sub(&rule->ref_count, 1, &orig); + if (orig == 1) { + rule->ofproto->ofproto_class->rule_destruct(rule); + ofproto_rule_destroy__(rule); + } else { + ovs_assert(orig != 0); + } + } +} + +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 { - cls_rule_destroy(&rule->cr); - free(rule->ofpacts); - ovs_mutex_destroy(&rule->timeout_mutex); - ovs_rwlock_destroy(&rule->rwlock); + cls_rule_destroy(CONST_CAST(struct cls_rule *, &rule->cr)); + rule_actions_unref(rule->actions); + ovs_mutex_destroy(&rule->mutex); rule->ofproto->ofproto_class->rule_dealloc(rule); } -/* This function allows an ofproto implementation to destroy any rules that - * remain when its ->destruct() function is called.. This function implements - * steps 4.4 and 4.5 in the section titled "Rule Life Cycle" in - * ofproto-provider.h. - * - * This function should only be called from an ofproto implementation's - * ->destruct() function. It is not suitable elsewhere. */ +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); + } +} + +/* Decrements 'actions''s ref_count and frees 'actions' if the ref_count + * reaches 0. */ void -ofproto_rule_delete(struct ofproto *ofproto, struct classifier *cls, - struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) +rule_actions_unref(struct rule_actions *actions) { - ofproto_delete_rule(ofproto, cls, 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. */ -bool +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->ofpacts, rule->ofpacts_len, group_id)); + || ofpacts_output_to_group(rule->actions->ofpacts, + rule->actions->ofpacts_len, group_id)); } /* Returns true if a rule related to 'op' has an OpenFlow OFPAT_OUTPUT or * 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; @@ -2357,28 +2616,56 @@ ofoperation_has_out_port(const struct ofoperation *op, ofp_port_t out_port) case OFOPERATION_MODIFY: case OFOPERATION_REPLACE: - return ofpacts_output_to_port(op->ofpacts, op->ofpacts_len, out_port); + return ofpacts_output_to_port(op->actions->ofpacts, + op->actions->ofpacts_len, out_port); } NOT_REACHED(); } -/* Executes the actions indicated by 'rule' on 'packet' and credits 'rule''s - * statistics appropriately. - * - * 'packet' doesn't necessarily have to match 'rule'. 'rule' will be credited - * with statistics for 'packet' either way. - * - * Takes ownership of 'packet'. */ -static int -rule_execute(struct rule *rule, ofp_port_t in_port, struct ofpbuf *packet) +static void +rule_execute_destroy(struct rule_execute *e) { - struct flow flow; - union flow_in_port in_port_; + ofproto_rule_unref(e->rule); + list_remove(&e->list_node); + free(e); +} - 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); +/* 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); + } +} + +/* Destroys and discards all "rule_execute" operations queued up in + * ofproto->rule_executes. */ +static void +destroy_rule_executes(struct ofproto *ofproto) +{ + struct rule_execute *e, *next; + struct list executes; + + guarded_list_pop_all(&ofproto->rule_executes, &executes); + LIST_FOR_EACH_SAFE (e, next, list_node, &executes) { + ofpbuf_delete(e->packet); + rule_execute_destroy(e); + } } /* Returns true if 'rule' should be hidden from the controller. @@ -2386,7 +2673,7 @@ rule_execute(struct rule *rule, ofp_port_t in_port, struct ofpbuf *packet) * 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; @@ -2529,30 +2816,6 @@ reject_slave_controller(struct ofconn *ofconn) } } -/* Finds the OFPACT_METER action, if any, in the 'ofpacts_len' bytes of - * 'ofpacts'. If found, returns its meter ID; if not, returns 0. - * - * This function relies on the order of 'ofpacts' being correct (as checked by - * ofpacts_verify()). */ -static uint32_t -find_meter(const struct ofpact ofpacts[], size_t ofpacts_len) -{ - const struct ofpact *a; - - OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - enum ovs_instruction_type inst; - - inst = ovs_instruction_type_from_ofpact_type(a->type); - if (a->type == OFPACT_METER) { - return ofpact_get_METER(a)->meter_id; - } else if (inst > OVSINST_OFPIT13_METER) { - break; - } - } - - return 0; -} - /* Checks that the 'ofpacts_len' bytes of actions in 'ofpacts' are appropriate * for a packet with the prerequisites satisfied by 'flow' in table 'table_id'. * 'flow' may be temporarily modified, but is restored at return. @@ -2560,19 +2823,21 @@ find_meter(const struct ofpact ofpacts[], size_t ofpacts_len) static enum ofperr ofproto_check_ofpacts(struct ofproto *ofproto, const struct ofpact ofpacts[], size_t ofpacts_len, - struct flow *flow, uint8_t table_id) + struct flow *flow, uint8_t table_id, + bool enforce_consistency) { enum ofperr error; uint32_t mid; error = ofpacts_check(ofpacts, ofpacts_len, flow, - u16_to_ofp(ofproto->max_ports), table_id); + u16_to_ofp(ofproto->max_ports), table_id, + enforce_consistency); if (error) { return error; } - mid = find_meter(ofpacts, ofpacts_len); - if (mid && ofproto_get_provider_meter_id(ofproto, mid) == UINT32_MAX) { + mid = ofpacts_get_meter(ofpacts, ofpacts_len); + if (mid && get_provider_meter_id(ofproto, mid) == UINT32_MAX) { return OFPERR_OFPMMFC_INVALID_METER; } return 0; @@ -2624,7 +2889,8 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh) /* 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, &flow, 0, + oh->version > OFP10_VERSION); if (!error) { error = p->ofproto_class->packet_out(p, payload, &flow, po.ofpacts, po.ofpacts_len); @@ -2745,14 +3011,14 @@ handle_table_stats_request(struct ofconn *ofconn, 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); + 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. */ @@ -2866,6 +3132,7 @@ hash_cookie(ovs_be64 cookie) 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)); @@ -2873,6 +3140,7 @@ cookies_insert(struct ofproto *ofproto, struct rule *rule) static void cookies_remove(struct ofproto *ofproto, struct rule *rule) + OVS_REQUIRES(ofproto_mutex) { hindex_remove(&ofproto->cookies, &rule->cookie_node); } @@ -2880,13 +3148,14 @@ cookies_remove(struct ofproto *ofproto, struct rule *rule) 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_rwlock_wrlock(&rule->rwlock); + ovs_mutex_lock(&rule->mutex); rule->flow_cookie = new_cookie; - ovs_rwlock_unlock(&rule->rwlock); + ovs_mutex_unlock(&rule->mutex); cookies_insert(ofproto, rule); } @@ -2994,11 +3263,76 @@ rule_criteria_destroy(struct rule_criteria *criteria) cls_rule_destroy(&criteria->cr); } +void +rule_collection_init(struct rule_collection *rules) +{ + rules->rules = rules->stub; + rules->n = 0; + rules->capacity = ARRAY_SIZE(rules->stub); +} + +void +rule_collection_add(struct rule_collection *rules, struct rule *rule) +{ + if (rules->n >= rules->capacity) { + size_t old_size, new_size; + + 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 list *rules) -{ - if (ofproto_rule_is_hidden(rule)) { + 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; @@ -3007,7 +3341,7 @@ collect_rule(struct rule *rule, const struct rule_criteria *c, && 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)) { - list_push_back(rules, &rule->ofproto_node); + rule_collection_add(rules, rule); } return 0; } @@ -3023,19 +3357,21 @@ collect_rule(struct rule *rule, const struct rule_criteria *c, * Returns 0 on success, otherwise an OpenFlow error code. */ static enum ofperr collect_rules_loose(struct ofproto *ofproto, - const struct rule_criteria *criteria, struct list *rules) + 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) { - return error; + goto exit; } - list_init(rules); - - if (criteria->cookie_mask == htonll(UINT64_MAX)) { + if (criteria->cookie_mask == OVS_BE64_MAX) { struct rule *rule; HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, @@ -3065,6 +3401,10 @@ collect_rules_loose(struct ofproto *ofproto, } } +exit: + if (error) { + rule_collection_destroy(rules); + } return error; } @@ -3078,19 +3418,21 @@ collect_rules_loose(struct ofproto *ofproto, * Returns 0 on success, otherwise an OpenFlow error code. */ static enum ofperr collect_rules_strict(struct ofproto *ofproto, - const struct rule_criteria *criteria, struct list *rules) + const struct rule_criteria *criteria, + struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { struct oftable *table; int error; + rule_collection_init(rules); + error = check_table_id(ofproto, criteria->table_id); if (error) { - return error; + goto exit; } - list_init(rules); - - if (criteria->cookie_mask == htonll(UINT64_MAX)) { + if (criteria->cookie_mask == OVS_BE64_MAX) { struct rule *rule; HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, @@ -3120,6 +3462,10 @@ collect_rules_strict(struct ofproto *ofproto, } } +exit: + if (error) { + rule_collection_destroy(rules); + } return error; } @@ -3136,14 +3482,15 @@ age_secs(long long int age_ms) 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) { @@ -3152,38 +3499,59 @@ handle_flow_stats_request(struct ofconn *ofconn, 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.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); - ofproto->ofproto_class->rule_get_stats(rule, &fs.packet_count, - &fs.byte_count); - fs.ofpacts = rule->ofpacts; - fs.ofpacts_len = rule->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); + created = rule->created; + used = rule->used; + modified = rule->modified; + actions = rule_get_actions__(rule); + flags = rule->flags; + ovs_mutex_unlock(&rule->mutex); - fs.flags = rule->flags; + minimatch_expand(&rule->cr.match, &fs.match); + fs.table_id = rule->table_id; + 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 = actions->ofpacts; + fs.ofpacts_len = actions->ofpacts_len; + 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; @@ -3193,22 +3561,32 @@ static void 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 @@ -3259,16 +3637,17 @@ ofproto_port_get_cfm_status(const struct ofproto *ofproto, ofp_port_t ofp_port, 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) { @@ -3278,15 +3657,23 @@ handle_aggregate_stats_request(struct ofconn *ofconn, 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; @@ -3314,6 +3701,9 @@ handle_aggregate_stats_request(struct ofconn *ofconn, 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); @@ -3422,6 +3812,7 @@ static bool 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; @@ -3438,32 +3829,34 @@ is_flow_deletion_pending(const struct ofproto *ofproto, return false; } -static enum ofperr -evict_rule_from_table(struct ofproto *ofproto, struct oftable *table) +static bool +should_evict_a_rule(struct oftable *table, unsigned int extra_space) + OVS_REQUIRES(ofproto_mutex) + OVS_NO_THREAD_SAFETY_ANALYSIS { - struct rule *rule; - size_t n_rules; - - ovs_rwlock_rdlock(&table->cls.rwlock); - n_rules = classifier_count(&table->cls); - ovs_rwlock_unlock(&table->cls.rwlock); - - if (n_rules < table->max_flows) { - return 0; - } else if (!choose_rule_to_evict(table, &rule)) { - return OFPERR_OFPFMFC_TABLE_FULL; - } else if (rule->pending) { - ovs_rwlock_unlock(&rule->rwlock); - return OFPROTO_POSTPONE; - } else { - struct ofopgroup *group; + return classifier_count(&table->cls) + extra_space > table->max_flows; +} - group = ofopgroup_create_unattached(ofproto); - delete_flow__(rule, group, OFPRR_EVICTION); - ofopgroup_submit(group); +static enum ofperr +evict_rules_from_table(struct ofproto *ofproto, struct oftable *table, + unsigned int extra_space) + OVS_REQUIRES(ofproto_mutex) +{ + while (should_evict_a_rule(table, extra_space)) { + struct rule *rule; - return 0; + if (!choose_rule_to_evict(table, &rule)) { + return OFPERR_OFPFMFC_TABLE_FULL; + } else if (rule->pending) { + 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 @@ -3474,14 +3867,14 @@ evict_rule_from_table(struct ofproto *ofproto, struct oftable *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; @@ -3533,18 +3926,22 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, } else if (rule->pending) { return OFPROTO_POSTPONE; } else { - struct list rules; + struct rule_collection rules; - list_init(&rules); - list_push_back(&rules, &rule->ofproto_node); + rule_collection_init(&rules); + rule_collection_add(&rules, rule); fm->modify_cookie = true; - return modify_flows__(ofproto, ofconn, fm, request, &rules); + error = modify_flows__(ofproto, ofconn, fm, request, &rules); + rule_collection_destroy(&rules); + + return error; } } /* Verify actions. */ error = ofproto_check_ofpacts(ofproto, fm->ofpacts, fm->ofpacts_len, - &fm->match.flow, table_id); + &fm->match.flow, table_id, + request && request->version > OFP10_VERSION); if (error) { cls_rule_destroy(&cr); return error; @@ -3571,7 +3968,7 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, } /* If necessary, evict an existing rule to clear out space. */ - error = evict_rule_from_table(ofproto, table); + error = evict_rules_from_table(ofproto, table, 1); if (error) { cls_rule_destroy(&cr); return error; @@ -3587,31 +3984,28 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, } /* Initialize base state. */ - rule->ofproto = ofproto; - cls_rule_move(&rule->cr, &cr); + *CONST_CAST(struct ofproto **, &rule->ofproto) = ofproto; + cls_rule_move(CONST_CAST(struct cls_rule *, &rule->cr), &cr); + atomic_init(&rule->ref_count, 1); rule->pending = NULL; rule->flow_cookie = fm->new_cookie; rule->created = rule->modified = rule->used = time_msec(); - ovs_mutex_init(&rule->timeout_mutex); - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_init(&rule->mutex); + ovs_mutex_lock(&rule->mutex); rule->idle_timeout = fm->idle_timeout; rule->hard_timeout = fm->hard_timeout; - ovs_mutex_unlock(&rule->timeout_mutex); + ovs_mutex_unlock(&rule->mutex); - rule->table_id = table - ofproto->tables; + *CONST_CAST(uint8_t *, &rule->table_id) = table - ofproto->tables; rule->flags = fm->flags & OFPUTIL_FF_STATE; - - rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len); - rule->ofpacts_len = fm->ofpacts_len; - rule->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len); + rule->actions = rule_actions_create(ofproto, fm->ofpacts, fm->ofpacts_len); list_init(&rule->meter_list_node); rule->eviction_group = NULL; list_init(&rule->expirable); rule->monitor_flags = 0; rule->add_seqno = 0; rule->modify_seqno = 0; - ovs_rwlock_init(&rule->rwlock); /* Construct rule, initializing derived state. */ error = ofproto->ofproto_class->rule_construct(rule); @@ -3643,17 +4037,19 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, 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; @@ -3667,26 +4063,28 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, continue; } - /* Verify actions. */ + /* Verify actions, enforce consistency check on OF1.1+. */ error = ofpacts_check(fm->ofpacts, fm->ofpacts_len, &fm->match.flow, - u16_to_ofp(ofproto->max_ports), rule->table_id); + u16_to_ofp(ofproto->max_ports), rule->table_id, + request && request->version > OFP10_VERSION); 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, 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 (type == OFOPERATION_REPLACE) { - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_lock(&rule->mutex); rule->idle_timeout = fm->idle_timeout; rule->hard_timeout = fm->hard_timeout; - ovs_mutex_unlock(&rule->timeout_mutex); + ovs_mutex_unlock(&rule->mutex); rule->flags = fm->flags & OFPUTIL_FF_STATE; if (fm->idle_timeout || fm->hard_timeout) { @@ -3700,16 +4098,16 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, reset_counters = (fm->flags & OFPUTIL_FF_RESET_COUNTS) != 0; if (actions_changed || reset_counters) { - op->ofpacts = rule->ofpacts; - op->ofpacts_len = rule->ofpacts_len; - op->meter_id = rule->meter_id; + struct rule_actions *new_actions; - ovs_rwlock_wrlock(&rule->rwlock); - rule->ofpacts = xmemdup(fm->ofpacts, fm->ofpacts_len); - rule->ofpacts_len = fm->ofpacts_len; - ovs_rwlock_unlock(&rule->rwlock); + 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->meter_id = find_meter(rule->ofpacts, rule->ofpacts_len); rule->ofproto->ofproto_class->rule_modify_actions(rule, reset_counters); } else { @@ -3724,8 +4122,9 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, 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); @@ -3740,9 +4139,10 @@ static enum ofperr modify_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn, struct ofputil_flow_mod *fm, const struct ofp_header *request) + OVS_REQUIRES(ofproto_mutex) { struct rule_criteria criteria; - struct list rules; + struct rule_collection rules; int error; rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, @@ -3750,13 +4150,15 @@ modify_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn, error = collect_rules_loose(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 modify_flows__(ofproto, ofconn, fm, request, &rules); + 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 @@ -3768,9 +4170,10 @@ static enum ofperr modify_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, struct ofputil_flow_mod *fm, const struct ofp_header *request) + OVS_REQUIRES(ofproto_mutex) { struct rule_criteria criteria; - struct list rules; + struct rule_collection rules; int error; rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, @@ -3778,15 +4181,17 @@ modify_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, 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; } /* OFPFC_DELETE implementation. */ @@ -3794,6 +4199,7 @@ modify_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, 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; @@ -3809,16 +4215,17 @@ delete_flow__(struct rule *rule, struct ofopgroup *group, * 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) { - ovs_rwlock_wrlock(&rule->rwlock); - delete_flow__(rule, group, reason); + for (i = 0; i < rules->n; i++) { + delete_flow__(rules->rules[i], group, reason); } ofopgroup_submit(group); @@ -3830,9 +4237,10 @@ static enum ofperr 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 rule_criteria criteria; - struct list rules; + struct rule_collection rules; enum ofperr error; rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, @@ -3841,10 +4249,12 @@ delete_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn, error = collect_rules_loose(ofproto, &criteria, &rules); rule_criteria_destroy(&criteria); - return (error ? error - : !list_is_empty(&rules) ? delete_flows__(ofproto, ofconn, request, - &rules, OFPRR_DELETE) - : 0); + if (!error && rules.n > 0) { + error = delete_flows__(ofproto, ofconn, request, &rules, OFPRR_DELETE); + } + rule_collection_destroy(&rules); + + return error; } /* Implements OFPFC_DELETE_STRICT. */ @@ -3852,9 +4262,10 @@ static enum ofperr 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 rule_criteria criteria; - struct list rules; + struct rule_collection rules; enum ofperr error; rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, @@ -3863,15 +4274,17 @@ delete_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, error = collect_rules_strict(ofproto, &criteria, &rules); rule_criteria_destroy(&criteria); - return (error ? error - : list_is_singleton(&rules) ? delete_flows__(ofproto, ofconn, - request, &rules, - OFPRR_DELETE) - : 0); + 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; @@ -3887,10 +4300,10 @@ ofproto_rule_send_removed(struct rule *rule, uint8_t reason) 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); @@ -3908,17 +4321,14 @@ ofproto_rule_send_removed(struct rule *rule, uint8_t reason) * OpenFlow flows. */ void ofproto_rule_expire(struct rule *rule, uint8_t reason) + OVS_REQUIRES(ofproto_mutex) { struct ofproto *ofproto = rule->ofproto; - struct classifier *cls = &ofproto->tables[rule->table_id].cls; ovs_assert(reason == OFPRR_HARD_TIMEOUT || reason == OFPRR_IDLE_TIMEOUT || reason == OFPRR_DELETE || reason == OFPRR_GROUP_DELETE); - ofproto_rule_send_removed(rule, reason); - ovs_rwlock_wrlock(&cls->rwlock); - ofproto_delete_rule(ofproto, cls, rule); - ovs_rwlock_unlock(&cls->rwlock); + ofproto_rule_delete__(ofproto, rule, reason); } /* Reduces '*timeout' to no more than 'max'. A value of zero in either case @@ -3939,26 +4349,27 @@ reduce_timeout(uint16_t max, uint16_t *timeout) void ofproto_rule_reduce_timeouts(struct rule *rule, uint16_t idle_timeout, uint16_t hard_timeout) - OVS_EXCLUDED(rule->ofproto->expirable_mutex, rule->timeout_mutex) + OVS_EXCLUDED(ofproto_mutex, rule->mutex) { if (!idle_timeout && !hard_timeout) { return; } - ovs_mutex_lock(&rule->ofproto->expirable_mutex); + ovs_mutex_lock(&ofproto_mutex); if (list_is_empty(&rule->expirable)) { list_insert(&rule->ofproto->expirable, &rule->expirable); } - ovs_mutex_unlock(&rule->ofproto->expirable_mutex); + ovs_mutex_unlock(&ofproto_mutex); - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_lock(&rule->mutex); reduce_timeout(idle_timeout, &rule->idle_timeout); reduce_timeout(hard_timeout, &rule->hard_timeout); - ovs_mutex_unlock(&rule->timeout_mutex); + ovs_mutex_unlock(&rule->mutex); } 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; @@ -4017,36 +4428,50 @@ exit: 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 @@ -4227,8 +4652,10 @@ static void 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; @@ -4241,21 +4668,20 @@ ofproto_compose_flow_refresh_update(const struct rule *rule, 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. */ @@ -4265,24 +4691,19 @@ ofproto_compose_flow_refresh_update(const struct rule *rule, case OFOPERATION_MODIFY: case OFOPERATION_REPLACE: - if (op->ofpacts) { - fu.ofpacts = op->ofpacts; - fu.ofpacts_len = op->ofpacts_len; - } else { - fu.ofpacts = rule->ofpacts; - fu.ofpacts_len = rule->ofpacts_len; - } + actions = op->actions ? op->actions : rule->actions; break; case OFOPERATION_DELETE: - fu.ofpacts = rule->ofpacts; - fu.ofpacts_len = rule->ofpacts_len; + actions = rule->actions; break; default: NOT_REACHED(); } } + fu.ofpacts = actions ? actions->ofpacts : NULL; + fu.ofpacts_len = actions ? actions->ofpacts_len : 0; if (list_is_empty(msgs)) { ofputil_start_flow_update(msgs); @@ -4291,11 +4712,14 @@ ofproto_compose_flow_refresh_update(const struct rule *rule, } 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; @@ -4306,7 +4730,8 @@ ofmonitor_compose_refresh_updates(struct list *rules, struct list *msgs) 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; @@ -4337,7 +4762,7 @@ ofproto_collect_ofmonitor_refresh_rule(const struct ofmonitor *m, } if (!rule->monitor_flags) { - list_push_back(rules, &rule->ofproto_node); + rule_collection_add(rules, rule); } rule->monitor_flags |= update | (m->flags & NXFMF_ACTIONS); } @@ -4345,7 +4770,8 @@ ofproto_collect_ofmonitor_refresh_rule(const struct ofmonitor *m, 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; @@ -4381,7 +4807,8 @@ ofproto_collect_ofmonitor_refresh_rules(const struct ofmonitor *m, 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); @@ -4390,20 +4817,22 @@ ofproto_collect_ofmonitor_initial_rules(struct ofmonitor *m, 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; @@ -4411,6 +4840,8 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) 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; @@ -4442,15 +4873,18 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) 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; @@ -4460,23 +4894,32 @@ error: 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. @@ -4501,13 +4944,10 @@ struct meter { /* * 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]; @@ -4547,6 +4987,7 @@ meter_create(const struct ofputil_meter_config *config, 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) { @@ -4578,7 +5019,7 @@ handle_add_meter(struct ofproto *ofproto, struct ofputil_meter_mod *mm) ovs_assert(provider_meter_id.uint32 != UINT32_MAX); *meterp = meter_create(&mm->meter, provider_meter_id); } - return 0; + return error; } static enum ofperr @@ -4586,15 +5027,17 @@ handle_modify_meter(struct ofproto *ofproto, struct ofputil_meter_mod *mm) { 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); } @@ -4604,11 +5047,13 @@ handle_modify_meter(struct ofproto *ofproto, struct ofputil_meter_mod *mm) 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; @@ -4622,7 +5067,8 @@ handle_delete_meter(struct ofconn *ofconn, const struct ofp_header *oh, /* 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); + 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)) { @@ -4630,20 +5076,25 @@ handle_delete_meter(struct ofconn *ofconn, const struct ofp_header *oh, LIST_FOR_EACH (rule, meter_list_node, &meter->rules) { if (rule->pending) { - return OFPROTO_POSTPONE; + error = OFPROTO_POSTPONE; + goto exit; } - list_push_back(&rules, &rule->ofproto_node); + rule_collection_add(&rules, rule); } } } - if (!list_is_empty(&rules)) { + if (rules.n > 0) { delete_flows__(ofproto, ofconn, oh, &rules, OFPRR_METER_DELETE); } /* Delete the meters. */ meter_delete(ofproto, first, last); - return 0; +exit: + ovs_mutex_unlock(&ofproto_mutex); + rule_collection_destroy(&rules); + + return error; } static enum ofperr @@ -5216,6 +5667,7 @@ handle_table_mod(struct ofconn *ofconn, const struct ofp_header *oh) 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; @@ -5225,6 +5677,13 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) 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. */ @@ -5338,7 +5797,7 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) /* FIXME: Change the following once they are implemented: */ case OFPTYPE_QUEUE_GET_CONFIG_REQUEST: case OFPTYPE_TABLE_FEATURES_STATS_REQUEST: - return OFPERR_OFPBRC_BAD_TYPE; + /* fallthrough */ case OFPTYPE_HELLO: case OFPTYPE_ERROR: @@ -5369,12 +5828,17 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) case OFPTYPE_METER_FEATURES_STATS_REPLY: case OFPTYPE_TABLE_FEATURES_STATS_REPLY: 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) { @@ -5393,6 +5857,7 @@ handle_openflow(struct ofconn *ofconn, const struct ofpbuf *ofp_msg) * 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; @@ -5417,6 +5882,7 @@ ofopgroup_create_unattached(struct 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) { @@ -5440,6 +5906,7 @@ ofopgroup_create(struct ofproto *ofproto, struct ofconn *ofconn, * groups. */ static void ofopgroup_submit(struct ofopgroup *group) + OVS_REQUIRES(ofproto_mutex) { if (!group->n_running) { ofopgroup_complete(group); @@ -5451,6 +5918,7 @@ ofopgroup_submit(struct ofopgroup *group) static void ofopgroup_complete(struct ofopgroup *group) + OVS_REQUIRES(ofproto_mutex) { struct ofproto *ofproto = group->ofproto; @@ -5479,8 +5947,23 @@ ofopgroup_complete(struct ofopgroup *group) 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; } @@ -5508,7 +5991,7 @@ ofopgroup_complete(struct ofopgroup *group) 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. */ @@ -5556,15 +6039,14 @@ ofopgroup_complete(struct ofopgroup *group) } } } else { - ovs_rwlock_wrlock(&rule->rwlock); oftable_remove_rule(rule); - ofproto_rule_destroy(rule); + ofproto_rule_unref(rule); } break; case OFOPERATION_DELETE: ovs_assert(!op->error); - ofproto_rule_destroy(rule); + ofproto_rule_unref(rule); op->rule = NULL; break; @@ -5579,20 +6061,20 @@ ofopgroup_complete(struct ofopgroup *group) } } else { ofproto_rule_change_cookie(ofproto, rule, op->flow_cookie); - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_lock(&rule->mutex); rule->idle_timeout = op->idle_timeout; rule->hard_timeout = op->hard_timeout; - ovs_mutex_unlock(&rule->timeout_mutex); - if (op->ofpacts) { - free(rule->ofpacts); + ovs_mutex_unlock(&rule->mutex); + if (op->actions) { + struct rule_actions *old_actions; - ovs_rwlock_wrlock(&rule->rwlock); - rule->ofpacts = op->ofpacts; - rule->ofpacts_len = op->ofpacts_len; - ovs_rwlock_unlock(&rule->rwlock); + ovs_mutex_lock(&rule->mutex); + old_actions = rule->actions; + rule->actions = op->actions; + ovs_mutex_unlock(&rule->mutex); - op->ofpacts = NULL; - op->ofpacts_len = 0; + op->actions = NULL; + rule_actions_unref(old_actions); } rule->flags = op->flags; } @@ -5635,6 +6117,7 @@ static struct ofoperation * 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; @@ -5648,10 +6131,10 @@ ofoperation_create(struct ofopgroup *group, struct rule *rule, op->type = type; op->reason = reason; op->flow_cookie = rule->flow_cookie; - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_lock(&rule->mutex); op->idle_timeout = rule->idle_timeout; op->hard_timeout = rule->hard_timeout; - ovs_mutex_unlock(&rule->timeout_mutex); + ovs_mutex_unlock(&rule->mutex); op->flags = rule->flags; group->n_running++; @@ -5666,6 +6149,7 @@ ofoperation_create(struct ofopgroup *group, struct rule *rule, static void ofoperation_destroy(struct ofoperation *op) + OVS_REQUIRES(ofproto_mutex) { struct ofopgroup *group = op->group; @@ -5676,7 +6160,7 @@ ofoperation_destroy(struct ofoperation *op) hmap_remove(&group->ofproto->deletions, &op->hmap_node); } list_remove(&op->group_node); - free(op->ofpacts); + rule_actions_unref(op->actions); free(op); } @@ -5707,13 +6191,19 @@ ofoperation_complete(struct ofoperation *op, enum ofperr error) { 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); } } @@ -5754,6 +6244,7 @@ pick_fallback_dpid(void) * 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; @@ -5778,10 +6269,8 @@ choose_rule_to_evict(struct oftable *table, struct rule **rulep) struct rule *rule; HEAP_FOR_EACH (rule, evg_node, &evg->rules) { - if (!ovs_rwlock_trywrlock(&rule->rwlock)) { - *rulep = rule; - return true; - } + *rulep = rule; + return true; } } @@ -5797,39 +6286,13 @@ choose_rule_to_evict(struct oftable *table, struct rule **rulep) 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 (table->eviction_fields) { - struct rule *rule; - size_t n_rules; - - ovs_rwlock_rdlock(&table->cls.rwlock); - n_rules = classifier_count(&table->cls); - ovs_rwlock_unlock(&table->cls.rwlock); - - if (n_rules <= table->max_flows) { - break; - } - - if (!choose_rule_to_evict(table, &rule)) { - break; - } - - if (rule->pending) { - ovs_rwlock_unlock(&rule->rwlock); - break; - } - - ofoperation_create(group, rule, - OFOPERATION_DELETE, OFPRR_EVICTION); - oftable_remove_rule(rule); - ofproto->ofproto_class->rule_delete(rule); - } + evict_rules_from_table(ofproto, table, 0); } - ofopgroup_submit(group); + ovs_mutex_unlock(&ofproto_mutex); } /* Eviction groups. */ @@ -5848,6 +6311,7 @@ eviction_group_priority(size_t n_rules) * 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))); @@ -5863,6 +6327,7 @@ eviction_group_resized(struct oftable *table, struct eviction_group *evg) * - 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; @@ -5879,6 +6344,7 @@ eviction_group_destroy(struct oftable *table, struct eviction_group *evg) /* 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]; @@ -5898,6 +6364,7 @@ eviction_group_remove_rule(struct rule *rule) * 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; @@ -5935,6 +6402,7 @@ eviction_group_hash_rule(struct rule *rule) * if necessary. */ static struct eviction_group * eviction_group_find(struct oftable *table, uint32_t id) + OVS_REQUIRES(ofproto_mutex) { struct eviction_group *evg; @@ -5956,6 +6424,7 @@ eviction_group_find(struct oftable *table, uint32_t id) * 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; @@ -5963,7 +6432,7 @@ rule_eviction_priority(struct rule *rule) 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); @@ -5971,7 +6440,7 @@ rule_eviction_priority(struct rule *rule) ? 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; } @@ -5995,14 +6464,15 @@ rule_eviction_priority(struct rule *rule) * 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; @@ -6067,6 +6537,7 @@ oftable_set_name(struct oftable *table, const char *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; @@ -6093,6 +6564,7 @@ oftable_disable_eviction(struct oftable *table) 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; @@ -6125,61 +6597,62 @@ oftable_enable_eviction(struct oftable *table, /* Removes 'rule' from the oftable that contains it. */ static void -oftable_remove_rule__(struct ofproto *ofproto, struct classifier *cls, - struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) OVS_RELEASES(rule->rwlock) +oftable_remove_rule__(struct ofproto *ofproto, struct rule *rule) + OVS_REQUIRES(ofproto_mutex) { - classifier_remove(cls, &rule->cr); + 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); + cookies_remove(ofproto, rule); + eviction_group_remove_rule(rule); - ovs_mutex_lock(&ofproto->expirable_mutex); if (!list_is_empty(&rule->expirable)) { list_remove(&rule->expirable); } - ovs_mutex_unlock(&ofproto->expirable_mutex); if (!list_is_empty(&rule->meter_list_node)) { list_remove(&rule->meter_list_node); list_init(&rule->meter_list_node); } - ovs_rwlock_unlock(&rule->rwlock); } static void oftable_remove_rule(struct rule *rule) + OVS_REQUIRES(ofproto_mutex) { - struct ofproto *ofproto = rule->ofproto; - struct oftable *table = &ofproto->tables[rule->table_id]; - - ovs_rwlock_wrlock(&table->cls.rwlock); - oftable_remove_rule__(ofproto, &table->cls, rule); - ovs_rwlock_unlock(&table->cls.rwlock); + 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]; bool may_expire; - ovs_mutex_lock(&rule->timeout_mutex); + ovs_mutex_lock(&rule->mutex); may_expire = rule->hard_timeout || rule->idle_timeout; - ovs_mutex_unlock(&rule->timeout_mutex); + ovs_mutex_unlock(&rule->mutex); if (may_expire) { - ovs_mutex_lock(&ofproto->expirable_mutex); list_insert(&ofproto->expirable, &rule->expirable); - ovs_mutex_unlock(&ofproto->expirable_mutex); } + cookies_insert(ofproto, rule); - if (rule->meter_id) { - struct meter *meter = ofproto->meters[rule->meter_id]; + + 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, &rule->cr); + classifier_insert(&table->cls, CONST_CAST(struct cls_rule *, &rule->cr)); ovs_rwlock_unlock(&table->cls.rwlock); eviction_group_add_rule(rule); } @@ -6249,6 +6722,7 @@ ofproto_get_vlan_usage(struct ofproto *ofproto, unsigned long int *vlan_bitmap) OFPROTO_FOR_EACH_TABLE (oftable, ofproto) { const struct cls_table *table; + ovs_rwlock_rdlock(&oftable->cls.rwlock); HMAP_FOR_EACH (table, hmap_node, &oftable->cls.tables) { if (minimask_get_vid_mask(&table->mask) == VLAN_VID_MASK) { const struct cls_rule *rule; @@ -6260,6 +6734,7 @@ ofproto_get_vlan_usage(struct ofproto *ofproto, unsigned long int *vlan_bitmap) } } } + ovs_rwlock_unlock(&oftable->cls.rwlock); } }