X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=8cf6d9bcaae9bbbce57c9f9a378347db1fce2f43;hb=b74cb5d8fd1bee5bb9c79d1f9c203db0b1557ab5;hp=e7ee60eeb7c02f5eb8d8ee2b8591e13410a5dca4;hpb=323b39e502f78b0a18fcbb679a82facbb6787a74;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index e7ee60eeb..8cf6d9bca 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -131,11 +131,11 @@ struct ofoperation { /* OFOPERATION_DELETE. */ enum ofp_flow_removed_reason reason; /* Reason flow was removed. */ - ovs_be64 flow_cookie; /* Rule's old flow cookie. */ - uint16_t idle_timeout; /* Rule's old idle timeout. */ - uint16_t hard_timeout; /* Rule's old hard timeout. */ - bool send_flow_removed; /* Rule's old 'send_flow_removed'. */ - enum ofperr error; /* 0 if no error. */ + ovs_be64 flow_cookie; /* Rule's old flow cookie. */ + uint16_t idle_timeout; /* Rule's old idle timeout. */ + uint16_t hard_timeout; /* Rule's old hard timeout. */ + enum ofputil_flow_mod_flags flags; /* Rule's old flags. */ + enum ofperr error; /* 0 if no error. */ }; static struct ofoperation *ofoperation_create(struct ofopgroup *, @@ -190,6 +190,38 @@ static uint32_t rule_eviction_priority(struct rule *); static void eviction_group_add_rule(struct rule *); static void eviction_group_remove_rule(struct rule *); +/* Criteria that flow_mod and other operations use for selecting rules on + * which to operate. */ +struct rule_criteria { + /* An OpenFlow table or 255 for all tables. */ + uint8_t table_id; + + /* OpenFlow matching criteria. Interpreted different in "loose" way by + * collect_rules_loose() and "strict" way by collect_rules_strict(), as + * defined in the OpenFlow spec. */ + struct cls_rule cr; + + /* Matching criteria for the OpenFlow cookie. Consider a bit B in a rule's + * cookie and the corresponding bits C in 'cookie' and M in 'cookie_mask'. + * The rule will not be selected if M is 1 and B != C. */ + ovs_be64 cookie; + ovs_be64 cookie_mask; + + /* Selection based on actions within a rule: + * + * If out_port != OFPP_ANY, selects only rules that output to out_port. + * If out_group != OFPG_ALL, select only rules that output to out_group. */ + ofp_port_t out_port; + uint32_t out_group; +}; + +static void rule_criteria_init(struct rule_criteria *, uint8_t table_id, + const struct match *match, + unsigned int priority, + ovs_be64 cookie, ovs_be64 cookie_mask, + ofp_port_t out_port, uint32_t out_group); +static void rule_criteria_destroy(struct rule_criteria *); + /* ofport. */ static void ofport_destroy__(struct ofport *); static void ofport_destroy(struct ofport *); @@ -210,7 +242,8 @@ 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); @@ -642,14 +675,15 @@ ofproto_set_mac_table_config(struct ofproto *ofproto, unsigned idle_time, } /* Sets number of upcall handler threads. The default is - * (number of online cores - 1). */ + * (number of online cores - 2). */ void ofproto_set_n_handler_threads(unsigned limit) { if (limit) { n_handler_threads = limit; } else { - n_handler_threads = MAX(1, sysconf(_SC_NPROCESSORS_ONLN) - 1); + int n_proc = sysconf(_SC_NPROCESSORS_ONLN); + n_handler_threads = n_proc > 2 ? n_proc - 2 : 1; } } @@ -1081,10 +1115,20 @@ ofproto_get_snoops(const struct ofproto *ofproto, struct sset *snoops) /* Deletes 'rule' from 'cls' within 'ofproto'. * + * Within an ofproto implementation, this function allows an ofproto + * implementation to destroy any rules that remain when its ->destruct() + * function is called. This function is not suitable for use elsewhere in an + * ofproto implementation. + * + * This function 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. */ -static void -ofproto_delete_rule(struct ofproto *ofproto, struct classifier *cls, +void +ofproto_rule_delete(struct ofproto *ofproto, struct classifier *cls, struct rule *rule) OVS_REQ_WRLOCK(cls->rwlock) { @@ -1122,7 +1166,7 @@ ofproto_flush__(struct ofproto *ofproto) cls_cursor_init(&cursor, &table->cls, NULL); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cr, &cursor) { if (!rule->pending) { - ofproto_delete_rule(ofproto, &table->cls, rule); + ofproto_rule_delete(ofproto, &table->cls, rule); } } ovs_rwlock_unlock(&table->cls.rwlock); @@ -1139,11 +1183,6 @@ ofproto_destroy__(struct ofproto *ofproto) ovs_assert(list_is_empty(&ofproto->pending)); ovs_assert(!ofproto->n_pending); - if (ofproto->meters) { - meter_delete(ofproto, 1, ofproto->meter_features.max_meters); - free(ofproto->meters); - } - delete_group(ofproto, OFPG_ALL); ovs_rwlock_destroy(&ofproto->groups_rwlock); hmap_destroy(&ofproto->groups); @@ -1185,6 +1224,13 @@ ofproto_destroy(struct ofproto *p) return; } + if (p->meters) { + meter_delete(p, 1, p->meter_features.max_meters); + p->meter_features.max_meters = 0; + free(p->meters); + p->meters = NULL; + } + ofproto_flush__(p); HMAP_FOR_EACH_SAFE (ofport, next_ofport, hmap_node, &p->ports) { ofport_destroy(ofport); @@ -1290,7 +1336,6 @@ ofproto_run(struct ofproto *p) struct oftable *table = &p->tables[i]; struct eviction_group *evg; struct cls_cursor cursor; - struct cls_rule cr; struct rule *rule; if (!table->eviction_fields) { @@ -1302,7 +1347,7 @@ ofproto_run(struct ofproto *p) } ovs_rwlock_rdlock(&table->cls.rwlock); - cls_cursor_init(&cursor, &table->cls, &cr); + cls_cursor_init(&cursor, &table->cls, NULL); CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { if (!rule->eviction_group && (rule->idle_timeout || rule->hard_timeout)) { @@ -1717,10 +1762,9 @@ ofproto_add_flow(struct ofproto *ofproto, const struct match *match, fm.match = *match; fm.priority = priority; fm.buffer_id = UINT32_MAX; - fm.ofpacts = xmemdup(ofpacts, ofpacts_len); + fm.ofpacts = ofpacts; fm.ofpacts_len = ofpacts_len; add_flow(ofproto, NULL, &fm, NULL); - free(fm.ofpacts); } } @@ -1760,7 +1804,7 @@ ofproto_delete_flow(struct ofproto *ofproto, } else { /* Initiate deletion -> success. */ ovs_rwlock_wrlock(&cls->rwlock); - ofproto_delete_rule(ofproto, cls, rule); + ofproto_rule_delete(ofproto, cls, rule); ovs_rwlock_unlock(&cls->rwlock); return true; @@ -2275,21 +2319,6 @@ ofproto_rule_destroy__(struct rule *rule) 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. */ -void -ofproto_rule_delete(struct ofproto *ofproto, struct classifier *cls, - struct rule *rule) - OVS_REQ_WRLOCK(cls->rwlock) -{ - ofproto_delete_rule(ofproto, cls, rule); -} - /* 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 @@ -2935,169 +2964,205 @@ next_matching_table(const struct ofproto *ofproto, (TABLE) != NULL; \ (TABLE) = next_matching_table(OFPROTO, TABLE, TABLE_ID)) -/* Searches 'ofproto' for rules in table 'table_id' (or in all tables, if - * 'table_id' is 0xff) that match 'match' in the "loose" way required for - * OpenFlow OFPFC_MODIFY and OFPFC_DELETE requests and puts them on list - * 'rules'. +/* Initializes 'criteria' in a straightforward way based on the other + * parameters. * - * If 'out_port' is anything other than OFPP_ANY, then only rules that output - * to 'out_port' are included. + * For "loose" matching, the 'priority' parameter is unimportant and may be + * supplied as 0. */ +static void +rule_criteria_init(struct rule_criteria *criteria, uint8_t table_id, + const struct match *match, unsigned int priority, + ovs_be64 cookie, ovs_be64 cookie_mask, + ofp_port_t out_port, uint32_t out_group) +{ + criteria->table_id = table_id; + cls_rule_init(&criteria->cr, match, priority); + criteria->cookie = cookie; + criteria->cookie_mask = cookie_mask; + criteria->out_port = out_port; + criteria->out_group = out_group; +} + +static void +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_destroy(struct rule_collection *rules) +{ + if (rules->rules != rules->stub) { + free(rules->rules); + } +} + +static enum ofperr +collect_rule(struct rule *rule, const struct rule_criteria *c, + struct rule_collection *rules) +{ + if (ofproto_rule_is_hidden(rule)) { + return 0; + } else if (rule->pending) { + return OFPROTO_POSTPONE; + } else { + if ((c->table_id == rule->table_id || c->table_id == 0xff) + && ofproto_rule_has_out_port(rule, c->out_port) + && ofproto_rule_has_out_group(rule, c->out_group) + && !((rule->flow_cookie ^ c->cookie) & c->cookie_mask)) { + rule_collection_add(rules, rule); + } + return 0; + } +} + +/* Searches 'ofproto' for rules that match the criteria in 'criteria'. Matches + * on classifiers rules are done in the "loose" way required for OpenFlow + * OFPFC_MODIFY and OFPFC_DELETE requests. Puts the selected rules on list + * 'rules'. * * Hidden rules are always omitted. * * Returns 0 on success, otherwise an OpenFlow error code. */ static enum ofperr -collect_rules_loose(struct ofproto *ofproto, uint8_t table_id, - const struct match *match, - ovs_be64 cookie, ovs_be64 cookie_mask, - ofp_port_t out_port, uint32_t out_group, - struct list *rules) +collect_rules_loose(struct ofproto *ofproto, + const struct rule_criteria *criteria, + struct rule_collection *rules) { struct oftable *table; - struct cls_rule cr; enum ofperr error; - error = check_table_id(ofproto, table_id); + rule_collection_init(rules); + + error = check_table_id(ofproto, criteria->table_id); if (error) { - return error; + goto exit; } - list_init(rules); - cls_rule_init(&cr, match, 0); - - if (cookie_mask == htonll(UINT64_MAX)) { + if (criteria->cookie_mask == htonll(UINT64_MAX)) { struct rule *rule; - HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, hash_cookie(cookie), + HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, + hash_cookie(criteria->cookie), &ofproto->cookies) { - if (table_id != rule->table_id && table_id != 0xff) { - continue; - } - if (ofproto_rule_is_hidden(rule)) { - continue; - } - if (cls_rule_is_loose_match(&rule->cr, &cr.match)) { - if (rule->pending) { - error = OFPROTO_POSTPONE; - goto exit; - } - if (rule->flow_cookie == cookie /* Hash collisions possible. */ - && ofproto_rule_has_out_port(rule, out_port) - && ofproto_rule_has_out_group(rule, out_group)) { - list_push_back(rules, &rule->ofproto_node); + if (cls_rule_is_loose_match(&rule->cr, &criteria->cr.match)) { + error = collect_rule(rule, criteria, rules); + if (error) { + break; } } } - goto exit; - } - - FOR_EACH_MATCHING_TABLE (table, table_id, ofproto) { - struct cls_cursor cursor; - struct rule *rule; + } else { + FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) { + struct cls_cursor cursor; + struct rule *rule; - ovs_rwlock_rdlock(&table->cls.rwlock); - cls_cursor_init(&cursor, &table->cls, &cr); - CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { - if (rule->pending) { - ovs_rwlock_unlock(&table->cls.rwlock); - error = OFPROTO_POSTPONE; - goto exit; - } - if (!ofproto_rule_is_hidden(rule) - && ofproto_rule_has_out_port(rule, out_port) - && ofproto_rule_has_out_group(rule, out_group) - && !((rule->flow_cookie ^ cookie) & cookie_mask)) { - list_push_back(rules, &rule->ofproto_node); + ovs_rwlock_rdlock(&table->cls.rwlock); + cls_cursor_init(&cursor, &table->cls, &criteria->cr); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + error = collect_rule(rule, criteria, rules); + if (error) { + break; + } } + ovs_rwlock_unlock(&table->cls.rwlock); } - ovs_rwlock_unlock(&table->cls.rwlock); } exit: - cls_rule_destroy(&cr); + if (error) { + rule_collection_destroy(rules); + } return error; } -/* Searches 'ofproto' for rules in table 'table_id' (or in all tables, if - * 'table_id' is 0xff) that match 'match' in the "strict" way required for - * OpenFlow OFPFC_MODIFY_STRICT and OFPFC_DELETE_STRICT requests and puts them - * on list 'rules'. - * - * If 'out_port' is anything other than OFPP_ANY, then only rules that output - * to 'out_port' are included. +/* Searches 'ofproto' for rules that match the criteria in 'criteria'. Matches + * on classifiers rules are done in the "strict" way required for OpenFlow + * OFPFC_MODIFY_STRICT and OFPFC_DELETE_STRICT requests. Puts the selected + * rules on list 'rules'. * * Hidden rules are always omitted. * * Returns 0 on success, otherwise an OpenFlow error code. */ static enum ofperr -collect_rules_strict(struct ofproto *ofproto, uint8_t table_id, - const struct match *match, unsigned int priority, - ovs_be64 cookie, ovs_be64 cookie_mask, - ofp_port_t out_port, uint32_t out_group, - struct list *rules) +collect_rules_strict(struct ofproto *ofproto, + const struct rule_criteria *criteria, + struct rule_collection *rules) { struct oftable *table; - struct cls_rule cr; int error; - error = check_table_id(ofproto, table_id); + rule_collection_init(rules); + + error = check_table_id(ofproto, criteria->table_id); if (error) { - return error; + goto exit; } - list_init(rules); - cls_rule_init(&cr, match, priority); - - if (cookie_mask == htonll(UINT64_MAX)) { + if (criteria->cookie_mask == htonll(UINT64_MAX)) { struct rule *rule; - HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, hash_cookie(cookie), + HINDEX_FOR_EACH_WITH_HASH (rule, cookie_node, + hash_cookie(criteria->cookie), &ofproto->cookies) { - if (table_id != rule->table_id && table_id != 0xff) { - continue; - } - if (ofproto_rule_is_hidden(rule)) { - continue; - } - if (cls_rule_equal(&rule->cr, &cr)) { - if (rule->pending) { - error = OFPROTO_POSTPONE; - goto exit; - } - if (rule->flow_cookie == cookie /* Hash collisions possible. */ - && ofproto_rule_has_out_port(rule, out_port) - && ofproto_rule_has_out_group(rule, out_group)) { - list_push_back(rules, &rule->ofproto_node); + if (cls_rule_equal(&rule->cr, &criteria->cr)) { + error = collect_rule(rule, criteria, rules); + if (error) { + break; } } } - goto exit; - } - - FOR_EACH_MATCHING_TABLE (table, table_id, ofproto) { - struct rule *rule; + } else { + FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) { + struct rule *rule; - ovs_rwlock_rdlock(&table->cls.rwlock); - rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, - &cr)); - ovs_rwlock_unlock(&table->cls.rwlock); - if (rule) { - if (rule->pending) { - error = OFPROTO_POSTPONE; - goto exit; - } - if (!ofproto_rule_is_hidden(rule) - && ofproto_rule_has_out_port(rule, out_port) - && ofproto_rule_has_out_group(rule, out_group) - && !((rule->flow_cookie ^ cookie) & cookie_mask)) { - list_push_back(rules, &rule->ofproto_node); + ovs_rwlock_rdlock(&table->cls.rwlock); + rule = rule_from_cls_rule(classifier_find_rule_exactly( + &table->cls, &criteria->cr)); + ovs_rwlock_unlock(&table->cls.rwlock); + if (rule) { + error = collect_rule(rule, criteria, rules); + if (error) { + break; + } } } } exit: - cls_rule_destroy(&cr); - return 0; + if (error) { + rule_collection_destroy(rules); + } + return error; } /* Returns 'age_ms' (a duration in milliseconds), converted to seconds and @@ -3116,25 +3181,28 @@ handle_flow_stats_request(struct ofconn *ofconn, { struct ofproto *ofproto = ofconn_get_ofproto(ofconn); struct ofputil_flow_stats_request fsr; + struct rule_criteria criteria; + struct rule_collection rules; struct list replies; - struct list rules; - struct rule *rule; enum ofperr error; + size_t i; error = ofputil_decode_flow_stats_request(&fsr, request); if (error) { return error; } - error = collect_rules_loose(ofproto, fsr.table_id, &fsr.match, - fsr.cookie, fsr.cookie_mask, - fsr.out_port, fsr.out_group, &rules); + rule_criteria_init(&criteria, fsr.table_id, &fsr.match, 0, fsr.cookie, + fsr.cookie_mask, fsr.out_port, fsr.out_group); + error = collect_rules_loose(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); 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; @@ -3155,14 +3223,12 @@ handle_flow_stats_request(struct ofconn *ofconn, fs.hard_timeout = rule->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - fs.flags = 0; - if (rule->send_flow_removed) { - fs.flags |= OFPUTIL_FF_SEND_FLOW_REM; - /* FIXME: Implement OFPUTIL_FF_NO_PKT_COUNTS and - OFPUTIL_FF_NO_BYT_COUNTS. */ - } + fs.flags = rule->flags; + ofputil_append_flow_stats_reply(&fs, &replies); } + rule_collection_destroy(&rules); + ofconn_send_replies(ofconn, &replies); return 0; @@ -3243,26 +3309,30 @@ handle_aggregate_stats_request(struct ofconn *ofconn, struct ofputil_flow_stats_request request; struct ofputil_aggregate_stats stats; bool unknown_packets, unknown_bytes; + struct rule_criteria criteria; + struct rule_collection rules; struct ofpbuf *reply; - struct list rules; - struct rule *rule; enum ofperr error; + size_t i; error = ofputil_decode_flow_stats_request(&request, oh); if (error) { return error; } - error = collect_rules_loose(ofproto, request.table_id, &request.match, - request.cookie, request.cookie_mask, - request.out_port, request.out_group, &rules); + rule_criteria_init(&criteria, request.table_id, &request.match, 0, + request.cookie, request.cookie_mask, + request.out_port, request.out_group); + error = collect_rules_loose(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); 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; @@ -3290,6 +3360,8 @@ handle_aggregate_stats_request(struct ofconn *ofconn, stats.byte_count = UINT64_MAX; } + rule_collection_destroy(&rules); + reply = ofputil_encode_aggregate_stats_reply(&stats, oh); ofconn_send_reply(ofconn, reply); @@ -3450,8 +3522,7 @@ 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. */ @@ -3509,12 +3580,15 @@ 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; } } @@ -3576,7 +3650,8 @@ add_flow(struct ofproto *ofproto, struct ofconn *ofconn, ovs_mutex_unlock(&rule->timeout_mutex); rule->table_id = table - ofproto->tables; - rule->send_flow_removed = (fm->flags & OFPUTIL_FF_SEND_FLOW_REM) != 0; + 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); @@ -3618,17 +3693,18 @@ 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) { 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; @@ -3663,9 +3739,7 @@ modify_flows__(struct ofproto *ofproto, struct ofconn *ofconn, rule->hard_timeout = fm->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - rule->send_flow_removed = (fm->flags - & OFPUTIL_FF_SEND_FLOW_REM) != 0; - + rule->flags = fm->flags & OFPUTIL_FF_STATE; if (fm->idle_timeout || fm->hard_timeout) { if (!rule->eviction_group) { eviction_group_add_rule(rule); @@ -3718,19 +3792,24 @@ modify_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn, struct ofputil_flow_mod *fm, const struct ofp_header *request) { - struct list rules; + struct rule_criteria criteria; + struct rule_collection rules; int error; - error = collect_rules_loose(ofproto, fm->table_id, &fm->match, - fm->cookie, fm->cookie_mask, - OFPP_ANY, OFPG11_ANY, &rules); - if (error) { - return error; - } else if (list_is_empty(&rules)) { - return modify_flows_add(ofproto, ofconn, fm, request); - } else { - return modify_flows__(ofproto, ofconn, fm, request, &rules); + rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, + fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY); + error = collect_rules_loose(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); + + if (!error) { + error = (rules.n > 0 + ? modify_flows__(ofproto, ofconn, fm, request, &rules) + : modify_flows_add(ofproto, ofconn, fm, request)); } + + rule_collection_destroy(&rules); + + return error; } /* Implements OFPFC_MODIFY_STRICT. Returns 0 on success or an OpenFlow error @@ -3743,21 +3822,26 @@ modify_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, struct ofputil_flow_mod *fm, const struct ofp_header *request) { - struct list rules; + struct rule_criteria criteria; + struct rule_collection rules; int error; - error = collect_rules_strict(ofproto, fm->table_id, &fm->match, - fm->priority, fm->cookie, fm->cookie_mask, - OFPP_ANY, OFPG11_ANY, &rules); - 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; + rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, + fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY); + error = collect_rules_strict(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); + + if (!error) { + 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. */ @@ -3780,14 +3864,16 @@ 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) { - 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) { + for (i = 0; i < rules->n; i++) { + struct rule *rule = rules->rules[i]; ovs_rwlock_wrlock(&rule->rwlock); delete_flow__(rule, group, reason); } @@ -3802,16 +3888,22 @@ delete_flows_loose(struct ofproto *ofproto, struct ofconn *ofconn, const struct ofputil_flow_mod *fm, const struct ofp_header *request) { - struct list rules; + struct rule_criteria criteria; + struct rule_collection rules; enum ofperr error; - error = collect_rules_loose(ofproto, fm->table_id, &fm->match, - fm->cookie, fm->cookie_mask, - fm->out_port, fm->out_group, &rules); - return (error ? error - : !list_is_empty(&rules) ? delete_flows__(ofproto, ofconn, request, - &rules, OFPRR_DELETE) - : 0); + rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, + fm->cookie, fm->cookie_mask, + fm->out_port, fm->out_group); + error = collect_rules_loose(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); + + if (!error && rules.n > 0) { + error = delete_flows__(ofproto, ofconn, request, &rules, OFPRR_DELETE); + } + rule_collection_destroy(&rules); + + return error; } /* Implements OFPFC_DELETE_STRICT. */ @@ -3820,17 +3912,22 @@ delete_flow_strict(struct ofproto *ofproto, struct ofconn *ofconn, const struct ofputil_flow_mod *fm, const struct ofp_header *request) { - struct list rules; + struct rule_criteria criteria; + struct rule_collection rules; enum ofperr error; - error = collect_rules_strict(ofproto, fm->table_id, &fm->match, - fm->priority, fm->cookie, fm->cookie_mask, - fm->out_port, fm->out_group, &rules); - return (error ? error - : list_is_singleton(&rules) ? delete_flows__(ofproto, ofconn, - request, &rules, - OFPRR_DELETE) - : 0); + rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, + fm->cookie, fm->cookie_mask, + fm->out_port, fm->out_group); + error = collect_rules_strict(ofproto, &criteria, &rules); + rule_criteria_destroy(&criteria); + + if (!error && rules.n > 0) { + error = delete_flows__(ofproto, ofconn, request, &rules, OFPRR_DELETE); + } + rule_collection_destroy(&rules); + + return error; } static void @@ -3838,7 +3935,8 @@ ofproto_rule_send_removed(struct rule *rule, uint8_t reason) { struct ofputil_flow_removed fr; - if (ofproto_rule_is_hidden(rule) || !rule->send_flow_removed) { + if (ofproto_rule_is_hidden(rule) || + !(rule->flags & OFPUTIL_FF_SEND_FLOW_REM)) { return; } @@ -3879,7 +3977,7 @@ ofproto_rule_expire(struct rule *rule, uint8_t reason) ofproto_rule_send_removed(rule, reason); ovs_rwlock_wrlock(&cls->rwlock); - ofproto_delete_rule(ofproto, cls, rule); + ofproto_rule_delete(ofproto, cls, rule); ovs_rwlock_unlock(&cls->rwlock); } @@ -4253,11 +4351,13 @@ 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) { - 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; @@ -4268,7 +4368,7 @@ 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) { enum nx_flow_monitor_flags update; @@ -4299,7 +4399,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); } @@ -4307,7 +4407,7 @@ 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) { const struct ofproto *ofproto = ofconn_get_ofproto(m->ofconn); const struct ofoperation *op; @@ -4343,7 +4443,7 @@ 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) { if (m->flags & NXFMF_INITIAL) { ofproto_collect_ofmonitor_refresh_rules(m, 0, rules); @@ -4352,7 +4452,7 @@ 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) { ofproto_collect_ofmonitor_refresh_rules(m, seqno, rules); } @@ -4363,9 +4463,9 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) 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; @@ -4404,13 +4504,15 @@ 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); + rule_collection_destroy(&rules); + ofconn_send_replies(ofconn, &replies); free(monitors); @@ -4569,8 +4671,9 @@ handle_delete_meter(struct ofconn *ofconn, const struct ofp_header *oh, { 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; @@ -4584,7 +4687,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. */ - list_init(&rules); + rule_collection_init(&rules); for (meter_id = first; meter_id <= last; ++meter_id) { struct meter *meter = ofproto->meters[meter_id]; if (meter && !list_is_empty(&meter->rules)) { @@ -4592,20 +4695,24 @@ 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: + rule_collection_destroy(&rules); + + return error; } static enum ofperr @@ -4634,9 +4741,12 @@ handle_meter_mod(struct ofconn *ofconn, const struct ofp_header *oh) if (mm.command != OFPMC13_DELETE) { /* Fails also when meters are not implemented by the provider. */ - if (!meter_id || meter_id > ofproto->meter_features.max_meters) { + if (meter_id == 0 || meter_id > OFPM13_MAX) { error = OFPERR_OFPMMFC_INVALID_METER; goto exit_free_bands; + } else if (meter_id > ofproto->meter_features.max_meters) { + error = OFPERR_OFPMMFC_OUT_OF_METERS; + goto exit_free_bands; } if (mm.meter.n_bands > ofproto->meter_features.max_bands) { error = OFPERR_OFPMMFC_OUT_OF_BANDS; @@ -5553,7 +5663,7 @@ ofopgroup_complete(struct ofopgroup *group) op->ofpacts = NULL; op->ofpacts_len = 0; } - rule->send_flow_removed = op->send_flow_removed; + rule->flags = op->flags; } break; @@ -5611,7 +5721,7 @@ ofoperation_create(struct ofopgroup *group, struct rule *rule, op->idle_timeout = rule->idle_timeout; op->hard_timeout = rule->hard_timeout; ovs_mutex_unlock(&rule->timeout_mutex); - op->send_flow_removed = rule->send_flow_removed; + op->flags = rule->flags; group->n_running++;