X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=1335da6757507f4136625b05dd3eff33f57d4a1f;hb=HEAD;hp=7ca6504faf688ec4c99780e2f9a769b3fdeed324;hpb=03c72922c2c7b00933d97235fddfd7956948349d;p=cascardo%2Fovs.git diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 7ca6504fa..1335da675 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2015 Nicira, Inc. + * Copyright (c) 2009-2016 Nicira, Inc. * Copyright (c) 2010 Jean Tourrilhes - HP-Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -137,6 +137,7 @@ struct rule_criteria { * collect_rules_loose() and "strict" way by collect_rules_strict(), as * defined in the OpenFlow spec. */ struct cls_rule cr; + cls_version_t version; /* 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'. @@ -216,9 +217,9 @@ static void learned_cookies_flush(struct ofproto *, struct ovs_list *dead_cookie /* ofport. */ static void ofport_destroy__(struct ofport *) OVS_EXCLUDED(ofproto_mutex); -static void ofport_destroy(struct ofport *); +static void ofport_destroy(struct ofport *, bool del); -static void update_port(struct ofproto *, const char *devname); +static int update_port(struct ofproto *, const char *devname); static int init_ports(struct ofproto *); static void reinit_ports(struct ofproto *); @@ -267,9 +268,8 @@ static enum ofperr replace_rule_create(struct ofproto *, struct rule **new_rule) OVS_REQUIRES(ofproto_mutex); -static void replace_rule_start(struct ofproto *, - struct rule *old_rule, - struct rule *new_rule, +static void replace_rule_start(struct ofproto *, cls_version_t version, + struct rule *old_rule, struct rule *new_rule, struct cls_conjunction *, size_t n_conjs) OVS_REQUIRES(ofproto_mutex); @@ -297,19 +297,18 @@ static bool ofproto_group_exists__(const struct ofproto *ofproto, static bool ofproto_group_exists(const struct ofproto *ofproto, uint32_t group_id) OVS_EXCLUDED(ofproto->groups_rwlock); -static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *); +static enum ofperr add_group(struct ofproto *, + const struct ofputil_group_mod *); static void handle_openflow(struct ofconn *, const struct ofpbuf *); -static enum ofperr do_bundle_flow_mod_start(struct ofproto *, - struct ofputil_flow_mod *, - struct ofp_bundle_entry *) +static enum ofperr ofproto_flow_mod_start(struct ofproto *, + struct ofproto_flow_mod *) OVS_REQUIRES(ofproto_mutex); -static void do_bundle_flow_mod_finish(struct ofproto *, - struct ofputil_flow_mod *, - const struct flow_mod_requester *, - struct ofp_bundle_entry *) +static void ofproto_flow_mod_finish(struct ofproto *, + struct ofproto_flow_mod *, + const struct flow_mod_requester *) OVS_REQUIRES(ofproto_mutex); static enum ofperr handle_flow_mod__(struct ofproto *, - struct ofputil_flow_mod *, + struct ofproto_flow_mod *, const struct flow_mod_requester *) OVS_EXCLUDED(ofproto_mutex); static void calc_duration(long long int start, long long int now, @@ -338,7 +337,6 @@ unsigned ofproto_flow_limit = OFPROTO_FLOW_LIMIT_DEFAULT; unsigned ofproto_max_idle = OFPROTO_MAX_IDLE_DEFAULT; size_t n_handlers, n_revalidators; -size_t n_dpdk_rxqs; char *pmd_cpu_mask; /* Map from datapath name to struct ofproto, for use by unixctl commands. */ @@ -385,6 +383,8 @@ ofproto_init(const struct shash *iface_hints) for (i = 0; i < n_ofproto_classes; i++) { ofproto_classes[i]->init(&init_ofp_ports); } + + ofproto_unixctl_init(); } /* 'type' should be a normalized datapath type, as returned by @@ -513,8 +513,6 @@ ofproto_create(const char *datapath_name, const char *datapath_type, *ofprotop = NULL; - ofproto_unixctl_init(); - datapath_type = ofproto_normalize_type(datapath_type); class = ofproto_class_find__(datapath_type); if (!class) { @@ -546,7 +544,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type, ofproto->sw_desc = NULL; ofproto->serial_desc = NULL; ofproto->dp_desc = NULL; - ofproto->frag_handling = OFPC_FRAG_NORMAL; + ofproto->frag_handling = OFPUTIL_FRAG_NORMAL; hmap_init(&ofproto->ports); hmap_init(&ofproto->ofport_usage); shash_init(&ofproto->port_by_name); @@ -781,12 +779,6 @@ ofproto_port_set_mcast_snooping(struct ofproto *ofproto, void *aux, : EOPNOTSUPP); } -void -ofproto_set_n_dpdk_rxqs(int n_rxqs) -{ - n_dpdk_rxqs = MAX(n_rxqs, 0); -} - void ofproto_set_cpu_mask(const char *cmask) { @@ -1581,7 +1573,7 @@ ofproto_destroy_defer__(struct ofproto *ofproto) } void -ofproto_destroy(struct ofproto *p) +ofproto_destroy(struct ofproto *p, bool del) OVS_EXCLUDED(ofproto_mutex) { struct ofport *ofport, *next_ofport; @@ -1600,7 +1592,7 @@ ofproto_destroy(struct ofproto *p) ofproto_flush__(p); HMAP_FOR_EACH_SAFE (ofport, next_ofport, hmap_node, &p->ports) { - ofport_destroy(ofport); + ofport_destroy(ofport, del); } HMAP_FOR_EACH_SAFE (usage, next_usage, hmap_node, &p->ofport_usage) { @@ -1963,7 +1955,7 @@ ofproto_port_add(struct ofproto *ofproto, struct netdev *netdev, simap_put(&ofproto->ofp_requests, netdev_name, ofp_to_u16(ofp_port)); - update_port(ofproto, netdev_name); + error = update_port(ofproto, netdev_name); } if (ofp_portp) { *ofp_portp = OFPP_NONE; @@ -2035,24 +2027,18 @@ flow_mod_init(struct ofputil_flow_mod *fm, const struct ofpact *ofpacts, size_t ofpacts_len, enum ofp_flow_mod_command command) { - memset(fm, 0, sizeof *fm); - fm->match = *match; - fm->priority = priority; - fm->cookie = 0; - fm->new_cookie = 0; - fm->modify_cookie = false; - fm->table_id = 0; - fm->command = command; - fm->idle_timeout = 0; - fm->hard_timeout = 0; - fm->importance = 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; - fm->delete_reason = OFPRR_DELETE; + *fm = (struct ofputil_flow_mod) { + .match = *match, + .priority = priority, + .table_id = 0, + .command = command, + .buffer_id = UINT32_MAX, + .out_port = OFPP_ANY, + .out_group = OFPG_ANY, + .ofpacts = CONST_CAST(struct ofpact *, ofpacts), + .ofpacts_len = ofpacts_len, + .delete_reason = OFPRR_DELETE, + }; } static int @@ -2061,11 +2047,11 @@ simple_flow_mod(struct ofproto *ofproto, const struct ofpact *ofpacts, size_t ofpacts_len, enum ofp_flow_mod_command command) { - struct ofputil_flow_mod fm; + struct ofproto_flow_mod ofm; - flow_mod_init(&fm, match, priority, ofpacts, ofpacts_len, command); + flow_mod_init(&ofm.fm, match, priority, ofpacts, ofpacts_len, command); - return handle_flow_mod__(ofproto, &fm, NULL); + return handle_flow_mod__(ofproto, &ofm, NULL); } /* Adds a flow to OpenFlow flow table 0 in 'p' that matches 'cls_rule' and @@ -2117,9 +2103,11 @@ ofproto_add_flow(struct ofproto *ofproto, const struct match *match, * This is a helper function for in-band control and fail-open and the "learn" * action. */ enum ofperr -ofproto_flow_mod(struct ofproto *ofproto, struct ofputil_flow_mod *fm) +ofproto_flow_mod(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_EXCLUDED(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + /* Optimize for the most common case of a repeated learn action. * If an identical flow already exists we only need to update its * 'modified' time. */ @@ -2160,7 +2148,7 @@ ofproto_flow_mod(struct ofproto *ofproto, struct ofputil_flow_mod *fm) } } - return handle_flow_mod__(ofproto, fm, NULL); + return handle_flow_mod__(ofproto, ofm, NULL); } /* Searches for a rule with matching criteria exactly equal to 'target' in @@ -2317,7 +2305,7 @@ ofport_open(struct ofproto *ofproto, } } pp->port_no = ofproto_port->ofp_port; - netdev_get_etheraddr(netdev, pp->hw_addr); + netdev_get_etheraddr(netdev, &pp->hw_addr); ovs_strlcpy(pp->name, ofproto_port->name, sizeof pp->name); netdev_get_flags(netdev, &flags); pp->config = flags & NETDEV_UP ? 0 : OFPUTIL_PC_PORT_DOWN; @@ -2351,7 +2339,7 @@ ofport_equal(const struct ofputil_phy_port *a, /* Adds an ofport to 'p' initialized based on the given 'netdev' and 'opp'. * The caller must ensure that 'p' does not have a conflicting ofport (that is, * one with the same name or port number). */ -static void +static int ofport_install(struct ofproto *p, struct netdev *netdev, const struct ofputil_phy_port *pp) { @@ -2385,7 +2373,7 @@ ofport_install(struct ofproto *p, goto error; } connmgr_send_port_status(p->connmgr, NULL, pp, OFPPR_ADD); - return; + return 0; error: VLOG_WARN_RL(&rl, "%s: could not add port %s (%s)", @@ -2395,6 +2383,7 @@ error: } else { netdev_close(netdev); } + return error; } /* Removes 'ofport' from 'p' and destroys it. */ @@ -2403,7 +2392,7 @@ ofport_remove(struct ofport *ofport) { connmgr_send_port_status(ofport->ofproto->connmgr, NULL, &ofport->pp, OFPPR_DELETE); - ofport_destroy(ofport); + ofport_destroy(ofport, true); } /* If 'ofproto' contains an ofport named 'name', removes it from 'ofproto' and @@ -2424,7 +2413,7 @@ ofport_remove_with_name(struct ofproto *ofproto, const char *name) static void ofport_modified(struct ofport *port, struct ofputil_phy_port *pp) { - memcpy(port->pp.hw_addr, pp->hw_addr, ETH_ADDR_LEN); + port->pp.hw_addr = pp->hw_addr; port->pp.config = ((port->pp.config & ~OFPUTIL_PC_PORT_DOWN) | (pp->config & OFPUTIL_PC_PORT_DOWN)); port->pp.state = ((port->pp.state & ~OFPUTIL_PS_LINK_DOWN) @@ -2489,11 +2478,11 @@ ofport_destroy__(struct ofport *port) } static void -ofport_destroy(struct ofport *port) +ofport_destroy(struct ofport *port, bool del) { if (port) { dealloc_ofp_port(port->ofproto, port->ofp_port); - port->ofproto->ofproto_class->port_destruct(port); + port->ofproto->ofproto_class->port_destruct(port, del); ofport_destroy__(port); } } @@ -2576,13 +2565,14 @@ ofproto_port_get_stats(const struct ofport *port, struct netdev_stats *stats) return error; } -static void +static int update_port(struct ofproto *ofproto, const char *name) { struct ofproto_port ofproto_port; struct ofputil_phy_port pp; struct netdev *netdev; struct ofport *port; + int error = 0; COVERAGE_INC(ofproto_update_port); @@ -2622,13 +2612,15 @@ update_port(struct ofproto *ofproto, const char *name) ofport_remove(port); } ofport_remove_with_name(ofproto, name); - ofport_install(ofproto, netdev, &pp); + error = ofport_install(ofproto, netdev, &pp); } } else { /* Any port named 'name' is gone now. */ ofport_remove_with_name(ofproto, name); } ofproto_port_destroy(&ofproto_port); + + return error; } static int @@ -3255,23 +3247,13 @@ handle_features_request(struct ofconn *ofconn, const struct ofp_header *oh) static enum ofperr handle_get_config_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofproto *ofproto = ofconn_get_ofproto(ofconn); - struct ofp_switch_config *osc; - enum ofp_config_flags flags; - struct ofpbuf *buf; + struct ofputil_switch_config config; + config.frag = ofconn_get_ofproto(ofconn)->frag_handling; + config.invalid_ttl_to_controller + = ofconn_get_invalid_ttl_to_controller(ofconn); + config.miss_send_len = ofconn_get_miss_send_len(ofconn); - /* Send reply. */ - buf = ofpraw_alloc_reply(OFPRAW_OFPT_GET_CONFIG_REPLY, oh, 0); - osc = ofpbuf_put_uninit(buf, sizeof *osc); - flags = ofproto->frag_handling; - /* OFPC_INVALID_TTL_TO_CONTROLLER is deprecated in OF 1.3 */ - if (oh->version < OFP13_VERSION - && ofconn_get_invalid_ttl_to_controller(ofconn)) { - flags |= OFPC_INVALID_TTL_TO_CONTROLLER; - } - osc->flags = htons(flags); - osc->miss_send_len = htons(ofconn_get_miss_send_len(ofconn)); - ofconn_send_reply(ofconn, buf); + ofconn_send_reply(ofconn, ofputil_encode_get_config_reply(oh, &config)); return 0; } @@ -3279,16 +3261,20 @@ handle_get_config_request(struct ofconn *ofconn, const struct ofp_header *oh) static enum ofperr handle_set_config(struct ofconn *ofconn, const struct ofp_header *oh) { - const struct ofp_switch_config *osc = ofpmsg_body(oh); struct ofproto *ofproto = ofconn_get_ofproto(ofconn); - uint16_t flags = ntohs(osc->flags); + struct ofputil_switch_config config; + enum ofperr error; + + error = ofputil_decode_set_config(oh, &config); + if (error) { + return error; + } if (ofconn_get_type(ofconn) != OFCONN_PRIMARY || ofconn_get_role(ofconn) != OFPCR12_ROLE_SLAVE) { - enum ofp_config_flags cur = ofproto->frag_handling; - enum ofp_config_flags next = flags & OFPC_FRAG_MASK; + enum ofputil_frag_handling cur = ofproto->frag_handling; + enum ofputil_frag_handling next = config.frag; - ovs_assert((cur & OFPC_FRAG_MASK) == cur); if (cur != next) { if (ofproto->ofproto_class->set_frag_handling(ofproto, next)) { ofproto->frag_handling = next; @@ -3299,12 +3285,13 @@ handle_set_config(struct ofconn *ofconn, const struct ofp_header *oh) } } } - /* OFPC_INVALID_TTL_TO_CONTROLLER is deprecated in OF 1.3 */ - ofconn_set_invalid_ttl_to_controller(ofconn, - (oh->version < OFP13_VERSION - && flags & OFPC_INVALID_TTL_TO_CONTROLLER)); - ofconn_set_miss_send_len(ofconn, ntohs(osc->miss_send_len)); + if (config.invalid_ttl_to_controller >= 0) { + ofconn_set_invalid_ttl_to_controller(ofconn, + config.invalid_ttl_to_controller); + } + + ofconn_set_miss_send_len(ofconn, config.miss_send_len); return 0; } @@ -3333,7 +3320,7 @@ reject_slave_controller(struct ofconn *ofconn) * - If they use any groups, then 'ofproto' has that group configured. * * Returns 0 if successful, otherwise an OpenFlow error. */ -static enum ofperr +enum ofperr ofproto_check_ofpacts(struct ofproto *ofproto, const struct ofpact ofpacts[], size_t ofpacts_len) { @@ -3345,7 +3332,7 @@ ofproto_check_ofpacts(struct ofproto *ofproto, return OFPERR_OFPMMFC_INVALID_METER; } - OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { + OFPACT_FOR_EACH_FLATTENED (a, ofpacts, ofpacts_len) { if (a->type == OFPACT_GROUP && !ofproto_group_exists(ofproto, ofpact_get_GROUP(a)->group_id)) { return OFPERR_OFPBAC_BAD_OUT_GROUP; @@ -3388,7 +3375,7 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh) /* Get payload. */ if (po.buffer_id != UINT32_MAX) { error = ofconn_pktbuf_retrieve(ofconn, po.buffer_id, &payload, NULL); - if (error || !payload) { + if (error) { goto exit_free_ofpacts; } } else { @@ -3399,10 +3386,22 @@ handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh) /* Verify actions against packet, then send packet if successful. */ flow_extract(payload, &flow); flow.in_port.ofp_port = po.in_port; - error = ofproto_check_ofpacts(p, po.ofpacts, po.ofpacts_len); + + /* Check actions like for flow mods. We pass a 'table_id' of 0 to + * ofproto_check_consistency(), which isn't strictly correct because these + * actions aren't in any table. This is OK as 'table_id' is only used to + * check instructions (e.g., goto-table), which can't appear on the action + * list of a packet-out. */ + error = ofpacts_check_consistency(po.ofpacts, po.ofpacts_len, + &flow, u16_to_ofp(p->max_ports), + 0, p->n_tables, + ofconn_get_protocol(ofconn)); if (!error) { - error = p->ofproto_class->packet_out(p, payload, &flow, - po.ofpacts, po.ofpacts_len); + error = ofproto_check_ofpacts(p, po.ofpacts, po.ofpacts_len); + if (!error) { + error = p->ofproto_class->packet_out(p, payload, &flow, + po.ofpacts, po.ofpacts_len); + } } dp_packet_delete(payload); @@ -3412,6 +3411,27 @@ exit: return error; } +static enum ofperr +handle_nxt_resume(struct ofconn *ofconn, const struct ofp_header *oh) +{ + struct ofproto *ofproto = ofconn_get_ofproto(ofconn); + struct ofputil_packet_in_private pin; + enum ofperr error; + + error = ofputil_decode_packet_in_private(oh, false, &pin, NULL, NULL); + if (error) { + return error; + } + + error = (ofproto->ofproto_class->nxt_resume + ? ofproto->ofproto_class->nxt_resume(ofproto, &pin) + : OFPERR_NXR_NOT_SUPPORTED); + + ofputil_packet_in_private_destroy(&pin); + + return error; +} + static void update_port_config(struct ofconn *ofconn, struct ofport *port, enum ofputil_port_config config, @@ -3550,21 +3570,19 @@ handle_table_features_request(struct ofconn *ofconn, const struct ofp_header *request) { struct ofproto *ofproto = ofconn_get_ofproto(ofconn); - struct ofputil_table_features *features; - struct ovs_list replies; - struct ofpbuf msg; - size_t i; - - ofpbuf_use_const(&msg, request, ntohs(request->length)); + struct ofpbuf msg = ofpbuf_const_initializer(request, + ntohs(request->length)); ofpraw_pull_assert(&msg); if (msg.size || ofpmp_more(request)) { return OFPERR_OFPTFFC_EPERM; } + struct ofputil_table_features *features; query_tables(ofproto, &features, NULL); + struct ovs_list replies; ofpmp_init(&replies, request); - for (i = 0; i < ofproto->n_tables; i++) { + for (size_t i = 0; i < ofproto->n_tables; i++) { if (!(ofproto->tables[i].flags & OFTABLE_HIDDEN)) { ofputil_append_table_features_reply(&features[i], &replies); } @@ -3576,6 +3594,37 @@ handle_table_features_request(struct ofconn *ofconn, return 0; } +/* Returns the vacancy of 'oftable', a number that ranges from 0 (if the table + * is full) to 100 (if the table is empty). + * + * A table without a limit on flows is considered to be empty. */ +static uint8_t +oftable_vacancy(const struct oftable *t) +{ + return (!t->max_flows ? 100 + : t->n_flows >= t->max_flows ? 0 + : (t->max_flows - t->n_flows) * 100.0 / t->max_flows); +} + +static void +query_table_desc__(struct ofputil_table_desc *td, + struct ofproto *ofproto, uint8_t table_id) +{ + const struct oftable *t = &ofproto->tables[table_id]; + + td->table_id = table_id; + td->eviction = (t->eviction & EVICTION_OPENFLOW + ? OFPUTIL_TABLE_EVICTION_ON + : OFPUTIL_TABLE_EVICTION_OFF); + td->eviction_flags = OFPROTO_EVICTION_FLAGS; + td->vacancy = (t->vacancy_event + ? OFPUTIL_TABLE_VACANCY_ON + : OFPUTIL_TABLE_VACANCY_OFF); + td->table_vacancy.vacancy_down = t->vacancy_down; + td->table_vacancy.vacancy_up = t->vacancy_up; + td->table_vacancy.vacancy = oftable_vacancy(t); +} + /* This function queries the database for dumping table-desc. */ static void query_tables_desc(struct ofproto *ofproto, struct ofputil_table_desc **descp) @@ -3586,11 +3635,7 @@ query_tables_desc(struct ofproto *ofproto, struct ofputil_table_desc **descp) table_desc = *descp = xcalloc(ofproto->n_tables, sizeof *table_desc); for (i = 0; i < ofproto->n_tables; i++) { struct ofputil_table_desc *td = &table_desc[i]; - td->table_id = i; - td->eviction = (ofproto->tables[i].eviction & EVICTION_OPENFLOW - ? OFPUTIL_TABLE_EVICTION_ON - : OFPUTIL_TABLE_EVICTION_OFF); - td->eviction_flags = OFPROTO_EVICTION_FLAGS; + query_table_desc__(td, ofproto, i); } } @@ -3617,6 +3662,40 @@ handle_table_desc_request(struct ofconn *ofconn, return 0; } +/* This function determines and sends the vacancy event, based on the value + * of current vacancy and threshold vacancy. If the current vacancy is less + * than or equal to vacancy_down, vacancy up events must be enabled, and when + * the current vacancy is greater or equal to vacancy_up, vacancy down events + * must be enabled. */ +static void +send_table_status(struct ofproto *ofproto, uint8_t table_id) +{ + struct oftable *t = &ofproto->tables[table_id]; + if (!t->vacancy_event) { + return; + } + + uint8_t vacancy = oftable_vacancy(t); + enum ofp14_table_reason event; + if (vacancy < t->vacancy_down) { + event = OFPTR_VACANCY_DOWN; + } else if (vacancy > t->vacancy_up) { + event = OFPTR_VACANCY_UP; + } else { + return; + } + + if (event == t->vacancy_event) { + struct ofputil_table_desc td; + query_table_desc__(&td, ofproto, table_id); + connmgr_send_table_status(ofproto->connmgr, &td, event); + + t->vacancy_event = (event == OFPTR_VACANCY_DOWN + ? OFPTR_VACANCY_UP + : OFPTR_VACANCY_DOWN); + } +} + static void append_port_stat(struct ofport *port, struct ovs_list *replies) { @@ -3803,7 +3882,8 @@ rule_criteria_init(struct rule_criteria *criteria, uint8_t table_id, uint32_t out_group) { criteria->table_id = table_id; - cls_rule_init(&criteria->cr, match, priority, version); + cls_rule_init(&criteria->cr, match, priority); + criteria->version = version; criteria->cookie = cookie; criteria->cookie_mask = cookie_mask; criteria->out_port = out_port; @@ -3954,7 +4034,7 @@ collect_rule(struct rule *rule, const struct rule_criteria *c, && ofproto_rule_has_out_group(rule, c->out_group) && !((rule->flow_cookie ^ c->cookie) & c->cookie_mask) && (!rule_is_hidden(rule) || c->include_hidden) - && cls_rule_visible_in_version(&rule->cr, c->cr.version)) { + && cls_rule_visible_in_version(&rule->cr, c->version)) { /* Rule matches all the criteria... */ if (!rule_is_readonly(rule) || c->include_readonly) { /* ...add it. */ @@ -4003,7 +4083,8 @@ collect_rules_loose(struct ofproto *ofproto, FOR_EACH_MATCHING_TABLE (table, criteria->table_id, ofproto) { struct rule *rule; - CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &criteria->cr) { + CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &criteria->cr, + criteria->version) { collect_rule(rule, criteria, rules, &n_readonly); } } @@ -4059,7 +4140,8 @@ collect_rules_strict(struct ofproto *ofproto, struct rule *rule; rule = rule_from_cls_rule(classifier_find_rule_exactly( - &table->cls, &criteria->cr)); + &table->cls, &criteria->cr, + criteria->version)); if (rule) { collect_rule(rule, criteria, rules, &n_readonly); } @@ -4502,10 +4584,12 @@ get_conjunctions(const struct ofputil_flow_mod *fm, * * The caller retains ownership of 'fm->ofpacts'. */ static enum ofperr -add_flow_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule **old_rule, struct rule **new_rule) +add_flow_start(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule **old_rule = &ofm->old_rules.stub[0]; + struct rule **new_rule = &ofm->new_rules.stub[0]; struct oftable *table; struct cls_rule cr; struct rule *rule; @@ -4551,16 +4635,17 @@ add_flow_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm, return OFPERR_OFPBRC_EPERM; } - cls_rule_init(&cr, &fm->match, fm->priority, ofproto->tables_version + 1); + cls_rule_init(&cr, &fm->match, fm->priority); /* Check for the existence of an identical rule. * This will not return rules earlier marked for removal. */ - rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, &cr)); + rule = rule_from_cls_rule(classifier_find_rule_exactly(&table->cls, &cr, + ofm->version)); *old_rule = rule; if (!rule) { /* Check for overlap, if requested. */ if (fm->flags & OFPUTIL_FF_CHECK_OVERLAP - && classifier_rule_overlaps(&table->cls, &cr)) { + && classifier_rule_overlaps(&table->cls, &cr, ofm->version)) { cls_rule_destroy(&cr); return OFPERR_OFPFMFC_OVERLAP; } @@ -4590,7 +4675,7 @@ add_flow_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } get_conjunctions(fm, &conjs, &n_conjs); - replace_rule_start(ofproto, rule, *new_rule, conjs, n_conjs); + replace_rule_start(ofproto, ofm->version, rule, *new_rule, conjs, n_conjs); free(conjs); return 0; @@ -4598,10 +4683,13 @@ add_flow_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm, /* Revert the effects of add_flow_start(). */ static void -add_flow_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule *old_rule, struct rule *new_rule) +add_flow_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule *old_rule = ofm->old_rules.stub[0]; + struct rule *new_rule = ofm->new_rules.stub[0]; + if (old_rule && fm->delete_reason == OFPRR_EVICTION) { /* Revert the eviction. */ eviction_group_add_rule(old_rule); @@ -4612,11 +4700,13 @@ add_flow_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, /* To be called after version bump. */ static void -add_flow_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - const struct flow_mod_requester *req, - struct rule *old_rule, struct rule *new_rule) +add_flow_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm, + const struct flow_mod_requester *req) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule *old_rule = ofm->old_rules.stub[0]; + struct rule *new_rule = ofm->new_rules.stub[0]; struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies); replace_rule_finish(ofproto, fm, req, old_rule, new_rule, &dead_cookies); @@ -4625,9 +4715,9 @@ add_flow_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, if (old_rule) { ovsrcu_postpone(remove_rule_rcu, old_rule); } else { - if (minimask_get_vid_mask(&new_rule->cr.match.mask) == VLAN_VID_MASK) { + if (minimask_get_vid_mask(new_rule->cr.match.mask) == VLAN_VID_MASK) { if (ofproto->vlan_bitmap) { - uint16_t vid = miniflow_get_vid(&new_rule->cr.match.flow); + uint16_t vid = miniflow_get_vid(new_rule->cr.match.flow); if (!bitmap_is_set(ofproto->vlan_bitmap, vid)) { bitmap_set1(ofproto->vlan_bitmap, vid); @@ -4641,6 +4731,9 @@ add_flow_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, ofmonitor_report(ofproto->connmgr, new_rule, NXFME_ADDED, 0, req ? req->ofconn : NULL, req ? req->request->xid : 0, NULL); + + /* Send Vacancy Events for OF1.4+. */ + send_table_status(ofproto, new_rule->table_id); } send_buffered_packet(req, fm->buffer_id, new_rule); @@ -4727,7 +4820,7 @@ replace_rule_create(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } static void -replace_rule_start(struct ofproto *ofproto, +replace_rule_start(struct ofproto *ofproto, cls_version_t version, struct rule *old_rule, struct rule *new_rule, struct cls_conjunction *conjs, size_t n_conjs) { @@ -4736,8 +4829,7 @@ replace_rule_start(struct ofproto *ofproto, /* 'old_rule' may be either an evicted rule or replaced rule. */ if (old_rule) { /* Mark the old rule for removal in the next version. */ - cls_rule_make_invisible_in_version(&old_rule->cr, - ofproto->tables_version + 1); + cls_rule_make_invisible_in_version(&old_rule->cr, version); } else { table->n_flows++; } @@ -4747,7 +4839,7 @@ replace_rule_start(struct ofproto *ofproto, ofproto_rule_insert__(ofproto, new_rule); /* Make the new rule visible for classifier lookups only from the next * version. */ - classifier_insert(&table->cls, &new_rule->cr, conjs, n_conjs); + classifier_insert(&table->cls, &new_rule->cr, version, conjs, n_conjs); } static void replace_rule_revert(struct ofproto *ofproto, @@ -4836,11 +4928,12 @@ replace_rule_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } static enum ofperr -modify_flows_start__(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule_collection *old_rules, - struct rule_collection *new_rules) +modify_flows_start__(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *old_rules = &ofm->old_rules; + struct rule_collection *new_rules = &ofm->new_rules; enum ofperr error; rule_collection_init(new_rules); @@ -4856,8 +4949,7 @@ modify_flows_start__(struct ofproto *ofproto, struct ofputil_flow_mod *fm, struct rule *new_rule; struct cls_rule cr; - cls_rule_clone_in_version(&cr, &old_rule->cr, - ofproto->tables_version + 1); + cls_rule_clone(&cr, &old_rule->cr); error = replace_rule_create(ofproto, fm, &cr, old_rule->table_id, old_rule, &new_rule); if (!error) { @@ -4872,15 +4964,14 @@ modify_flows_start__(struct ofproto *ofproto, struct ofputil_flow_mod *fm, get_conjunctions(fm, &conjs, &n_conjs); for (i = 0; i < old_rules->n; i++) { - replace_rule_start(ofproto, old_rules->rules[i], + replace_rule_start(ofproto, ofm->version, old_rules->rules[i], new_rules->rules[i], conjs, n_conjs); } free(conjs); } else if (!(fm->cookie_mask != htonll(0) || fm->new_cookie == OVS_BE64_MAX)) { /* No match, add a new flow. */ - error = add_flow_start(ofproto, fm, &old_rules->rules[0], - &new_rules->rules[0]); + error = add_flow_start(ofproto, ofm); if (!error) { ovs_assert(fm->delete_reason == OFPRR_EVICTION || !old_rules->rules[0]); @@ -4899,23 +4990,23 @@ modify_flows_start__(struct ofproto *ofproto, struct ofputil_flow_mod *fm, * 'ofconn' is used to retrieve the packet buffer specified in fm->buffer_id, * if any. */ static enum ofperr -modify_flows_start_loose(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule_collection *old_rules, - struct rule_collection *new_rules) +modify_flows_start_loose(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *old_rules = &ofm->old_rules; struct rule_criteria criteria; enum ofperr error; rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, CLS_MAX_VERSION, - fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY); + fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG_ANY); rule_criteria_require_rw(&criteria, (fm->flags & OFPUTIL_FF_NO_READONLY) != 0); error = collect_rules_loose(ofproto, &criteria, old_rules); rule_criteria_destroy(&criteria); if (!error) { - error = modify_flows_start__(ofproto, fm, old_rules, new_rules); + error = modify_flows_start__(ofproto, ofm); } if (error) { @@ -4925,14 +5016,15 @@ modify_flows_start_loose(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } static void -modify_flows_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule_collection *old_rules, - struct rule_collection *new_rules) +modify_flows_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct rule_collection *old_rules = &ofm->old_rules; + struct rule_collection *new_rules = &ofm->new_rules; + /* Old rules were not changed yet, only need to revert new rules. */ if (old_rules->n == 0 && new_rules->n == 1) { - add_flow_revert(ofproto, fm, old_rules->rules[0], new_rules->rules[0]); + add_flow_revert(ofproto, ofm); } else if (old_rules->n > 0) { for (size_t i = 0; i < old_rules->n; i++) { replace_rule_revert(ofproto, old_rules->rules[i], @@ -4944,15 +5036,16 @@ modify_flows_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } static void -modify_flows_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - const struct flow_mod_requester *req, - struct rule_collection *old_rules, - struct rule_collection *new_rules) +modify_flows_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm, + const struct flow_mod_requester *req) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *old_rules = &ofm->old_rules; + struct rule_collection *new_rules = &ofm->new_rules; + if (old_rules->n == 0 && new_rules->n == 1) { - add_flow_finish(ofproto, fm, req, old_rules->rules[0], - new_rules->rules[0]); + add_flow_finish(ofproto, ofm, req); } else if (old_rules->n > 0) { struct ovs_list dead_cookies = OVS_LIST_INITIALIZER(&dead_cookies); @@ -4973,17 +5066,17 @@ modify_flows_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, /* Implements OFPFC_MODIFY_STRICT. Returns 0 on success or an OpenFlow error * code on failure. */ static enum ofperr -modify_flow_start_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct rule_collection *old_rules, - struct rule_collection *new_rules) +modify_flow_start_strict(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *old_rules = &ofm->old_rules; struct rule_criteria criteria; enum ofperr error; rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, CLS_MAX_VERSION, fm->cookie, fm->cookie_mask, OFPP_ANY, - OFPG11_ANY); + OFPG_ANY); rule_criteria_require_rw(&criteria, (fm->flags & OFPUTIL_FF_NO_READONLY) != 0); error = collect_rules_strict(ofproto, &criteria, old_rules); @@ -4991,7 +5084,7 @@ modify_flow_start_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm, if (!error) { /* collect_rules_strict() can return max 1 rule. */ - error = modify_flows_start__(ofproto, fm, old_rules, new_rules); + error = modify_flows_start__(ofproto, ofm); } if (error) { @@ -5003,7 +5096,7 @@ modify_flow_start_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm, /* OFPFC_DELETE implementation. */ static void -delete_flows_start__(struct ofproto *ofproto, +delete_flows_start__(struct ofproto *ofproto, cls_version_t version, const struct rule_collection *rules) OVS_REQUIRES(ofproto_mutex) { @@ -5012,8 +5105,7 @@ delete_flows_start__(struct ofproto *ofproto, struct oftable *table = &ofproto->tables[rule->table_id]; table->n_flows--; - cls_rule_make_invisible_in_version(&rule->cr, - ofproto->tables_version + 1); + cls_rule_make_invisible_in_version(&rule->cr, version); } } @@ -5037,6 +5129,10 @@ delete_flows_finish__(struct ofproto *ofproto, ofmonitor_report(ofproto->connmgr, rule, NXFME_DELETED, reason, req ? req->ofconn : NULL, req ? req->request->xid : 0, NULL); + + /* Send Vacancy Event for OF1.4+. */ + send_table_status(ofproto, rule->table_id); + ofproto_rule_remove__(ofproto, rule); learned_cookies_dec(ofproto, rule_get_actions(rule), &dead_cookies); @@ -5059,7 +5155,7 @@ delete_flows__(struct rule_collection *rules, if (rules->n) { struct ofproto *ofproto = rules->rules[0]->ofproto; - delete_flows_start__(ofproto, rules); + delete_flows_start__(ofproto, ofproto->tables_version + 1, rules); ofproto_bump_tables_version(ofproto); delete_flows_finish__(ofproto, rules, reason, req); ofmonitor_flush(ofproto->connmgr); @@ -5068,11 +5164,11 @@ delete_flows__(struct rule_collection *rules, /* Implements OFPFC_DELETE. */ static enum ofperr -delete_flows_start_loose(struct ofproto *ofproto, - const struct ofputil_flow_mod *fm, - struct rule_collection *rules) +delete_flows_start_loose(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + const struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *rules = &ofm->old_rules; struct rule_criteria criteria; enum ofperr error; @@ -5085,17 +5181,18 @@ delete_flows_start_loose(struct ofproto *ofproto, rule_criteria_destroy(&criteria); if (!error) { - delete_flows_start__(ofproto, rules); + delete_flows_start__(ofproto, ofm->version, rules); } return error; } static void -delete_flows_revert(struct ofproto *ofproto, - struct rule_collection *rules) +delete_flows_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + struct rule_collection *rules = &ofm->old_rules; + for (size_t i = 0; i < rules->n; i++) { struct rule *rule = rules->rules[i]; struct oftable *table = &ofproto->tables[rule->table_id]; @@ -5111,21 +5208,22 @@ delete_flows_revert(struct ofproto *ofproto, static void delete_flows_finish(struct ofproto *ofproto, - const struct ofputil_flow_mod *fm, - const struct flow_mod_requester *req, - struct rule_collection *rules) + struct ofproto_flow_mod *ofm, + const struct flow_mod_requester *req) OVS_REQUIRES(ofproto_mutex) { - delete_flows_finish__(ofproto, rules, fm->delete_reason, req); + delete_flows_finish__(ofproto, &ofm->old_rules, ofm->fm.delete_reason, + req); } /* Implements OFPFC_DELETE_STRICT. */ static enum ofperr delete_flow_start_strict(struct ofproto *ofproto, - const struct ofputil_flow_mod *fm, - struct rule_collection *rules) + struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { + const struct ofputil_flow_mod *fm = &ofm->fm; + struct rule_collection *rules = &ofm->old_rules; struct rule_criteria criteria; enum ofperr error; @@ -5138,7 +5236,7 @@ delete_flow_start_strict(struct ofproto *ofproto, rule_criteria_destroy(&criteria); if (!error) { - delete_flows_start__(ofproto, rules); + delete_flows_start__(ofproto, ofm->version, rules); } return error; @@ -5230,7 +5328,7 @@ 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; + struct ofproto_flow_mod ofm; uint64_t ofpacts_stub[1024 / 8]; struct ofpbuf ofpacts; enum ofperr error; @@ -5241,25 +5339,26 @@ handle_flow_mod(struct ofconn *ofconn, const struct ofp_header *oh) } ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub); - error = ofputil_decode_flow_mod(&fm, oh, ofconn_get_protocol(ofconn), + error = ofputil_decode_flow_mod(&ofm.fm, oh, ofconn_get_protocol(ofconn), &ofpacts, u16_to_ofp(ofproto->max_ports), ofproto->n_tables); if (!error) { - error = ofproto_check_ofpacts(ofproto, fm.ofpacts, fm.ofpacts_len); + error = ofproto_check_ofpacts(ofproto, ofm.fm.ofpacts, + ofm.fm.ofpacts_len); } if (!error) { struct flow_mod_requester req; req.ofconn = ofconn; req.request = oh; - error = handle_flow_mod__(ofproto, &fm, &req); + error = handle_flow_mod__(ofproto, &ofm, &req); } if (error) { goto exit_free_ofpacts; } - ofconn_report_flow_mod(ofconn, fm.command); + ofconn_report_flow_mod(ofconn, ofm.fm.command); exit_free_ofpacts: ofpbuf_uninit(&ofpacts); @@ -5268,18 +5367,18 @@ exit: } static enum ofperr -handle_flow_mod__(struct ofproto *ofproto, struct ofputil_flow_mod *fm, +handle_flow_mod__(struct ofproto *ofproto, struct ofproto_flow_mod *ofm, const struct flow_mod_requester *req) OVS_EXCLUDED(ofproto_mutex) { - struct ofp_bundle_entry be; enum ofperr error; ovs_mutex_lock(&ofproto_mutex); - error = do_bundle_flow_mod_start(ofproto, fm, &be); + ofm->version = ofproto->tables_version + 1; + error = ofproto_flow_mod_start(ofproto, ofm); if (!error) { ofproto_bump_tables_version(ofproto); - do_bundle_flow_mod_finish(ofproto, fm, req, &be); + ofproto_flow_mod_finish(ofproto, ofm, req); } ofmonitor_flush(ofproto->connmgr); ovs_mutex_unlock(&ofproto_mutex); @@ -5302,7 +5401,8 @@ handle_role_request(struct ofconn *ofconn, const struct ofp_header *oh) } if (request.role != OFPCR12_ROLE_NOCHANGE) { - if (request.have_generation_id + if (request.role != OFPCR12_ROLE_EQUAL + && request.have_generation_id && !ofconn_set_master_election_id(ofconn, request.generation_id)) { return OFPERR_OFPRRFC_STALE; } @@ -5360,7 +5460,7 @@ handle_nxt_set_packet_in_format(struct ofconn *ofconn, uint32_t format; format = ntohl(msg->format); - if (format != NXPIF_OPENFLOW10 && format != NXPIF_NXM) { + if (!ofputil_packet_in_format_is_valid(format)) { return OFPERR_OFPBRC_EPERM; } @@ -5371,19 +5471,16 @@ handle_nxt_set_packet_in_format(struct ofconn *ofconn, static enum ofperr handle_nxt_set_async_config(struct ofconn *ofconn, const struct ofp_header *oh) { - const struct nx_async_config *msg = ofpmsg_body(oh); - uint32_t master[OAM_N_TYPES]; - uint32_t slave[OAM_N_TYPES]; - - master[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[0]); - master[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[0]); - master[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[0]); + struct ofputil_async_cfg basis = ofconn_get_async_config(ofconn); + struct ofputil_async_cfg ac; + enum ofperr error; - slave[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[1]); - slave[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[1]); - slave[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[1]); + error = ofputil_decode_set_async_config(oh, false, &basis, &ac); + if (error) { + return error; + } - ofconn_set_async_config(ofconn, master, slave); + ofconn_set_async_config(ofconn, &ac); if (ofconn_get_type(ofconn) == OFCONN_SERVICE && !ofconn_get_miss_send_len(ofconn)) { ofconn_set_miss_send_len(ofconn, OFP_DEFAULT_MISS_SEND_LEN); @@ -5395,24 +5492,8 @@ handle_nxt_set_async_config(struct ofconn *ofconn, const struct ofp_header *oh) static enum ofperr handle_nxt_get_async_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofpbuf *buf; - uint32_t master[OAM_N_TYPES]; - uint32_t slave[OAM_N_TYPES]; - struct nx_async_config *msg; - - ofconn_get_async_config(ofconn, master, slave); - buf = ofpraw_alloc_reply(OFPRAW_OFPT13_GET_ASYNC_REPLY, oh, 0); - msg = ofpbuf_put_zeros(buf, sizeof *msg); - - msg->packet_in_mask[0] = htonl(master[OAM_PACKET_IN]); - msg->port_status_mask[0] = htonl(master[OAM_PORT_STATUS]); - msg->flow_removed_mask[0] = htonl(master[OAM_FLOW_REMOVED]); - - msg->packet_in_mask[1] = htonl(slave[OAM_PACKET_IN]); - msg->port_status_mask[1] = htonl(slave[OAM_PORT_STATUS]); - msg->flow_removed_mask[1] = htonl(slave[OAM_FLOW_REMOVED]); - - ofconn_send_reply(ofconn, buf); + struct ofputil_async_cfg ac = ofconn_get_async_config(ofconn); + ofconn_send_reply(ofconn, ofputil_encode_get_async_reply(oh, &ac)); return 0; } @@ -5540,11 +5621,11 @@ ofproto_collect_ofmonitor_refresh_rules(const struct ofmonitor *m, const struct oftable *table; struct cls_rule target; - cls_rule_init_from_minimatch(&target, &m->match, 0, CLS_MAX_VERSION); + cls_rule_init_from_minimatch(&target, &m->match, 0); FOR_EACH_MATCHING_TABLE (table, m->table_id, ofproto) { struct rule *rule; - CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &target) { + CLS_FOR_EACH_TARGET (rule, cr, &table->cls, &target, CLS_MAX_VERSION) { ofproto_collect_ofmonitor_refresh_rule(m, rule, seqno, rules); } } @@ -5592,17 +5673,14 @@ 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 ovs_list replies; - enum ofperr error; - struct ofpbuf b; - size_t i; - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - monitors = NULL; - n_monitors = allocated_monitors = 0; + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + + struct ofmonitor **monitors = NULL; + size_t allocated_monitors = 0; + size_t n_monitors = 0; + + enum ofperr error; ovs_mutex_lock(&ofproto_mutex); for (;;) { @@ -5636,11 +5714,13 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) monitors[n_monitors++] = m; } + struct rule_collection rules; rule_collection_init(&rules); - for (i = 0; i < n_monitors; i++) { + for (size_t i = 0; i < n_monitors; i++) { ofproto_collect_ofmonitor_initial_rules(monitors[i], &rules); } + struct ovs_list replies; ofpmp_init(&replies, oh); ofmonitor_compose_refresh_updates(&rules, &replies); ovs_mutex_unlock(&ofproto_mutex); @@ -5653,7 +5733,7 @@ handle_flow_monitor_request(struct ofconn *ofconn, const struct ofp_header *oh) return 0; error: - for (i = 0; i < n_monitors; i++) { + for (size_t i = 0; i < n_monitors; i++) { ofmonitor_destroy(monitors[i]); } free(monitors); @@ -5911,6 +5991,14 @@ handle_meter_mod(struct ofconn *ofconn, const struct ofp_header *oh) break; } + if (!error) { + struct ofputil_requestforward rf; + rf.xid = oh->xid; + rf.reason = OFPRFR_METER_MOD; + rf.meter_mod = &mm; + connmgr_send_requestforward(ofproto->connmgr, ofconn, &rf); + } + exit_free_bands: ofpbuf_uninit(&bands); return error; @@ -6199,51 +6287,94 @@ handle_group_features_stats_request(struct ofconn *ofconn, return 0; } -static enum ofperr -handle_queue_get_config_request(struct ofconn *ofconn, - const struct ofp_header *oh) +static void +put_queue_get_config_reply(struct ofport *port, uint32_t queue, + struct ovs_list *replies) { - struct ofproto *p = ofconn_get_ofproto(ofconn); - struct netdev_queue_dump queue_dump; - struct ofport *ofport; - unsigned int queue_id; - struct ofpbuf *reply; - struct smap details; - ofp_port_t request; - enum ofperr error; + struct ofputil_queue_config qc; - error = ofputil_decode_queue_get_config_request(oh, &request); - if (error) { - return error; - } + /* None of the existing queues have compatible properties, so we hard-code + * omitting min_rate and max_rate. */ + qc.port = port->ofp_port; + qc.queue = queue; + qc.min_rate = UINT16_MAX; + qc.max_rate = UINT16_MAX; + ofputil_append_queue_get_config_reply(&qc, replies); +} - ofport = ofproto_get_port(p, request); - if (!ofport) { - return OFPERR_OFPQOFC_BAD_PORT; - } +static int +handle_queue_get_config_request_for_port(struct ofport *port, uint32_t queue, + struct ovs_list *replies) +{ + struct smap details = SMAP_INITIALIZER(&details); + if (queue != OFPQ_ALL) { + int error = netdev_get_queue(port->netdev, queue, &details); + switch (error) { + case 0: + put_queue_get_config_reply(port, queue, replies); + break; + case EOPNOTSUPP: + case EINVAL: + return OFPERR_OFPQOFC_BAD_QUEUE; + default: + return OFPERR_NXQOFC_QUEUE_ERROR; + } + } else { + struct netdev_queue_dump queue_dump; + uint32_t queue_id; - reply = ofputil_encode_queue_get_config_reply(oh); + NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &queue_dump, + port->netdev) { + put_queue_get_config_reply(port, queue_id, replies); + } + } + smap_destroy(&details); + return 0; +} - smap_init(&details); - NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &queue_dump, ofport->netdev) { - struct ofputil_queue_config queue; +static enum ofperr +handle_queue_get_config_request(struct ofconn *ofconn, + const struct ofp_header *oh) +{ + struct ofproto *ofproto = ofconn_get_ofproto(ofconn); + struct ovs_list replies; + struct ofport *port; + ofp_port_t req_port; + uint32_t req_queue; + enum ofperr error; - /* None of the existing queues have compatible properties, so we - * hard-code omitting min_rate and max_rate. */ - queue.queue_id = queue_id; - queue.min_rate = UINT16_MAX; - queue.max_rate = UINT16_MAX; - ofputil_append_queue_get_config_reply(reply, &queue); - } - smap_destroy(&details); + error = ofputil_decode_queue_get_config_request(oh, &req_port, &req_queue); + if (error) { + return error; + } - ofconn_send_reply(ofconn, reply); + ofputil_start_queue_get_config_reply(oh, &replies); + if (req_port == OFPP_ANY) { + error = OFPERR_OFPQOFC_BAD_QUEUE; + HMAP_FOR_EACH (port, hmap_node, &ofproto->ports) { + if (!handle_queue_get_config_request_for_port(port, req_queue, + &replies)) { + error = 0; + } + } + } else { + port = ofproto_get_port(ofproto, req_port); + error = (port + ? handle_queue_get_config_request_for_port(port, req_queue, + &replies) + : OFPERR_OFPQOFC_BAD_PORT); + } + if (!error) { + ofconn_send_replies(ofconn, &replies); + } else { + ofpbuf_list_delete(&replies); + } - return 0; + return error; } static enum ofperr -init_group(struct ofproto *ofproto, struct ofputil_group_mod *gm, +init_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm, struct ofgroup **ofgroup) { enum ofperr error; @@ -6269,7 +6400,9 @@ init_group(struct ofproto *ofproto, struct ofputil_group_mod *gm, *CONST_CAST(long long int *, &((*ofgroup)->modified)) = now; ovs_refcount_init(&(*ofgroup)->ref_count); - list_move(&(*ofgroup)->buckets, &gm->buckets); + list_init(&(*ofgroup)->buckets); + ofputil_bucket_clone_list(&(*ofgroup)->buckets, &gm->buckets, NULL); + *CONST_CAST(uint32_t *, &(*ofgroup)->n_buckets) = list_size(&(*ofgroup)->buckets); @@ -6289,7 +6422,7 @@ init_group(struct ofproto *ofproto, struct ofputil_group_mod *gm, * 'ofproto''s group table. Returns 0 on success or an OpenFlow error code on * failure. */ static enum ofperr -add_group(struct ofproto *ofproto, struct ofputil_group_mod *gm) +add_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm) { struct ofgroup *ofgroup; enum ofperr error; @@ -6363,22 +6496,24 @@ copy_buckets_for_insert_bucket(const struct ofgroup *ofgroup, ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL); - if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) { - VLOG_WARN_RL(&rl, "Duplicate bucket id"); + if (ofputil_bucket_check_duplicate_id(&new_ofgroup->buckets)) { + VLOG_INFO_RL(&rl, "Duplicate bucket id"); return OFPERR_OFPGMFC_BUCKET_EXISTS; } /* Rearrange list according to command_bucket_id */ if (command_bucket_id == OFPG15_BUCKET_LAST) { - struct ofputil_bucket *new_first; - const struct ofputil_bucket *first; + if (!list_is_empty(&ofgroup->buckets)) { + struct ofputil_bucket *new_first; + const struct ofputil_bucket *first; - first = ofputil_bucket_list_front(&ofgroup->buckets); - new_first = ofputil_bucket_find(&new_ofgroup->buckets, - first->bucket_id); + first = ofputil_bucket_list_front(&ofgroup->buckets); + new_first = ofputil_bucket_find(&new_ofgroup->buckets, + first->bucket_id); - list_splice(new_ofgroup->buckets.next, &new_first->list_node, - &new_ofgroup->buckets); + list_splice(new_ofgroup->buckets.next, &new_first->list_node, + &new_ofgroup->buckets); + } } else if (command_bucket_id <= OFPG15_BUCKET_MAX && last) { struct ofputil_bucket *after; @@ -6435,7 +6570,7 @@ copy_buckets_for_remove_bucket(const struct ofgroup *ofgroup, * ofproto's ofgroup hash map. Thus, the group is never altered while users of * the xlate module hold a pointer to the group. */ static enum ofperr -modify_group(struct ofproto *ofproto, struct ofputil_group_mod *gm) +modify_group(struct ofproto *ofproto, const struct ofputil_group_mod *gm) { struct ofgroup *ofgroup, *new_ofgroup, *retiring; enum ofperr error; @@ -6502,14 +6637,15 @@ delete_group__(struct ofproto *ofproto, struct ofgroup *ofgroup) OVS_RELEASES(ofproto->groups_rwlock) { struct match match; - struct ofputil_flow_mod fm; + struct ofproto_flow_mod ofm; /* Delete all flow entries containing this group in a group action */ match_init_catchall(&match); - flow_mod_init(&fm, &match, 0, NULL, 0, OFPFC_DELETE); - fm.delete_reason = OFPRR_GROUP_DELETE; - fm.out_group = ofgroup->group_id; - handle_flow_mod__(ofproto, &fm, NULL); + flow_mod_init(&ofm.fm, &match, 0, NULL, 0, OFPFC_DELETE); + ofm.fm.delete_reason = OFPRR_GROUP_DELETE; + ofm.fm.out_group = ofgroup->group_id; + ofm.fm.table_id = OFPTT_ALL; + handle_flow_mod__(ofproto, &ofm, NULL); hmap_remove(&ofproto->groups, &ofgroup->hmap_node); /* No-one can find this group any more. */ @@ -6578,28 +6714,44 @@ handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh) switch (gm.command) { case OFPGC11_ADD: - return add_group(ofproto, &gm); + error = add_group(ofproto, &gm); + break; case OFPGC11_MODIFY: - return modify_group(ofproto, &gm); + error = modify_group(ofproto, &gm); + break; case OFPGC11_DELETE: delete_group(ofproto, gm.group_id); - return 0; + error = 0; + break; case OFPGC15_INSERT_BUCKET: - return modify_group(ofproto, &gm); + error = modify_group(ofproto, &gm); + break; case OFPGC15_REMOVE_BUCKET: - return modify_group(ofproto, &gm); + error = modify_group(ofproto, &gm); + break; default: if (gm.command > OFPGC11_DELETE) { - VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d", + VLOG_INFO_RL(&rl, "%s: Invalid group_mod command type %d", ofproto->name, gm.command); } - return OFPERR_OFPGMFC_BAD_COMMAND; + error = OFPERR_OFPGMFC_BAD_COMMAND; + } + + if (!error) { + struct ofputil_requestforward rf; + rf.xid = oh->xid; + rf.reason = OFPRFR_GROUP_MOD; + rf.group_mod = &gm; + connmgr_send_requestforward(ofproto->connmgr, ofconn, &rf); } + ofputil_bucket_list_destroy(&gm.buckets); + + return error; } enum ofputil_table_miss @@ -6613,20 +6765,20 @@ ofproto_table_get_miss_config(const struct ofproto *ofproto, uint8_t table_id) static void table_mod__(struct oftable *oftable, - enum ofputil_table_miss miss, enum ofputil_table_eviction eviction) + const struct ofputil_table_mod *tm) { - if (miss == OFPUTIL_TABLE_MISS_DEFAULT) { + if (tm->miss == OFPUTIL_TABLE_MISS_DEFAULT) { /* This is how an OFPT_TABLE_MOD decodes if it doesn't specify any * table-miss configuration (because the protocol used doesn't have * such a concept), so there's nothing to do. */ } else { - atomic_store_relaxed(&oftable->miss_config, miss); + atomic_store_relaxed(&oftable->miss_config, tm->miss); } unsigned int new_eviction = oftable->eviction; - if (eviction == OFPUTIL_TABLE_EVICTION_ON) { + if (tm->eviction == OFPUTIL_TABLE_EVICTION_ON) { new_eviction |= EVICTION_OPENFLOW; - } else if (eviction == OFPUTIL_TABLE_EVICTION_OFF) { + } else if (tm->eviction == OFPUTIL_TABLE_EVICTION_OFF) { new_eviction &= ~EVICTION_OPENFLOW; } @@ -6637,6 +6789,21 @@ table_mod__(struct oftable *oftable, oftable->n_eviction_fields); ovs_mutex_unlock(&ofproto_mutex); } + + if (tm->vacancy != OFPUTIL_TABLE_VACANCY_DEFAULT) { + ovs_mutex_lock(&ofproto_mutex); + oftable->vacancy_down = tm->table_vacancy.vacancy_down; + oftable->vacancy_up = tm->table_vacancy.vacancy_up; + if (tm->vacancy == OFPUTIL_TABLE_VACANCY_OFF) { + oftable->vacancy_event = 0; + } else if (!oftable->vacancy_event) { + uint8_t vacancy = oftable_vacancy(oftable); + oftable->vacancy_event = (vacancy < oftable->vacancy_up + ? OFPTR_VACANCY_UP + : OFPTR_VACANCY_DOWN); + } + ovs_mutex_unlock(&ofproto_mutex); + } } static enum ofperr @@ -6660,7 +6827,7 @@ table_mod(struct ofproto *ofproto, const struct ofputil_table_mod *tm) struct oftable *oftable; OFPROTO_FOR_EACH_TABLE (oftable, ofproto) { if (!(oftable->flags & (OFTABLE_HIDDEN | OFTABLE_READONLY))) { - table_mod__(oftable, tm->miss, tm->eviction); + table_mod__(oftable, tm); } } } else { @@ -6668,7 +6835,7 @@ table_mod(struct ofproto *ofproto, const struct ofputil_table_mod *tm) if (oftable->flags & OFTABLE_READONLY) { return OFPERR_OFPTMFC_EPERM; } - table_mod__(oftable, tm->miss, tm->eviction); + table_mod__(oftable, tm); } return 0; @@ -6695,49 +6862,45 @@ handle_table_mod(struct ofconn *ofconn, const struct ofp_header *oh) } static enum ofperr -do_bundle_flow_mod_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct ofp_bundle_entry *be) +ofproto_flow_mod_start(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { - switch (fm->command) { + switch (ofm->fm.command) { case OFPFC_ADD: - return add_flow_start(ofproto, fm, &be->old_rules.stub[0], - &be->new_rules.stub[0]); + return add_flow_start(ofproto, ofm); + /* , &be->old_rules.stub[0], + &be->new_rules.stub[0]); */ case OFPFC_MODIFY: - return modify_flows_start_loose(ofproto, fm, &be->old_rules, - &be->new_rules); + return modify_flows_start_loose(ofproto, ofm); case OFPFC_MODIFY_STRICT: - return modify_flow_start_strict(ofproto, fm, &be->old_rules, - &be->new_rules); + return modify_flow_start_strict(ofproto, ofm); case OFPFC_DELETE: - return delete_flows_start_loose(ofproto, fm, &be->old_rules); + return delete_flows_start_loose(ofproto, ofm); case OFPFC_DELETE_STRICT: - return delete_flow_start_strict(ofproto, fm, &be->old_rules); + return delete_flow_start_strict(ofproto, ofm); } return OFPERR_OFPFMFC_BAD_COMMAND; } static void -do_bundle_flow_mod_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - struct ofp_bundle_entry *be) +ofproto_flow_mod_revert(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) OVS_REQUIRES(ofproto_mutex) { - switch (fm->command) { + switch (ofm->fm.command) { case OFPFC_ADD: - add_flow_revert(ofproto, fm, be->old_rules.stub[0], - be->new_rules.stub[0]); + add_flow_revert(ofproto, ofm); break; case OFPFC_MODIFY: case OFPFC_MODIFY_STRICT: - modify_flows_revert(ofproto, fm, &be->old_rules, &be->new_rules); + modify_flows_revert(ofproto, ofm); break; case OFPFC_DELETE: case OFPFC_DELETE_STRICT: - delete_flows_revert(ofproto, &be->old_rules); + delete_flows_revert(ofproto, ofm); break; default: @@ -6746,25 +6909,24 @@ do_bundle_flow_mod_revert(struct ofproto *ofproto, struct ofputil_flow_mod *fm, } static void -do_bundle_flow_mod_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm, - const struct flow_mod_requester *req, - struct ofp_bundle_entry *be) +ofproto_flow_mod_finish(struct ofproto *ofproto, + struct ofproto_flow_mod *ofm, + const struct flow_mod_requester *req) OVS_REQUIRES(ofproto_mutex) { - switch (fm->command) { + switch (ofm->fm.command) { case OFPFC_ADD: - add_flow_finish(ofproto, fm, req, be->old_rules.stub[0], - be->new_rules.stub[0]); + add_flow_finish(ofproto, ofm, req); break; case OFPFC_MODIFY: case OFPFC_MODIFY_STRICT: - modify_flows_finish(ofproto, fm, req, &be->old_rules, &be->new_rules); + modify_flows_finish(ofproto, ofm, req); break; case OFPFC_DELETE: case OFPFC_DELETE_STRICT: - delete_flows_finish(ofproto, fm, req, &be->old_rules); + delete_flows_finish(ofproto, ofm, req); break; default: @@ -6793,7 +6955,7 @@ static enum ofperr do_bundle_commit(struct ofconn *ofconn, uint32_t id, uint16_t flags) { struct ofproto *ofproto = ofconn_get_ofproto(ofconn); - cls_version_t visible_version = ofproto->tables_version; + cls_version_t version = ofproto->tables_version + 1; struct ofp_bundle *bundle; struct ofp_bundle_entry *be; enum ofperr error; @@ -6819,26 +6981,25 @@ do_bundle_commit(struct ofconn *ofconn, uint32_t id, uint16_t flags) error = OFPERR_OFPBFC_MSG_FAILED; } else { prev_is_port_mod = true; - error = port_mod_start(ofconn, &be->pm, &be->port); + error = port_mod_start(ofconn, &be->opm.pm, &be->opm.port); } } else if (be->type == OFPTYPE_FLOW_MOD) { /* Flow mods between port mods are applied as a single * version, but the versions are published only after * we know the commit is successful. */ if (prev_is_port_mod) { - ++ofproto->tables_version; + ++version; } prev_is_port_mod = false; - error = do_bundle_flow_mod_start(ofproto, &be->fm, be); + /* Store the version in which the changes should take + * effect. */ + be->ofm.version = version; + error = ofproto_flow_mod_start(ofproto, &be->ofm); } else { OVS_NOT_REACHED(); } if (error) { break; - } else { - /* Store the version in which the changes should take - * effect. */ - be->version = ofproto->tables_version + 1; } } @@ -6852,25 +7013,26 @@ do_bundle_commit(struct ofconn *ofconn, uint32_t id, uint16_t flags) /* 2. Revert. Undo all the changes made above. */ LIST_FOR_EACH_REVERSE_CONTINUE(be, node, &bundle->msg_list) { if (be->type == OFPTYPE_FLOW_MOD) { - do_bundle_flow_mod_revert(ofproto, &be->fm, be); + ofproto_flow_mod_revert(ofproto, &be->ofm); } /* Nothing needs to be reverted for a port mod. */ } } else { /* 4. Finish. */ LIST_FOR_EACH (be, node, &bundle->msg_list) { - /* Bump the lookup version to the one of the current message. - * This makes all the changes in the bundle at this version - * visible to lookups at once. */ - if (visible_version < be->version) { - visible_version = be->version; - ofproto->ofproto_class->set_tables_version( - ofproto, visible_version); - } if (be->type == OFPTYPE_FLOW_MOD) { struct flow_mod_requester req = { ofconn, be->ofp_msg }; - do_bundle_flow_mod_finish(ofproto, &be->fm, &req, be); + /* Bump the lookup version to the one of the current + * message. This makes all the changes in the bundle at + * this version visible to lookups at once. */ + if (ofproto->tables_version < be->ofm.version) { + ofproto->tables_version = be->ofm.version; + ofproto->ofproto_class->set_tables_version( + ofproto, ofproto->tables_version); + } + + ofproto_flow_mod_finish(ofproto, &be->ofm, &req); } else if (be->type == OFPTYPE_PORT_MOD) { /* Perform the actual port mod. This is not atomic, i.e., * the effects will be immediately seen by upcall @@ -6878,14 +7040,11 @@ do_bundle_commit(struct ofconn *ofconn, uint32_t id, uint16_t flags) * be noted that port configuration changes can originate * also from OVSDB changes asynchronously to all upcall * processing. */ - port_mod_finish(ofconn, &be->pm, be->port); + port_mod_finish(ofconn, &be->opm.pm, be->opm.port); } } } - /* Reset the tables_version. */ - ofproto->tables_version = visible_version; - ofmonitor_flush(ofproto->connmgr); ovs_mutex_unlock(&ofproto_mutex); @@ -6924,7 +7083,7 @@ handle_bundle_control(struct ofconn *ofconn, const struct ofp_header *oh) break; case OFPBCT_CLOSE_REQUEST: error = ofp_bundle_close(ofconn, bctrl.bundle_id, bctrl.flags); - reply.type = OFPBCT_CLOSE_REPLY;; + reply.type = OFPBCT_CLOSE_REPLY; break; case OFPBCT_COMMIT_REQUEST: error = do_bundle_commit(ofconn, bctrl.bundle_id, bctrl.flags); @@ -6972,23 +7131,23 @@ handle_bundle_add(struct ofconn *ofconn, const struct ofp_header *oh) bmsg = ofp_bundle_entry_alloc(type, badd.msg); if (type == OFPTYPE_PORT_MOD) { - error = ofputil_decode_port_mod(badd.msg, &bmsg->pm, false); + error = ofputil_decode_port_mod(badd.msg, &bmsg->opm.pm, false); } else if (type == OFPTYPE_FLOW_MOD) { struct ofpbuf ofpacts; uint64_t ofpacts_stub[1024 / 8]; ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub); - error = ofputil_decode_flow_mod(&bmsg->fm, badd.msg, + error = ofputil_decode_flow_mod(&bmsg->ofm.fm, badd.msg, ofconn_get_protocol(ofconn), &ofpacts, u16_to_ofp(ofproto->max_ports), ofproto->n_tables); /* Move actions to heap. */ - bmsg->fm.ofpacts = ofpbuf_steal_data(&ofpacts); + bmsg->ofm.fm.ofpacts = ofpbuf_steal_data(&ofpacts); - if (!error && bmsg->fm.ofpacts_len) { - error = ofproto_check_ofpacts(ofproto, bmsg->fm.ofpacts, - bmsg->fm.ofpacts_len); + if (!error && bmsg->ofm.fm.ofpacts_len) { + error = ofproto_check_ofpacts(ofproto, bmsg->ofm.fm.ofpacts, + bmsg->ofm.fm.ofpacts_len); } } else { OVS_NOT_REACHED(); @@ -7007,9 +7166,9 @@ handle_bundle_add(struct ofconn *ofconn, const struct ofp_header *oh) } static enum ofperr -handle_geneve_table_mod(struct ofconn *ofconn, const struct ofp_header *oh) +handle_tlv_table_mod(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofputil_geneve_table_mod gtm; + struct ofputil_tlv_table_mod ttm; enum ofperr error; error = reject_slave_controller(ofconn); @@ -7017,26 +7176,26 @@ handle_geneve_table_mod(struct ofconn *ofconn, const struct ofp_header *oh) return error; } - error = ofputil_decode_geneve_table_mod(oh, >m); + error = ofputil_decode_tlv_table_mod(oh, &ttm); if (error) { return error; } - error = tun_metadata_table_mod(>m); + error = tun_metadata_table_mod(&ttm); - ofputil_uninit_geneve_table(>m.mappings); + ofputil_uninit_tlv_table(&ttm.mappings); return error; } static enum ofperr -handle_geneve_table_request(struct ofconn *ofconn, const struct ofp_header *oh) +handle_tlv_table_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofputil_geneve_table_reply gtr; + struct ofputil_tlv_table_reply ttr; struct ofpbuf *b; - tun_metadata_table_request(>r); - b = ofputil_encode_geneve_table_reply(oh, >r); - ofputil_uninit_geneve_table(>r.mappings); + tun_metadata_table_request(&ttr); + b = ofputil_encode_tlv_table_reply(oh, &ttr); + ofputil_uninit_tlv_table(&ttr.mappings); ofconn_send_reply(ofconn, b); return 0; @@ -7130,6 +7289,9 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) case OFPTYPE_GET_ASYNC_REQUEST: return handle_nxt_get_async_request(ofconn, oh); + case OFPTYPE_NXT_RESUME: + return handle_nxt_resume(ofconn, oh); + /* Statistics requests. */ case OFPTYPE_DESC_STATS_REQUEST: return handle_desc_stats_request(ofconn, oh); @@ -7186,11 +7348,11 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) case OFPTYPE_BUNDLE_ADD_MESSAGE: return handle_bundle_add(ofconn, oh); - case OFPTYPE_NXT_GENEVE_TABLE_MOD: - return handle_geneve_table_mod(ofconn, oh); + case OFPTYPE_NXT_TLV_TABLE_MOD: + return handle_tlv_table_mod(ofconn, oh); - case OFPTYPE_NXT_GENEVE_TABLE_REQUEST: - return handle_geneve_table_request(ofconn, oh); + case OFPTYPE_NXT_TLV_TABLE_REQUEST: + return handle_tlv_table_request(ofconn, oh); case OFPTYPE_HELLO: case OFPTYPE_ERROR: @@ -7222,7 +7384,9 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) case OFPTYPE_TABLE_FEATURES_STATS_REPLY: case OFPTYPE_TABLE_DESC_REPLY: case OFPTYPE_ROLE_STATUS: - case OFPTYPE_NXT_GENEVE_TABLE_REPLY: + case OFPTYPE_REQUESTFORWARD: + case OFPTYPE_TABLE_STATUS: + case OFPTYPE_NXT_TLV_TABLE_REPLY: default: if (ofpmsg_is_stat_request(oh)) { return OFPERR_OFPBRC_BAD_STAT; @@ -7288,10 +7452,10 @@ pick_datapath_id(const struct ofproto *ofproto) port = ofproto_get_port(ofproto, OFPP_LOCAL); if (port) { - uint8_t ea[ETH_ADDR_LEN]; + struct eth_addr ea; int error; - error = netdev_get_etheraddr(port->netdev, ea); + error = netdev_get_etheraddr(port->netdev, &ea); if (!error) { return eth_addr_to_uint64(ea); } @@ -7305,8 +7469,8 @@ pick_datapath_id(const struct ofproto *ofproto) static uint64_t pick_fallback_dpid(void) { - uint8_t ea[ETH_ADDR_LEN]; - eth_addr_nicira_random(ea); + struct eth_addr ea; + eth_addr_nicira_random(&ea); return eth_addr_to_uint64(ea); } @@ -7428,7 +7592,7 @@ eviction_group_hash_rule(struct rule *rule) uint32_t hash; hash = table->eviction_group_id_basis; - miniflow_expand(&rule->cr.match.flow, &flow); + miniflow_expand(rule->cr.match.flow, &flow); for (sf = table->eviction_fields; sf < &table->eviction_fields[table->n_eviction_fields]; sf++) @@ -7776,7 +7940,7 @@ ofproto_get_vlan_usage(struct ofproto *ofproto, unsigned long int *vlan_bitmap) match_init_catchall(&match); match_set_vlan_vid_masked(&match, htons(VLAN_CFI), htons(VLAN_CFI)); - cls_rule_init(&target, &match, 0, CLS_MAX_VERSION); + cls_rule_init(&target, &match, 0); free(ofproto->vlan_bitmap); ofproto->vlan_bitmap = bitmap_allocate(4096); @@ -7785,9 +7949,10 @@ ofproto_get_vlan_usage(struct ofproto *ofproto, unsigned long int *vlan_bitmap) OFPROTO_FOR_EACH_TABLE (oftable, ofproto) { struct rule *rule; - CLS_FOR_EACH_TARGET (rule, cr, &oftable->cls, &target) { - if (minimask_get_vid_mask(&rule->cr.match.mask) == VLAN_VID_MASK) { - uint16_t vid = miniflow_get_vid(&rule->cr.match.flow); + CLS_FOR_EACH_TARGET (rule, cr, &oftable->cls, &target, + CLS_MAX_VERSION) { + if (minimask_get_vid_mask(rule->cr.match.mask) == VLAN_VID_MASK) { + uint16_t vid = miniflow_get_vid(rule->cr.match.flow); bitmap_set1(vlan_bitmap, vid); bitmap_set1(ofproto->vlan_bitmap, vid);