X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=b1c93fb170065e0342b66ae539b01d7643bb993e;hb=093f56c5c5c8b0891e837beb1defd84bc165ac6a;hp=6c6862896c18866dd8a3e8eb2bad82d7f9dd9b4e;hpb=354128521581c03c2d5a01542faf7c0870782d69;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 6c6862896..b1c93fb17 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 { @@ -153,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 @@ -181,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 *); @@ -220,7 +215,10 @@ 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(). */ +/* 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. */ @@ -228,17 +226,33 @@ struct rule_execute { struct ofpbuf *packet; /* Owns the packet. */ }; -static void run_rule_executes(struct ofproto *); +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); + +/* 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); @@ -254,12 +268,13 @@ static enum ofperr modify_flows__(struct ofproto *, struct ofconn *, 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); @@ -278,6 +293,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; @@ -463,6 +481,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); @@ -479,6 +498,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); @@ -487,7 +507,6 @@ 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); @@ -503,6 +522,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) { @@ -512,11 +532,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++) { @@ -1122,6 +1137,19 @@ 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) + OVS_REQUIRES(ofproto_mutex) +{ + struct ofopgroup *group; + + ovs_assert(!rule->pending); + + group = ofopgroup_create_unattached(ofproto); + delete_flow__(rule, group, OFPRR_DELETE); + ofopgroup_submit(group); +} + /* Deletes 'rule' from 'cls' within 'ofproto'. * * Within an ofproto implementation, this function allows an ofproto @@ -1129,33 +1157,29 @@ ofproto_get_snoops(const struct ofproto *ofproto, struct sset *snoops) * function is called. This function is not suitable for use elsewhere in an * ofproto implementation. * - * This function is also used internally in ofproto.c. - * * This function implements steps 4.4 and 4.5 in the section titled "Rule Life - * Cycle" in ofproto-provider.h. - - * The 'cls' argument is redundant (it is &ofproto->tables[rule->table_id].cls) - * but it allows Clang to do better checking. */ + * Cycle" in ofproto-provider.h. */ void -ofproto_rule_delete(struct ofproto *ofproto, struct classifier *cls, - struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) +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; @@ -1163,6 +1187,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; @@ -1171,26 +1196,27 @@ 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_rule_delete(ofproto, &table->cls, rule); + ofproto_rule_delete__(ofproto, rule); } } - 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); @@ -1210,8 +1236,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) { @@ -1223,14 +1249,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; @@ -1248,6 +1275,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); } @@ -1325,6 +1357,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) { @@ -1356,6 +1401,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); } @@ -1369,6 +1415,7 @@ ofproto_run(struct ofproto *p) } } ovs_rwlock_unlock(&table->cls.rwlock); + ovs_mutex_unlock(&ofproto_mutex); } } @@ -1407,7 +1454,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; @@ -1415,7 +1462,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; } @@ -1508,7 +1555,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; @@ -1530,8 +1577,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) { @@ -1770,6 +1820,7 @@ simple_flow_mod(struct ofproto *ofproto, fm.flags = 0; fm.ofpacts = CONST_CAST(struct ofpact *, ofpacts); fm.ofpacts_len = ofpacts_len; + return handle_flow_mod__(ofproto, NULL, &fm, NULL); } @@ -1788,6 +1839,7 @@ 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; @@ -1798,11 +1850,11 @@ ofproto_add_flow(struct ofproto *ofproto, const struct match *match, rule = rule_from_cls_rule(classifier_find_match_exactly( &ofproto->tables[0].cls, match, priority)); if (rule) { - ovs_rwlock_rdlock(&rule->rwlock); + ovs_mutex_lock(&rule->mutex); must_add = !ofpacts_equal(rule->actions->ofpacts, rule->actions->ofpacts_len, ofpacts, ofpacts_len); - ovs_rwlock_unlock(&rule->rwlock); + ovs_mutex_unlock(&rule->mutex); } else { must_add = true; } @@ -1822,9 +1874,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); } @@ -1836,6 +1890,7 @@ 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; @@ -1901,35 +1956,45 @@ 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 < 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()); } } @@ -2154,6 +2219,41 @@ 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)); +} + int ofproto_port_get_stats(const struct ofport *port, struct netdev_stats *stats) { @@ -2372,20 +2472,45 @@ ofproto_rule_unref(struct rule *rule) } } +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); + cls_rule_destroy(CONST_CAST(struct cls_rule *, &rule->cr)); rule_actions_unref(rule->actions); - ovs_mutex_destroy(&rule->timeout_mutex); - ovs_rwlock_destroy(&rule->rwlock); + 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 ofpact *ofpacts, size_t ofpacts_len) +rule_actions_create(const struct ofproto *ofproto, + const struct ofpact *ofpacts, size_t ofpacts_len) { struct rule_actions *actions; @@ -2393,7 +2518,10 @@ rule_actions_create(const struct ofpact *ofpacts, size_t ofpacts_len) atomic_init(&actions->ref_count, 1); actions->ofpacts = xmemdup(ofpacts, ofpacts_len); actions->ofpacts_len = ofpacts_len; - actions->meter_id = ofpacts_get_meter(ofpacts, ofpacts_len); + actions->provider_meter_id + = get_provider_meter_id(ofproto, + ofpacts_get_meter(ofpacts, ofpacts_len)); + return actions; } @@ -2419,6 +2547,7 @@ rule_actions_unref(struct rule_actions *actions) atomic_sub(&actions->ref_count, 1, &orig); if (orig == 1) { + free(actions->ofpacts); free(actions); } else { ovs_assert(orig != 0); @@ -2428,8 +2557,9 @@ rule_actions_unref(struct rule_actions *actions) /* 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->actions->ofpacts, @@ -2437,8 +2567,9 @@ ofproto_rule_has_out_port(const struct rule *rule, ofp_port_t 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->actions->ofpacts, @@ -2449,6 +2580,7 @@ ofproto_rule_has_out_group(const struct rule *rule, uint32_t group_id) * 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; @@ -2480,6 +2612,7 @@ rule_execute_destroy(struct rule_execute *e) * 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; @@ -2517,7 +2650,7 @@ destroy_rule_executes(struct ofproto *ofproto) * 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; @@ -2679,7 +2812,7 @@ ofproto_check_ofpacts(struct ofproto *ofproto, } mid = ofpacts_get_meter(ofpacts, ofpacts_len); - if (mid && ofproto_get_provider_meter_id(ofproto, mid) == UINT32_MAX) { + if (mid && get_provider_meter_id(ofproto, mid) == UINT32_MAX) { return OFPERR_OFPMMFC_INVALID_METER; } return 0; @@ -2852,14 +2985,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. */ @@ -2973,6 +3106,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)); @@ -2980,6 +3114,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); } @@ -2987,13 +3122,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); } @@ -3130,6 +3266,27 @@ rule_collection_add(struct rule_collection *rules, struct rule *rule) 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) { @@ -3141,8 +3298,15 @@ rule_collection_destroy(struct rule_collection *rules) static enum ofperr collect_rule(struct rule *rule, const struct rule_criteria *c, struct rule_collection *rules) -{ - if (ofproto_rule_is_hidden(rule)) { + 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; @@ -3169,6 +3333,7 @@ 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; @@ -3180,7 +3345,7 @@ collect_rules_loose(struct ofproto *ofproto, goto exit; } - 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, @@ -3229,6 +3394,7 @@ static enum ofperr collect_rules_strict(struct ofproto *ofproto, const struct rule_criteria *criteria, struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { struct oftable *table; int error; @@ -3240,7 +3406,7 @@ collect_rules_strict(struct ofproto *ofproto, goto exit; } - 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, @@ -3290,6 +3456,7 @@ 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; @@ -3306,8 +3473,15 @@ 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; } @@ -3317,28 +3491,39 @@ handle_flow_stats_request(struct ofconn *ofconn, 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->actions->ofpacts; - fs.ofpacts_len = rule->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); + 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); @@ -3350,23 +3535,31 @@ 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->actions->ofpacts, rule->actions->ofpacts_len, - results); + + 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 @@ -3417,6 +3610,7 @@ 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; @@ -3436,8 +3630,15 @@ 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; } @@ -3473,6 +3674,7 @@ 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); @@ -3583,6 +3785,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; @@ -3599,32 +3802,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 @@ -3642,6 +3847,7 @@ evict_rule_from_table(struct ofproto *ofproto, struct oftable *table) 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; @@ -3734,7 +3940,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; @@ -3750,29 +3956,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->actions = rule_actions_create(fm->ofpacts, fm->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); @@ -3805,6 +4010,7 @@ static enum ofperr modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, struct ofputil_flow_mod *fm, const struct ofp_header *request, const struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { enum ofoperation_type type; struct ofopgroup *group; @@ -3842,14 +4048,14 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, 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) { @@ -3866,11 +4072,12 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, struct rule_actions *new_actions; op->actions = rule->actions; - new_actions = rule_actions_create(fm->ofpacts, fm->ofpacts_len); + new_actions = rule_actions_create(ofproto, + fm->ofpacts, fm->ofpacts_len); - ovs_rwlock_wrlock(&rule->rwlock); + ovs_mutex_lock(&rule->mutex); rule->actions = new_actions; - ovs_rwlock_unlock(&rule->rwlock); + ovs_mutex_unlock(&rule->mutex); rule->ofproto->ofproto_class->rule_modify_actions(rule, reset_counters); @@ -3886,8 +4093,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); @@ -3902,6 +4110,7 @@ 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 rule_collection rules; @@ -3932,6 +4141,7 @@ 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 rule_collection rules; @@ -3960,6 +4170,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; @@ -3978,15 +4189,14 @@ delete_flows__(struct ofproto *ofproto, struct ofconn *ofconn, const struct ofp_header *request, const struct rule_collection *rules, enum ofp_flow_removed_reason reason) + OVS_REQUIRES(ofproto_mutex) { struct ofopgroup *group; size_t i; group = ofopgroup_create(ofproto, ofconn, request, UINT32_MAX); for (i = 0; i < rules->n; i++) { - struct rule *rule = rules->rules[i]; - ovs_rwlock_wrlock(&rule->rwlock); - delete_flow__(rule, group, reason); + delete_flow__(rules->rules[i], group, reason); } ofopgroup_submit(group); @@ -3998,6 +4208,7 @@ 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 rule_collection rules; @@ -4022,6 +4233,7 @@ 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 rule_collection rules; @@ -4043,6 +4255,7 @@ delete_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, static void ofproto_rule_send_removed(struct rule *rule, uint8_t reason) + OVS_REQUIRES(ofproto_mutex) { struct ofputil_flow_removed fr; @@ -4058,10 +4271,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); @@ -4079,17 +4292,15 @@ 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_rule_delete(ofproto, cls, rule); - ovs_rwlock_unlock(&cls->rwlock); + ofproto_rule_send_removed(rule, reason); + ofproto_rule_delete__(ofproto, rule); } /* Reduces '*timeout' to no more than 'max'. A value of zero in either case @@ -4110,26 +4321,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; @@ -4188,9 +4400,11 @@ 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) { enum ofperr error; + ovs_mutex_lock(&ofproto_mutex); if (ofproto->n_pending < 50) { switch (fm->command) { case OFPFC_ADD: @@ -4226,6 +4440,7 @@ handle_flow_mod__(struct ofproto *ofproto, struct ofconn *ofconn, ovs_assert(!list_is_empty(&ofproto->pending)); error = OFPROTO_POSTPONE; } + ovs_mutex_unlock(&ofproto_mutex); run_rule_executes(ofproto); return error; @@ -4409,6 +4624,7 @@ 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; @@ -4424,10 +4640,10 @@ 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); @@ -4470,6 +4686,7 @@ ofproto_compose_flow_refresh_update(const struct rule *rule, void ofmonitor_compose_refresh_updates(struct rule_collection *rules, struct list *msgs) + OVS_REQUIRES(ofproto_mutex) { size_t i; @@ -4486,6 +4703,7 @@ static void ofproto_collect_ofmonitor_refresh_rule(const struct ofmonitor *m, struct rule *rule, uint64_t seqno, struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { enum nx_flow_monitor_flags update; @@ -4525,6 +4743,7 @@ static void ofproto_collect_ofmonitor_refresh_rules(const struct ofmonitor *m, uint64_t seqno, struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { const struct ofproto *ofproto = ofconn_get_ofproto(m->ofconn); const struct ofoperation *op; @@ -4561,6 +4780,7 @@ ofproto_collect_ofmonitor_refresh_rules(const struct ofmonitor *m, static void ofproto_collect_ofmonitor_initial_rules(struct ofmonitor *m, struct rule_collection *rules) + OVS_REQUIRES(ofproto_mutex) { if (m->flags & NXFMF_INITIAL) { ofproto_collect_ofmonitor_refresh_rules(m, 0, rules); @@ -4570,12 +4790,14 @@ ofproto_collect_ofmonitor_initial_rules(struct ofmonitor *m, void ofmonitor_collect_resume_rules(struct ofmonitor *m, 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; @@ -4590,6 +4812,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; @@ -4628,10 +4852,11 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) ofpmp_init(&replies, oh); ofmonitor_compose_refresh_updates(&rules, &replies); + ovs_mutex_unlock(&ofproto_mutex); + rule_collection_destroy(&rules); ofconn_send_replies(ofconn, &replies); - free(monitors); return 0; @@ -4641,23 +4866,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. @@ -4682,13 +4916,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]; @@ -4728,6 +4959,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) { @@ -4759,7 +4991,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 @@ -4767,15 +4999,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); } @@ -4785,6 +5019,7 @@ 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; @@ -4805,6 +5040,7 @@ 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. */ 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)) { @@ -4827,6 +5063,7 @@ handle_delete_meter(struct ofconn *ofconn, const struct ofp_header *oh, meter_delete(ofproto, first, last); exit: + ovs_mutex_unlock(&ofproto_mutex); rule_collection_destroy(&rules); return error; @@ -5402,6 +5639,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; @@ -5561,6 +5799,7 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) 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) { @@ -5579,6 +5818,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; @@ -5603,6 +5843,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) { @@ -5626,6 +5867,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); @@ -5637,6 +5879,7 @@ ofopgroup_submit(struct ofopgroup *group) static void ofopgroup_complete(struct ofopgroup *group) + OVS_REQUIRES(ofproto_mutex) { struct ofproto *ofproto = group->ofproto; @@ -5757,7 +6000,6 @@ ofopgroup_complete(struct ofopgroup *group) } } } else { - ovs_rwlock_wrlock(&rule->rwlock); oftable_remove_rule(rule); ofproto_rule_unref(rule); } @@ -5780,17 +6022,17 @@ 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); + ovs_mutex_unlock(&rule->mutex); if (op->actions) { struct rule_actions *old_actions; - ovs_rwlock_wrlock(&rule->rwlock); + ovs_mutex_lock(&rule->mutex); old_actions = rule->actions; rule->actions = op->actions; - ovs_rwlock_unlock(&rule->rwlock); + ovs_mutex_unlock(&rule->mutex); op->actions = NULL; rule_actions_unref(old_actions); @@ -5836,6 +6078,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; @@ -5849,10 +6092,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++; @@ -5867,6 +6110,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; @@ -5908,13 +6152,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); } } @@ -5955,6 +6205,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; @@ -5979,10 +6230,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; } } @@ -5998,39 +6247,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. */ @@ -6049,6 +6272,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))); @@ -6064,6 +6288,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; @@ -6080,6 +6305,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]; @@ -6099,6 +6325,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; @@ -6136,6 +6363,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; @@ -6157,6 +6385,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; @@ -6164,7 +6393,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); @@ -6172,7 +6401,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; } @@ -6196,14 +6425,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; @@ -6268,6 +6498,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; @@ -6294,6 +6525,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; @@ -6326,62 +6558,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->actions->meter_id) { - struct meter *meter = ofproto->meters[rule->actions->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); } @@ -6451,6 +6683,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; @@ -6462,6 +6695,7 @@ ofproto_get_vlan_usage(struct ofproto *ofproto, unsigned long int *vlan_bitmap) } } } + ovs_rwlock_unlock(&oftable->cls.rwlock); } }