X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=e4057c25c52c640ebd6be655d65b094e3a00790a;hb=c77d9d13998d76c8cb8b51adcce564093330edc7;hp=9d6ebfebe86850e419d10a10105e69288193d2c1;hpb=bcf8411196260599d9b2a405627c1a867f43eb03;p=openvswitch diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 9d6ebfeb..e4057c25 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -35,8 +35,10 @@ #include "hmap.h" #include "in-band.h" #include "mac-learning.h" +#include "multipath.h" #include "netdev.h" #include "netflow.h" +#include "netlink.h" #include "nx-match.h" #include "odp-util.h" #include "ofp-print.h" @@ -63,8 +65,35 @@ VLOG_DEFINE_THIS_MODULE(ofproto); +COVERAGE_DEFINE(facet_changed_rule); +COVERAGE_DEFINE(facet_revalidate); +COVERAGE_DEFINE(odp_overflow); +COVERAGE_DEFINE(ofproto_agg_request); +COVERAGE_DEFINE(ofproto_costly_flags); +COVERAGE_DEFINE(ofproto_ctlr_action); +COVERAGE_DEFINE(ofproto_del_rule); +COVERAGE_DEFINE(ofproto_error); +COVERAGE_DEFINE(ofproto_expiration); +COVERAGE_DEFINE(ofproto_expired); +COVERAGE_DEFINE(ofproto_flows_req); +COVERAGE_DEFINE(ofproto_flush); +COVERAGE_DEFINE(ofproto_invalidated); +COVERAGE_DEFINE(ofproto_no_packet_in); +COVERAGE_DEFINE(ofproto_ofconn_stuck); +COVERAGE_DEFINE(ofproto_ofp2odp); +COVERAGE_DEFINE(ofproto_packet_in); +COVERAGE_DEFINE(ofproto_packet_out); +COVERAGE_DEFINE(ofproto_queue_req); +COVERAGE_DEFINE(ofproto_recv_openflow); +COVERAGE_DEFINE(ofproto_reinit_ports); +COVERAGE_DEFINE(ofproto_unexpected_rule); +COVERAGE_DEFINE(ofproto_uninstallable); +COVERAGE_DEFINE(ofproto_update_port); + #include "sflow_api.h" +struct rule; + struct ofport { struct hmap_node hmap_node; /* In struct ofproto's "ports" hmap. */ struct netdev *netdev; @@ -75,11 +104,48 @@ struct ofport { static void ofport_free(struct ofport *); static void hton_ofp_phy_port(struct ofp_phy_port *); -static int xlate_actions(const union ofp_action *in, size_t n_in, - const struct flow *, struct ofproto *, - const struct ofpbuf *packet, - struct odp_actions *out, tag_type *tags, - bool *may_set_up_flow, uint16_t *nf_output_iface); +struct action_xlate_ctx { +/* action_xlate_ctx_init() initializes these members. */ + + /* The ofproto. */ + struct ofproto *ofproto; + + /* Flow to which the OpenFlow actions apply. xlate_actions() will modify + * this flow when actions change header fields. */ + struct flow flow; + + /* The packet corresponding to 'flow', or a null pointer if we are + * revalidating without a packet to refer to. */ + const struct ofpbuf *packet; + + /* If nonnull, called just before executing a resubmit action. + * + * This is normally null so the client has to set it manually after + * calling action_xlate_ctx_init(). */ + void (*resubmit_hook)(struct action_xlate_ctx *, const struct rule *); + +/* xlate_actions() initializes and uses these members. The client might want + * to look at them after it returns. */ + + struct ofpbuf *odp_actions; /* Datapath actions. */ + tag_type tags; /* Tags associated with OFPP_NORMAL actions. */ + bool may_set_up_flow; /* True ordinarily; false if the actions must + * be reassessed for every packet. */ + uint16_t nf_output_iface; /* Output interface index for NetFlow. */ + +/* xlate_actions() initializes and uses these members, but the client has no + * reason to look at them. */ + + int recurse; /* Recursion level, via xlate_table_action. */ + int last_pop_priority; /* Offset in 'odp_actions' just past most + * recently added ODPAT_SET_PRIORITY. */ +}; + +static void action_xlate_ctx_init(struct action_xlate_ctx *, + struct ofproto *, const struct flow *, + const struct ofpbuf *); +static struct ofpbuf *xlate_actions(struct action_xlate_ctx *, + const union ofp_action *in, size_t n_in); /* An OpenFlow flow. */ struct rule { @@ -124,8 +190,7 @@ static void rule_destroy(struct ofproto *, struct rule *); static void rule_free(struct rule *); static struct rule *rule_lookup(struct ofproto *, const struct flow *); -static void rule_insert(struct ofproto *, struct rule *, - struct ofpbuf *packet, uint16_t in_port); +static void rule_insert(struct ofproto *, struct rule *); static void rule_remove(struct ofproto *, struct rule *); static void rule_send_removed(struct ofproto *, struct rule *, uint8_t reason); @@ -161,8 +226,8 @@ struct facet { bool installed; /* Installed in datapath? */ bool may_install; /* True ordinarily; false if actions must * be reassessed for every packet. */ - int n_actions; /* Number of elements in actions[]. */ - union odp_action *actions; /* Datapath actions. */ + size_t actions_len; /* Number of bytes in actions[]. */ + struct nlattr *actions; /* Datapath actions. */ tag_type tags; /* Tags (set only by hooks). */ struct netflow_flow nf_flow; /* Per-flow NetFlow tracking data. */ }; @@ -178,10 +243,10 @@ static bool facet_revalidate(struct ofproto *, struct facet *); static void facet_install(struct ofproto *, struct facet *, bool zero_stats); static void facet_uninstall(struct ofproto *, struct facet *); -static void facet_post_uninstall(struct ofproto *, struct facet *); +static void facet_flush_stats(struct ofproto *, struct facet *); -static bool facet_make_actions(struct ofproto *, struct facet *, - const struct ofpbuf *packet); +static void facet_make_actions(struct ofproto *, struct facet *, + const struct ofpbuf *packet); static void facet_update_stats(struct ofproto *, struct facet *, const struct odp_flow_stats *); @@ -231,7 +296,7 @@ struct ofconn { struct list node; /* In struct ofproto's "all_conns" list. */ struct rconn *rconn; /* OpenFlow connection. */ enum ofconn_type type; /* Type. */ - int flow_format; /* One of NXFF_*. */ + enum nx_flow_format flow_format; /* Currently selected flow format. */ /* OFPT_PACKET_IN related data. */ struct rconn_packet_counter *packet_in_counter; /* # queued on 'rconn'. */ @@ -306,6 +371,7 @@ struct ofproto { long long int next_in_band_update; struct sockaddr_in *extra_in_band_remotes; size_t n_extra_remotes; + int in_band_queue; /* Flow table. */ struct classifier cls; @@ -334,6 +400,9 @@ struct ofproto { struct mac_learning *ml; }; +/* Map from dpif name to struct ofproto, for use by unixctl commands. */ +static struct shash all_ofprotos = SHASH_INITIALIZER(&all_ofprotos); + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); static const struct ofhooks default_ofhooks; @@ -352,6 +421,8 @@ static void update_port(struct ofproto *, const char *devname); static int init_ports(struct ofproto *); static void reinit_ports(struct ofproto *); +static void ofproto_unixctl_init(void); + int ofproto_create(const char *datapath, const char *datapath_type, const struct ofhooks *ofhooks, void *aux, @@ -364,6 +435,8 @@ ofproto_create(const char *datapath, const char *datapath_type, *ofprotop = NULL; + ofproto_unixctl_init(); + /* Connect to datapath and start listening for messages. */ error = dpif_open(datapath, datapath_type, &dpif); if (error) { @@ -406,11 +479,14 @@ ofproto_create(const char *datapath, const char *datapath_type, /* Initialize submodules. */ p->switch_status = switch_status_create(p); - p->in_band = NULL; p->fail_open = NULL; p->netflow = NULL; p->sflow = NULL; + /* Initialize in-band control. */ + p->in_band = NULL; + p->in_band_queue = -1; + /* Initialize flow table. */ classifier_init(&p->cls); p->next_expiration = time_msec() + 1000; @@ -442,6 +518,8 @@ ofproto_create(const char *datapath, const char *datapath_type, p->datapath_id = pick_datapath_id(p); VLOG_INFO("using datapath ID %016"PRIx64, p->datapath_id); + shash_add_once(&all_ofprotos, dpif_name(p->dpif), p); + *ofprotop = p; return 0; } @@ -601,6 +679,7 @@ update_in_band_remotes(struct ofproto *ofproto) if (ofproto->in_band) { in_band_set_remotes(ofproto->in_band, addrs, n_addrs); } + in_band_set_queue(ofproto->in_band, ofproto->in_band_queue); ofproto->next_in_band_update = time_msec() + 1000; } else { in_band_destroy(ofproto->in_band); @@ -777,6 +856,18 @@ ofproto_set_extra_in_band_remotes(struct ofproto *ofproto, update_in_band_remotes(ofproto); } +/* Sets the OpenFlow queue used by flows set up by in-band control on + * 'ofproto' to 'queue_id'. If 'queue_id' is negative, then in-band control + * flows will use the default queue. */ +void +ofproto_set_in_band_queue(struct ofproto *ofproto, int queue_id) +{ + if (queue_id != ofproto->in_band_queue) { + ofproto->in_band_queue = queue_id; + update_in_band_remotes(ofproto); + } +} + void ofproto_set_desc(struct ofproto *p, const char *mfr_desc, const char *hw_desc, @@ -950,6 +1041,8 @@ ofproto_destroy(struct ofproto *p) return; } + shash_find_and_delete(&all_ofprotos, dpif_name(p->dpif)); + /* Destroy fail-open and in-band early, since they touch the classifier. */ fail_open_destroy(p->fail_open); p->fail_open = NULL; @@ -1275,7 +1368,7 @@ int ofproto_port_del(struct ofproto *ofproto, uint16_t odp_port) { struct ofport *ofport = get_port(ofproto, odp_port); - const char *name = ofport ? (char *) ofport->opp.name : ""; + const char *name = ofport ? ofport->opp.name : ""; int error; error = dpif_port_del(ofproto->dpif, odp_port); @@ -1308,18 +1401,18 @@ ofproto_send_packet(struct ofproto *p, const struct flow *flow, const union ofp_action *actions, size_t n_actions, const struct ofpbuf *packet) { - struct odp_actions odp_actions; - int error; + struct action_xlate_ctx ctx; + struct ofpbuf *odp_actions; - error = xlate_actions(actions, n_actions, flow, p, packet, &odp_actions, - NULL, NULL, NULL); - if (error) { - return error; - } + action_xlate_ctx_init(&ctx, p, flow, packet); + odp_actions = xlate_actions(&ctx, actions, n_actions); /* XXX Should we translate the dpif_execute() errno value into an OpenFlow * error code? */ - dpif_execute(p->dpif, odp_actions.actions, odp_actions.n_actions, packet); + dpif_execute(p->dpif, odp_actions->data, odp_actions->size, packet); + + ofpbuf_delete(odp_actions); + return 0; } @@ -1338,7 +1431,7 @@ ofproto_add_flow(struct ofproto *p, const struct cls_rule *cls_rule, { struct rule *rule; rule = rule_create(cls_rule, actions, n_actions, 0, 0, 0, false); - rule_insert(p, rule, NULL, 0); + rule_insert(p, rule); } void @@ -1353,19 +1446,12 @@ ofproto_delete_flow(struct ofproto *ofproto, const struct cls_rule *target) } } -static void -destroy_rule(struct cls_rule *rule_, void *ofproto_) -{ - struct rule *rule = rule_from_cls_rule(rule_); - struct ofproto *ofproto = ofproto_; - - rule_remove(ofproto, rule); -} - void ofproto_flush_flows(struct ofproto *ofproto) { struct facet *facet, *next_facet; + struct rule *rule, *next_rule; + struct cls_cursor cursor; COVERAGE_INC(ofproto_flush); @@ -1377,7 +1463,12 @@ ofproto_flush_flows(struct ofproto *ofproto) facet->installed = false; facet_remove(ofproto, facet); } - classifier_for_each(&ofproto->cls, CLS_INC_ALL, destroy_rule, ofproto); + + cls_cursor_init(&cursor, &ofproto->cls, NULL); + CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cr, &cursor) { + rule_remove(ofproto, rule); + } + dpif_flow_flush(ofproto->dpif); if (ofproto->in_band) { in_band_flushed(ofproto->in_band); @@ -1390,7 +1481,8 @@ ofproto_flush_flows(struct ofproto *ofproto) static void reinit_ports(struct ofproto *p) { - struct svec devnames; + struct shash_node *node; + struct shash devnames; struct ofport *ofport; struct odp_port *odp_ports; size_t n_odp_ports; @@ -1398,21 +1490,20 @@ reinit_ports(struct ofproto *p) COVERAGE_INC(ofproto_reinit_ports); - svec_init(&devnames); + shash_init(&devnames); HMAP_FOR_EACH (ofport, hmap_node, &p->ports) { - svec_add (&devnames, (char *) ofport->opp.name); + shash_add_once (&devnames, ofport->opp.name, NULL); } dpif_port_list(p->dpif, &odp_ports, &n_odp_ports); for (i = 0; i < n_odp_ports; i++) { - svec_add (&devnames, odp_ports[i].devname); + shash_add_once (&devnames, odp_ports[i].devname, NULL); } free(odp_ports); - svec_sort_unique(&devnames); - for (i = 0; i < devnames.n; i++) { - update_port(p, devnames.names[i]); + SHASH_FOR_EACH (node, &devnames) { + update_port(p, node->name); } - svec_destroy(&devnames); + shash_destroy(&devnames); } static struct ofport * @@ -1426,6 +1517,7 @@ make_ofport(const struct odp_port *odp_port) memset(&netdev_options, 0, sizeof netdev_options); netdev_options.name = odp_port->devname; + netdev_options.type = odp_port->type; netdev_options.ethertype = NETDEV_ETH_TYPE_NONE; error = netdev_open(&netdev_options, &netdev); @@ -1482,7 +1574,7 @@ ofport_equal(const struct ofport *a_, const struct ofport *b_) BUILD_ASSERT_DECL(sizeof *a == 48); /* Detect ofp_phy_port changes. */ return (a->port_no == b->port_no && !memcmp(a->hw_addr, b->hw_addr, sizeof a->hw_addr) - && !strcmp((char *) a->name, (char *) b->name) + && !strcmp(a->name, b->name) && a->state == b->state && a->config == b->config && a->curr == b->curr @@ -1501,7 +1593,10 @@ send_port_status(struct ofproto *p, const struct ofport *ofport, struct ofp_port_status *ops; struct ofpbuf *b; - if (!ofconn_receives_async_msgs(ofconn)) { + /* Primary controllers, even slaves, should always get port status + updates. Otherwise obey ofconn_receives_async_msgs(). */ + if (ofconn->type != OFCONN_PRIMARY + && !ofconn_receives_async_msgs(ofconn)) { continue; } @@ -1516,7 +1611,7 @@ send_port_status(struct ofproto *p, const struct ofport *ofport, static void ofport_install(struct ofproto *p, struct ofport *ofport) { - const char *netdev_name = (const char *) ofport->opp.name; + const char *netdev_name = ofport->opp.name; netdev_monitor_add(p->netdev_monitor, ofport->netdev); hmap_insert(&p->ports, &ofport->hmap_node, hash_int(ofport->odp_port, 0)); @@ -1532,7 +1627,7 @@ ofport_remove(struct ofproto *p, struct ofport *ofport) netdev_monitor_remove(p->netdev_monitor, ofport->netdev); hmap_remove(&p->ports, &ofport->hmap_node); shash_delete(&p->port_by_name, - shash_find(&p->port_by_name, (char *) ofport->opp.name)); + shash_find(&p->port_by_name, ofport->opp.name)); if (p->sflow) { ofproto_sflow_del_port(p->sflow, ofport->odp_port); } @@ -1604,9 +1699,9 @@ update_port(struct ofproto *p, const char *devname) return; } else if (old_ofport && new_ofport) { /* Most of the 'config' bits are OpenFlow soft state, but - * OFPPC_PORT_DOWN is maintained the kernel. So transfer the OpenFlow - * bits from old_ofport. (make_ofport() only sets OFPPC_PORT_DOWN and - * leaves the other bits 0.) */ + * OFPPC_PORT_DOWN is maintained by the kernel. So transfer the + * OpenFlow bits from old_ofport. (make_ofport() only sets + * OFPPC_PORT_DOWN and leaves the other bits 0.) */ new_ofport->opp.config |= old_ofport->opp.config & ~OFPPC_PORT_DOWN; if (ofport_equal(old_ofport, new_ofport)) { @@ -1956,10 +2051,11 @@ rule_has_out_port(const struct rule *rule, ovs_be16 out_port) * Takes ownership of 'packet'. */ static bool execute_odp_actions(struct ofproto *ofproto, uint16_t in_port, - const union odp_action *actions, size_t n_actions, + const struct nlattr *odp_actions, size_t actions_len, struct ofpbuf *packet) { - if (n_actions == 1 && actions[0].type == ODPAT_CONTROLLER) { + if (actions_len == NLA_ALIGN(NLA_HDRLEN + sizeof(uint64_t)) + && odp_actions->nla_type == ODPAT_CONTROLLER) { /* As an optimization, avoid a round-trip from userspace to kernel to * userspace. This also avoids possibly filling up kernel packet * buffers along the way. */ @@ -1969,8 +2065,7 @@ execute_odp_actions(struct ofproto *ofproto, uint16_t in_port, msg->type = _ODPL_ACTION_NR; msg->length = sizeof(struct odp_msg) + packet->size; msg->port = in_port; - msg->reserved = 0; - msg->arg = actions[0].controller.arg; + msg->arg = nl_attr_get_u64(odp_actions); send_packet_in(ofproto, packet); @@ -1978,7 +2073,7 @@ execute_odp_actions(struct ofproto *ofproto, uint16_t in_port, } else { int error; - error = dpif_execute(ofproto->dpif, actions, n_actions, packet); + error = dpif_execute(ofproto->dpif, odp_actions, actions_len, packet); ofpbuf_delete(packet); return !error; } @@ -2006,7 +2101,7 @@ facet_execute(struct ofproto *ofproto, struct facet *facet, flow_extract_stats(&facet->flow, packet, &stats); if (execute_odp_actions(ofproto, facet->flow.in_port, - facet->actions, facet->n_actions, packet)) { + facet->actions, facet->actions_len, packet)) { facet_update_stats(ofproto, facet, &stats); facet->used = time_msec(); netflow_flow_update_time(ofproto->netflow, @@ -2026,8 +2121,9 @@ static void rule_execute(struct ofproto *ofproto, struct rule *rule, uint16_t in_port, struct ofpbuf *packet) { + struct action_xlate_ctx ctx; + struct ofpbuf *odp_actions; struct facet *facet; - struct odp_actions a; struct flow flow; size_t size; @@ -2053,29 +2149,21 @@ rule_execute(struct ofproto *ofproto, struct rule *rule, uint16_t in_port, /* We can't account anything to a facet. If we were to try, then that * facet would have a non-matching rule, busting our invariants. */ - if (xlate_actions(rule->actions, rule->n_actions, &flow, ofproto, - packet, &a, NULL, 0, NULL)) { - ofpbuf_delete(packet); - return; - } + action_xlate_ctx_init(&ctx, ofproto, &flow, packet); + odp_actions = xlate_actions(&ctx, rule->actions, rule->n_actions); size = packet->size; - if (execute_odp_actions(ofproto, in_port, - a.actions, a.n_actions, packet)) { + if (execute_odp_actions(ofproto, in_port, odp_actions->data, + odp_actions->size, packet)) { rule->used = time_msec(); rule->packet_count++; rule->byte_count += size; } + ofpbuf_delete(odp_actions); } -/* Inserts 'rule' into 'p''s flow table. - * - * If 'packet' is nonnull, takes ownership of 'packet', executes 'rule''s - * actions on it and credits the statistics for sending the packet to 'rule'. - * 'packet' must have at least sizeof(struct ofp_packet_in) bytes of - * headroom. */ +/* Inserts 'rule' into 'p''s flow table. */ static void -rule_insert(struct ofproto *p, struct rule *rule, struct ofpbuf *packet, - uint16_t in_port) +rule_insert(struct ofproto *p, struct rule *rule) { struct rule *displaced_rule; @@ -2084,10 +2172,6 @@ rule_insert(struct ofproto *p, struct rule *rule, struct ofpbuf *packet, rule_destroy(p, displaced_rule); } p->need_revalidate = true; - - if (packet) { - rule_execute(p, rule, in_port, packet); - } } /* Creates and returns a new facet within 'ofproto' owned by 'rule', given a @@ -2150,35 +2234,35 @@ static void facet_remove(struct ofproto *ofproto, struct facet *facet) { facet_uninstall(ofproto, facet); + facet_flush_stats(ofproto, facet); hmap_remove(&ofproto->facets, &facet->hmap_node); list_remove(&facet->list_node); facet_free(facet); } -/* Composes the ODP actions for 'facet' based on its rule's actions. - * Returns true if the actions changed, false otherwise. */ -static bool +/* Composes the ODP actions for 'facet' based on its rule's actions. */ +static void facet_make_actions(struct ofproto *p, struct facet *facet, const struct ofpbuf *packet) { const struct rule *rule = facet->rule; - struct odp_actions a; - size_t actions_len; + struct ofpbuf *odp_actions; + struct action_xlate_ctx ctx; - xlate_actions(rule->actions, rule->n_actions, &facet->flow, p, - packet, &a, &facet->tags, &facet->may_install, - &facet->nf_flow.output_iface); + action_xlate_ctx_init(&ctx, p, &facet->flow, packet); + odp_actions = xlate_actions(&ctx, rule->actions, rule->n_actions); + facet->tags = ctx.tags; + facet->may_install = ctx.may_set_up_flow; + facet->nf_flow.output_iface = ctx.nf_output_iface; - actions_len = a.n_actions * sizeof *a.actions; - if (facet->n_actions == a.n_actions - && !memcmp(facet->actions, a.actions, actions_len)) { - return false; + if (facet->actions_len != odp_actions->size + || memcmp(facet->actions, odp_actions->data, odp_actions->size)) { + free(facet->actions); + facet->actions_len = odp_actions->size; + facet->actions = xmemdup(odp_actions->data, odp_actions->size); } - free(facet->actions); - facet->n_actions = a.n_actions; - facet->actions = xmemdup(a.actions, actions_len); - return true; + ofpbuf_delete(odp_actions); } static int @@ -2188,7 +2272,7 @@ facet_put__(struct ofproto *ofproto, struct facet *facet, int flags, memset(&put->flow.stats, 0, sizeof put->flow.stats); odp_flow_key_from_flow(&put->flow.key, &facet->flow); put->flow.actions = facet->actions; - put->flow.n_actions = facet->n_actions; + put->flow.actions_len = facet->actions_len; put->flow.flags = 0; put->flags = flags; return dpif_flow_put(ofproto->dpif, put); @@ -2214,41 +2298,6 @@ facet_install(struct ofproto *p, struct facet *facet, bool zero_stats) } } -/* Recomposes the ODP actions for 'facet' and installs or uninstalls or - * reinstalls them as necessary. */ -static void -facet_update_actions(struct ofproto *ofproto, struct facet *facet) -{ - bool actions_changed; - uint16_t new_out_iface, old_out_iface; - - old_out_iface = facet->nf_flow.output_iface; - actions_changed = facet_make_actions(ofproto, facet, NULL); - - if (facet->may_install) { - if (facet->installed) { - if (actions_changed) { - struct odp_flow_put put; - facet_put__(ofproto, facet, ODPPF_CREATE | ODPPF_MODIFY - | ODPPF_ZERO_STATS, &put); - facet_update_stats(ofproto, facet, &put.flow.stats); - - /* Temporarily set the old output iface so that NetFlow - * messages have the correct output interface for the old - * stats. */ - new_out_iface = facet->nf_flow.output_iface; - facet->nf_flow.output_iface = old_out_iface; - facet_post_uninstall(ofproto, facet); - facet->nf_flow.output_iface = new_out_iface; - } - } else { - facet_install(ofproto, facet, true); - } - } else { - facet_uninstall(ofproto, facet); - } -} - /* Ensures that the bytes in 'facet', plus 'extra_bytes', have been passed up * to the accounting hook function in the ofhooks structure. */ static void @@ -2261,16 +2310,13 @@ facet_account(struct ofproto *ofproto, && total_bytes > facet->accounted_bytes) { ofproto->ofhooks->account_flow_cb( - &facet->flow, facet->tags, facet->actions, facet->n_actions, + &facet->flow, facet->tags, facet->actions, facet->actions_len, total_bytes - facet->accounted_bytes, ofproto->aux); facet->accounted_bytes = total_bytes; } } -/* If 'rule' is installed in the datapath, uninstalls it and updates its - * rule's statistics. - * - * If 'rule' is not installed, this function has no effect. */ +/* If 'rule' is installed in the datapath, uninstalls it. */ static void facet_uninstall(struct ofproto *p, struct facet *facet) { @@ -2279,14 +2325,12 @@ facet_uninstall(struct ofproto *p, struct facet *facet) odp_flow_key_from_flow(&odp_flow.key, &facet->flow); odp_flow.actions = NULL; - odp_flow.n_actions = 0; + odp_flow.actions_len = 0; odp_flow.flags = 0; if (!dpif_flow_del(p->dpif, &odp_flow)) { facet_update_stats(p, facet, &odp_flow.stats); } facet->installed = false; - - facet_post_uninstall(p, facet); } } @@ -2305,7 +2349,7 @@ facet_is_controller_flow(struct facet *facet) /* Folds all of 'facet''s statistics into its rule. Also updates the * accounting ofhook and emits a NetFlow expiration if appropriate. */ static void -facet_post_uninstall(struct ofproto *ofproto, struct facet *facet) +facet_flush_stats(struct ofproto *ofproto, struct facet *facet) { facet_account(ofproto, facet, 0); @@ -2381,29 +2425,79 @@ facet_lookup_valid(struct ofproto *ofproto, const struct flow *flow) * * - If there is none, destroys 'facet'. * - * Returns true if 'facet' still exists, false if it has been destroyed. - */ + * Returns true if 'facet' still exists, false if it has been destroyed. */ static bool facet_revalidate(struct ofproto *ofproto, struct facet *facet) { - struct rule *rule; + struct action_xlate_ctx ctx; + struct ofpbuf *odp_actions; + struct rule *new_rule; + bool actions_changed; COVERAGE_INC(facet_revalidate); - rule = rule_lookup(ofproto, &facet->flow); - if (!rule) { + + /* Determine the new rule. */ + new_rule = rule_lookup(ofproto, &facet->flow); + if (!new_rule) { + /* No new rule, so delete the facet. */ facet_remove(ofproto, facet); return false; } - if (rule != facet->rule) { + /* Calculate new ODP actions. + * + * We do not modify any 'facet' state yet, because we might need to, e.g., + * emit a NetFlow expiration and, if so, we need to have the old state + * around to properly compose it. */ + action_xlate_ctx_init(&ctx, ofproto, &facet->flow, NULL); + odp_actions = xlate_actions(&ctx, new_rule->actions, new_rule->n_actions); + actions_changed = (facet->actions_len != odp_actions->size + || memcmp(facet->actions, odp_actions->data, + facet->actions_len)); + + /* If the ODP actions changed or the installability changed, then we need + * to talk to the datapath. */ + if (actions_changed || facet->may_install != facet->installed) { + if (facet->may_install) { + struct odp_flow_put put; + + memset(&put.flow.stats, 0, sizeof put.flow.stats); + odp_flow_key_from_flow(&put.flow.key, &facet->flow); + put.flow.actions = odp_actions->data; + put.flow.actions_len = odp_actions->size; + put.flow.flags = 0; + put.flags = ODPPF_CREATE | ODPPF_MODIFY | ODPPF_ZERO_STATS; + dpif_flow_put(ofproto->dpif, &put); + + facet_update_stats(ofproto, facet, &put.flow.stats); + } else { + facet_uninstall(ofproto, facet); + } + + /* The datapath flow is gone or has zeroed stats, so push stats out of + * 'facet' into 'rule'. */ + facet_flush_stats(ofproto, facet); + } + + /* Update 'facet' now that we've taken care of all the old state. */ + facet->tags = ctx.tags; + facet->nf_flow.output_iface = ctx.nf_output_iface; + facet->may_install = ctx.may_set_up_flow; + if (actions_changed) { + free(facet->actions); + facet->actions_len = odp_actions->size; + facet->actions = xmemdup(odp_actions->data, odp_actions->size); + } + if (facet->rule != new_rule) { COVERAGE_INC(facet_changed_rule); list_remove(&facet->list_node); - list_push_back(&rule->facets, &facet->list_node); - facet->rule = rule; - facet->used = rule->created; + list_push_back(&new_rule->facets, &facet->list_node); + facet->rule = new_rule; + facet->used = new_rule->created; } - facet_update_actions(ofproto, facet); + ofpbuf_delete(odp_actions); + return true; } @@ -2441,15 +2535,14 @@ hton_ofp_phy_port(struct ofp_phy_port *opp) } static int -handle_echo_request(struct ofconn *ofconn, struct ofp_header *oh) +handle_echo_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofp_header *rq = oh; - queue_tx(make_echo_reply(rq), ofconn, ofconn->reply_counter); + queue_tx(make_echo_reply(oh), ofconn, ofconn->reply_counter); return 0; } static int -handle_features_request(struct ofconn *ofconn, struct ofp_header *oh) +handle_features_request(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofp_switch_features *osf; struct ofpbuf *buf; @@ -2483,7 +2576,7 @@ handle_features_request(struct ofconn *ofconn, struct ofp_header *oh) } static int -handle_get_config_request(struct ofconn *ofconn, struct ofp_header *oh) +handle_get_config_request(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofpbuf *buf; struct ofp_switch_config *osc; @@ -2504,16 +2597,9 @@ handle_get_config_request(struct ofconn *ofconn, struct ofp_header *oh) } static int -handle_set_config(struct ofconn *ofconn, struct ofp_switch_config *osc) +handle_set_config(struct ofconn *ofconn, const struct ofp_switch_config *osc) { - uint16_t flags; - int error; - - error = check_ofp_message(&osc->header, OFPT_SET_CONFIG, sizeof *osc); - if (error) { - return error; - } - flags = ntohs(osc->flags); + uint16_t flags = ntohs(osc->flags); if (ofconn->type == OFCONN_PRIMARY && ofconn->role != NX_ROLE_SLAVE) { switch (flags & OFPC_FRAG_MASK) { @@ -2535,30 +2621,6 @@ handle_set_config(struct ofconn *ofconn, struct ofp_switch_config *osc) return 0; } -static void -add_controller_action(struct odp_actions *actions, uint16_t max_len) -{ - union odp_action *a = odp_actions_add(actions, ODPAT_CONTROLLER); - a->controller.arg = max_len; -} - -struct action_xlate_ctx { - /* Input. */ - struct flow flow; /* Flow to which these actions correspond. */ - int recurse; /* Recursion level, via xlate_table_action. */ - struct ofproto *ofproto; - const struct ofpbuf *packet; /* The packet corresponding to 'flow', or a - * null pointer if we are revalidating - * without a packet to refer to. */ - - /* Output. */ - struct odp_actions *out; /* Datapath actions. */ - tag_type tags; /* Tags associated with OFPP_NORMAL actions. */ - bool may_set_up_flow; /* True ordinarily; false if the actions must - * be reassessed for every packet. */ - uint16_t nf_output_iface; /* Output interface index for NetFlow. */ -}; - /* Maximum depth of flow table recursion (due to NXAST_RESUBMIT actions) in a * flow translation. */ #define MAX_RESUBMIT_RECURSION 8 @@ -2584,15 +2646,14 @@ add_output_action(struct action_xlate_ctx *ctx, uint16_t port) */ } - odp_actions_add(ctx->out, ODPAT_OUTPUT)->output.port = port; + nl_msg_put_u32(ctx->odp_actions, ODPAT_OUTPUT, port); ctx->nf_output_iface = port; } static struct rule * rule_lookup(struct ofproto *ofproto, const struct flow *flow) { - return rule_from_cls_rule(classifier_lookup(&ofproto->cls, flow, - CLS_INC_ALL)); + return rule_from_cls_rule(classifier_lookup(&ofproto->cls, flow)); } static void @@ -2610,6 +2671,10 @@ xlate_table_action(struct action_xlate_ctx *ctx, uint16_t in_port) rule = rule_lookup(ctx->ofproto, &ctx->flow); ctx->flow.in_port = old_in_port; + if (ctx->resubmit_hook) { + ctx->resubmit_hook(ctx, rule); + } + if (rule) { ctx->recurse++; do_xlate_actions(rule->actions, rule->n_actions, ctx); @@ -2625,14 +2690,14 @@ xlate_table_action(struct action_xlate_ctx *ctx, uint16_t in_port) static void flood_packets(struct ofproto *ofproto, uint16_t odp_in_port, uint32_t mask, - uint16_t *nf_output_iface, struct odp_actions *actions) + uint16_t *nf_output_iface, struct ofpbuf *odp_actions) { struct ofport *ofport; HMAP_FOR_EACH (ofport, hmap_node, &ofproto->ports) { uint16_t odp_port = ofport->odp_port; if (odp_port != odp_in_port && !(ofport->opp.config & mask)) { - odp_actions_add(actions, ODPAT_OUTPUT)->output.port = odp_port; + nl_msg_put_u32(odp_actions, ODPAT_OUTPUT, odp_port); } } *nf_output_iface = NF_OUT_FLOOD; @@ -2656,7 +2721,7 @@ xlate_output_action__(struct action_xlate_ctx *ctx, break; case OFPP_NORMAL: if (!ctx->ofproto->ofhooks->normal_cb(&ctx->flow, ctx->packet, - ctx->out, &ctx->tags, + ctx->odp_actions, &ctx->tags, &ctx->nf_output_iface, ctx->ofproto->aux)) { COVERAGE_INC(ofproto_uninstallable); @@ -2665,14 +2730,14 @@ xlate_output_action__(struct action_xlate_ctx *ctx, break; case OFPP_FLOOD: flood_packets(ctx->ofproto, ctx->flow.in_port, OFPPC_NO_FLOOD, - &ctx->nf_output_iface, ctx->out); + &ctx->nf_output_iface, ctx->odp_actions); break; case OFPP_ALL: flood_packets(ctx->ofproto, ctx->flow.in_port, 0, - &ctx->nf_output_iface, ctx->out); + &ctx->nf_output_iface, ctx->odp_actions); break; case OFPP_CONTROLLER: - add_controller_action(ctx->out, max_len); + nl_msg_put_u64(ctx->odp_actions, ODPAT_CONTROLLER, max_len); break; case OFPP_LOCAL: add_output_action(ctx, ODPP_LOCAL); @@ -2709,9 +2774,18 @@ xlate_output_action(struct action_xlate_ctx *ctx, static void remove_pop_action(struct action_xlate_ctx *ctx) { - size_t n = ctx->out->n_actions; - if (n > 0 && ctx->out->actions[n - 1].type == ODPAT_POP_PRIORITY) { - ctx->out->n_actions--; + if (ctx->odp_actions->size == ctx->last_pop_priority) { + ctx->odp_actions->size -= NLA_ALIGN(NLA_HDRLEN); + ctx->last_pop_priority = -1; + } +} + +static void +add_pop_action(struct action_xlate_ctx *ctx) +{ + if (ctx->odp_actions->size != ctx->last_pop_priority) { + nl_msg_put_flag(ctx->odp_actions, ODPAT_POP_PRIORITY); + ctx->last_pop_priority = ctx->odp_actions->size; } } @@ -2741,10 +2815,9 @@ xlate_enqueue_action(struct action_xlate_ctx *ctx, /* Add ODP actions. */ remove_pop_action(ctx); - odp_actions_add(ctx->out, ODPAT_SET_PRIORITY)->priority.priority - = priority; + nl_msg_put_u32(ctx->odp_actions, ODPAT_SET_PRIORITY, priority); add_output_action(ctx, odp_port); - odp_actions_add(ctx->out, ODPAT_POP_PRIORITY); + add_pop_action(ctx); /* Update NetFlow output port. */ if (ctx->nf_output_iface == NF_OUT_DROP) { @@ -2770,23 +2843,18 @@ xlate_set_queue_action(struct action_xlate_ctx *ctx, } remove_pop_action(ctx); - odp_actions_add(ctx->out, ODPAT_SET_PRIORITY)->priority.priority - = priority; + nl_msg_put_u32(ctx->odp_actions, ODPAT_SET_PRIORITY, priority); } static void xlate_set_dl_tci(struct action_xlate_ctx *ctx) { - ovs_be16 dl_vlan = ctx->flow.dl_vlan; - uint8_t dl_vlan_pcp = ctx->flow.dl_vlan_pcp; - - if (dl_vlan == htons(OFP_VLAN_NONE)) { - odp_actions_add(ctx->out, ODPAT_STRIP_VLAN); + ovs_be16 tci = ctx->flow.vlan_tci; + if (!(tci & htons(VLAN_CFI))) { + nl_msg_put_flag(ctx->odp_actions, ODPAT_STRIP_VLAN); } else { - union odp_action *oa = odp_actions_add(ctx->out, ODPAT_SET_DL_TCI); - oa->dl_tci.tci = htons(ntohs(dl_vlan & htons(VLAN_VID_MASK)) - | (dl_vlan_pcp << VLAN_PCP_SHIFT) - | VLAN_CFI); + nl_msg_put_be16(ctx->odp_actions, ODPAT_SET_DL_TCI, + tci & ~htons(VLAN_CFI)); } } @@ -2794,12 +2862,11 @@ static void xlate_reg_move_action(struct action_xlate_ctx *ctx, const struct nx_action_reg_move *narm) { - ovs_be16 old_vlan = ctx->flow.dl_vlan; - uint8_t old_pcp = ctx->flow.dl_vlan_pcp; + ovs_be16 old_tci = ctx->flow.vlan_tci; nxm_execute_reg_move(narm, &ctx->flow); - if (ctx->flow.dl_vlan != old_vlan || ctx->flow.dl_vlan_pcp != old_pcp) { + if (ctx->flow.vlan_tci != old_tci) { xlate_set_dl_tci(ctx); } } @@ -2811,8 +2878,9 @@ xlate_nicira_action(struct action_xlate_ctx *ctx, const struct nx_action_resubmit *nar; const struct nx_action_set_tunnel *nast; const struct nx_action_set_queue *nasq; - union odp_action *oa; - int subtype = ntohs(nah->subtype); + const struct nx_action_multipath *nam; + enum nx_action_subtype subtype = ntohs(nah->subtype); + ovs_be64 tun_id; assert(nah->vendor == htonl(NX_VENDOR_ID)); switch (subtype) { @@ -2823,13 +2891,14 @@ xlate_nicira_action(struct action_xlate_ctx *ctx, case NXAST_SET_TUNNEL: nast = (const struct nx_action_set_tunnel *) nah; - oa = odp_actions_add(ctx->out, ODPAT_SET_TUNNEL); - ctx->flow.tun_id = oa->tunnel.tun_id = nast->tun_id; + tun_id = htonll(ntohl(nast->tun_id)); + nl_msg_put_be64(ctx->odp_actions, ODPAT_SET_TUNNEL, tun_id); + ctx->flow.tun_id = tun_id; break; case NXAST_DROP_SPOOFED_ARP: if (ctx->flow.dl_type == htons(ETH_TYPE_ARP)) { - odp_actions_add(ctx->out, ODPAT_DROP_SPOOFED_ARP); + nl_msg_put_flag(ctx->odp_actions, ODPAT_DROP_SPOOFED_ARP); } break; @@ -2839,7 +2908,7 @@ xlate_nicira_action(struct action_xlate_ctx *ctx, break; case NXAST_POP_QUEUE: - odp_actions_add(ctx->out, ODPAT_POP_PRIORITY); + add_pop_action(ctx); break; case NXAST_REG_MOVE: @@ -2849,13 +2918,28 @@ xlate_nicira_action(struct action_xlate_ctx *ctx, case NXAST_REG_LOAD: nxm_execute_reg_load((const struct nx_action_reg_load *) nah, &ctx->flow); + + case NXAST_NOTE: + /* Nothing to do. */ + break; + + case NXAST_SET_TUNNEL64: + tun_id = ((const struct nx_action_set_tunnel64 *) nah)->tun_id; + nl_msg_put_be64(ctx->odp_actions, ODPAT_SET_TUNNEL, tun_id); + ctx->flow.tun_id = tun_id; + break; + + case NXAST_MULTIPATH: + nam = (const struct nx_action_multipath *) nah; + multipath_execute(nam, &ctx->flow); break; /* If you add a new action here that modifies flow data, don't forget to * update the flow key in ctx->flow at the same time. */ + case NXAST_SNAT__OBSOLETE: default: - VLOG_DBG_RL(&rl, "unknown Nicira action type %"PRIu16, subtype); + VLOG_DBG_RL(&rl, "unknown Nicira action type %d", (int) subtype); break; } } @@ -2877,8 +2961,8 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, } for (ia = actions_first(&iter, in, n_in); ia; ia = actions_next(&iter)) { - uint16_t type = ntohs(ia->type); - union odp_action *oa; + enum ofp_action_type type = ntohs(ia->type); + const struct ofp_action_dl_addr *oada; switch (type) { case OFPAT_OUTPUT: @@ -2886,60 +2970,65 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, break; case OFPAT_SET_VLAN_VID: - ctx->flow.dl_vlan = ia->vlan_vid.vlan_vid; + ctx->flow.vlan_tci &= ~htons(VLAN_VID_MASK); + ctx->flow.vlan_tci |= ia->vlan_vid.vlan_vid | htons(VLAN_CFI); xlate_set_dl_tci(ctx); break; case OFPAT_SET_VLAN_PCP: - ctx->flow.dl_vlan_pcp = ia->vlan_pcp.vlan_pcp; + ctx->flow.vlan_tci &= ~htons(VLAN_PCP_MASK); + ctx->flow.vlan_tci |= htons( + (ia->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT) | VLAN_CFI); xlate_set_dl_tci(ctx); break; case OFPAT_STRIP_VLAN: - ctx->flow.dl_vlan = htons(OFP_VLAN_NONE); - ctx->flow.dl_vlan_pcp = 0; + ctx->flow.vlan_tci = htons(0); xlate_set_dl_tci(ctx); break; case OFPAT_SET_DL_SRC: - oa = odp_actions_add(ctx->out, ODPAT_SET_DL_SRC); - memcpy(oa->dl_addr.dl_addr, - ((struct ofp_action_dl_addr *) ia)->dl_addr, ETH_ADDR_LEN); - memcpy(ctx->flow.dl_src, - ((struct ofp_action_dl_addr *) ia)->dl_addr, ETH_ADDR_LEN); + oada = ((struct ofp_action_dl_addr *) ia); + nl_msg_put_unspec(ctx->odp_actions, ODPAT_SET_DL_SRC, + oada->dl_addr, ETH_ADDR_LEN); + memcpy(ctx->flow.dl_src, oada->dl_addr, ETH_ADDR_LEN); break; case OFPAT_SET_DL_DST: - oa = odp_actions_add(ctx->out, ODPAT_SET_DL_DST); - memcpy(oa->dl_addr.dl_addr, - ((struct ofp_action_dl_addr *) ia)->dl_addr, ETH_ADDR_LEN); - memcpy(ctx->flow.dl_dst, - ((struct ofp_action_dl_addr *) ia)->dl_addr, ETH_ADDR_LEN); + oada = ((struct ofp_action_dl_addr *) ia); + nl_msg_put_unspec(ctx->odp_actions, ODPAT_SET_DL_DST, + oada->dl_addr, ETH_ADDR_LEN); + memcpy(ctx->flow.dl_dst, oada->dl_addr, ETH_ADDR_LEN); break; case OFPAT_SET_NW_SRC: - oa = odp_actions_add(ctx->out, ODPAT_SET_NW_SRC); - ctx->flow.nw_src = oa->nw_addr.nw_addr = ia->nw_addr.nw_addr; + nl_msg_put_be32(ctx->odp_actions, ODPAT_SET_NW_SRC, + ia->nw_addr.nw_addr); + ctx->flow.nw_src = ia->nw_addr.nw_addr; break; case OFPAT_SET_NW_DST: - oa = odp_actions_add(ctx->out, ODPAT_SET_NW_DST); - ctx->flow.nw_dst = oa->nw_addr.nw_addr = ia->nw_addr.nw_addr; + nl_msg_put_be32(ctx->odp_actions, ODPAT_SET_NW_DST, + ia->nw_addr.nw_addr); + ctx->flow.nw_dst = ia->nw_addr.nw_addr; break; case OFPAT_SET_NW_TOS: - oa = odp_actions_add(ctx->out, ODPAT_SET_NW_TOS); - ctx->flow.nw_tos = oa->nw_tos.nw_tos = ia->nw_tos.nw_tos; + nl_msg_put_u8(ctx->odp_actions, ODPAT_SET_NW_TOS, + ia->nw_tos.nw_tos); + ctx->flow.nw_tos = ia->nw_tos.nw_tos; break; case OFPAT_SET_TP_SRC: - oa = odp_actions_add(ctx->out, ODPAT_SET_TP_SRC); - ctx->flow.tp_src = oa->tp_port.tp_port = ia->tp_port.tp_port; + nl_msg_put_be16(ctx->odp_actions, ODPAT_SET_TP_SRC, + ia->tp_port.tp_port); + ctx->flow.tp_src = ia->tp_port.tp_port; break; case OFPAT_SET_TP_DST: - oa = odp_actions_add(ctx->out, ODPAT_SET_TP_DST); - ctx->flow.tp_dst = oa->tp_port.tp_port = ia->tp_port.tp_port; + nl_msg_put_be16(ctx->odp_actions, ODPAT_SET_TP_DST, + ia->tp_port.tp_port); + ctx->flow.tp_dst = ia->tp_port.tp_port; break; case OFPAT_VENDOR: @@ -2951,55 +3040,46 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, break; default: - VLOG_DBG_RL(&rl, "unknown action type %"PRIu16, type); + VLOG_DBG_RL(&rl, "unknown action type %d", (int) type); break; } } } -static int -xlate_actions(const union ofp_action *in, size_t n_in, - const struct flow *flow, struct ofproto *ofproto, - const struct ofpbuf *packet, - struct odp_actions *out, tag_type *tags, bool *may_set_up_flow, - uint16_t *nf_output_iface) +static void +action_xlate_ctx_init(struct action_xlate_ctx *ctx, + struct ofproto *ofproto, const struct flow *flow, + const struct ofpbuf *packet) { - struct action_xlate_ctx ctx; + ctx->ofproto = ofproto; + ctx->flow = *flow; + ctx->packet = packet; + ctx->resubmit_hook = NULL; +} +static struct ofpbuf * +xlate_actions(struct action_xlate_ctx *ctx, + const union ofp_action *in, size_t n_in) +{ COVERAGE_INC(ofproto_ofp2odp); - odp_actions_init(out); - ctx.flow = *flow; - ctx.recurse = 0; - ctx.ofproto = ofproto; - ctx.packet = packet; - ctx.out = out; - ctx.tags = 0; - ctx.may_set_up_flow = true; - ctx.nf_output_iface = NF_OUT_DROP; - do_xlate_actions(in, n_in, &ctx); - remove_pop_action(&ctx); + + ctx->odp_actions = ofpbuf_new(512); + ctx->tags = 0; + ctx->may_set_up_flow = true; + ctx->nf_output_iface = NF_OUT_DROP; + ctx->recurse = 0; + ctx->last_pop_priority = -1; + do_xlate_actions(in, n_in, ctx); + remove_pop_action(ctx); /* Check with in-band control to see if we're allowed to set up this * flow. */ - if (!in_band_rule_check(ofproto->in_band, flow, out)) { - ctx.may_set_up_flow = false; + if (!in_band_rule_check(ctx->ofproto->in_band, &ctx->flow, + ctx->odp_actions->data, ctx->odp_actions->size)) { + ctx->may_set_up_flow = false; } - if (tags) { - *tags = ctx.tags; - } - if (may_set_up_flow) { - *may_set_up_flow = ctx.may_set_up_flow; - } - if (nf_output_iface) { - *nf_output_iface = ctx.nf_output_iface; - } - if (odp_actions_overflow(out)) { - COVERAGE_INC(odp_overflow); - odp_actions_init(out); - return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_TOO_MANY); - } - return 0; + return ctx->odp_actions; } /* Checks whether 'ofconn' is a slave controller. If so, returns an OpenFlow @@ -3022,13 +3102,14 @@ reject_slave_controller(struct ofconn *ofconn, const const char *msg_type) } static int -handle_packet_out(struct ofconn *ofconn, struct ofp_header *oh) +handle_packet_out(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofproto *p = ofconn->ofproto; struct ofp_packet_out *opo; struct ofpbuf payload, *buffer; union ofp_action *ofp_actions; - struct odp_actions odp_actions; + struct action_xlate_ctx ctx; + struct ofpbuf *odp_actions; struct ofpbuf request; struct flow flow; size_t n_ofp_actions; @@ -3043,12 +3124,8 @@ handle_packet_out(struct ofconn *ofconn, struct ofp_header *oh) } /* Get ofp_packet_out. */ - request.data = oh; - request.size = ntohs(oh->length); - opo = ofpbuf_try_pull(&request, offsetof(struct ofp_packet_out, actions)); - if (!opo) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } + ofpbuf_use_const(&request, oh, ntohs(oh->length)); + opo = ofpbuf_pull(&request, offsetof(struct ofp_packet_out, actions)); /* Get actions. */ error = ofputil_pull_actions(&request, ntohs(opo->actions_len), @@ -3079,12 +3156,10 @@ handle_packet_out(struct ofconn *ofconn, struct ofp_header *oh) } /* Send. */ - error = xlate_actions(ofp_actions, n_ofp_actions, &flow, p, &payload, - &odp_actions, NULL, NULL, NULL); - if (!error) { - dpif_execute(p->dpif, odp_actions.actions, odp_actions.n_actions, - &payload); - } + action_xlate_ctx_init(&ctx, p, &flow, &payload); + odp_actions = xlate_actions(&ctx, ofp_actions, n_ofp_actions); + dpif_execute(p->dpif, odp_actions->data, odp_actions->size, &payload); + ofpbuf_delete(odp_actions); exit: ofpbuf_delete(buffer); @@ -3117,10 +3192,10 @@ update_port_config(struct ofproto *p, struct ofport *port, } static int -handle_port_mod(struct ofconn *ofconn, struct ofp_header *oh) +handle_port_mod(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofproto *p = ofconn->ofproto; - const struct ofp_port_mod *opm; + const struct ofp_port_mod *opm = (const struct ofp_port_mod *) oh; struct ofport *port; int error; @@ -3128,11 +3203,6 @@ handle_port_mod(struct ofconn *ofconn, struct ofp_header *oh) if (error) { return error; } - error = check_ofp_message(oh, OFPT_PORT_MOD, sizeof *opm); - if (error) { - return error; - } - opm = (struct ofp_port_mod *) oh; port = get_port(p, ofp_port_to_odp_port(ntohs(opm->port_no))); if (!port) { @@ -3162,9 +3232,11 @@ make_ofp_stats_reply(ovs_be32 xid, ovs_be16 type, size_t body_len) } static struct ofpbuf * -start_ofp_stats_reply(const struct ofp_stats_request *request, size_t body_len) +start_ofp_stats_reply(const struct ofp_header *request, size_t body_len) { - return make_ofp_stats_reply(request->header.xid, request->type, body_len); + const struct ofp_stats_request *osr + = (const struct ofp_stats_request *) request; + return make_ofp_stats_reply(osr->header.xid, osr->type, body_len); } static void * @@ -3193,7 +3265,7 @@ make_nxstats_reply(ovs_be32 xid, ovs_be32 subtype, size_t body_len) nsm->type = htons(OFPST_VENDOR); nsm->flags = htons(0); nsm->vendor = htonl(NX_VENDOR_ID); - nsm->subtype = htonl(subtype); + nsm->subtype = subtype; return msg; } @@ -3220,7 +3292,7 @@ append_nxstats_reply(size_t nbytes, struct ofconn *ofconn, static int handle_desc_stats_request(struct ofconn *ofconn, - struct ofp_stats_request *request) + const struct ofp_header *request) { struct ofproto *p = ofconn->ofproto; struct ofp_desc_stats *ods; @@ -3241,7 +3313,7 @@ handle_desc_stats_request(struct ofconn *ofconn, static int handle_table_stats_request(struct ofconn *ofconn, - struct ofp_stats_request *request) + const struct ofp_header *request) { struct ofproto *p = ofconn->ofproto; struct ofp_table_stats *ots; @@ -3294,21 +3366,15 @@ append_port_stat(struct ofport *port, struct ofconn *ofconn, } static int -handle_port_stats_request(struct ofconn *ofconn, struct ofp_stats_request *osr, - size_t arg_size) +handle_port_stats_request(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofproto *p = ofconn->ofproto; - struct ofp_port_stats_request *psr; + const struct ofp_port_stats_request *psr = ofputil_stats_body(oh); struct ofp_port_stats *ops; struct ofpbuf *msg; struct ofport *port; - if (arg_size != sizeof *psr) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - psr = (struct ofp_port_stats_request *) osr->body; - - msg = start_ofp_stats_reply(osr, sizeof *ops * 16); + msg = start_ofp_stats_reply(oh, sizeof *ops * 16); if (psr->port_no != htons(OFPP_NONE)) { port = get_port(p, ofp_port_to_odp_port(ntohs(psr->port_no))); if (port) { @@ -3324,12 +3390,6 @@ handle_port_stats_request(struct ofconn *ofconn, struct ofp_stats_request *osr, return 0; } -struct flow_stats_cbdata { - struct ofconn *ofconn; - ovs_be16 out_port; - struct ofpbuf *msg; -}; - /* Obtains statistic counters for 'rule' within 'p' and stores them into * '*packet_countp' and '*byte_countp'. The returned statistics include * statistics for all of 'rule''s facets. */ @@ -3388,31 +3448,29 @@ calc_flow_duration(long long int start, ovs_be32 *sec, ovs_be32 *nsec) } static void -flow_stats_cb(struct cls_rule *rule_, void *cbdata_) +put_ofp_flow_stats(struct ofconn *ofconn, struct rule *rule, + ovs_be16 out_port, struct ofpbuf **replyp) { - struct rule *rule = rule_from_cls_rule(rule_); - struct flow_stats_cbdata *cbdata = cbdata_; struct ofp_flow_stats *ofs; uint64_t packet_count, byte_count; size_t act_len, len; - if (rule_is_hidden(rule) || !rule_has_out_port(rule, cbdata->out_port)) { + if (rule_is_hidden(rule) || !rule_has_out_port(rule, out_port)) { return; } act_len = sizeof *rule->actions * rule->n_actions; len = offsetof(struct ofp_flow_stats, actions) + act_len; - query_stats(cbdata->ofconn->ofproto, rule, &packet_count, &byte_count); + query_stats(ofconn->ofproto, rule, &packet_count, &byte_count); - ofs = append_ofp_stats_reply(len, cbdata->ofconn, &cbdata->msg); + ofs = append_ofp_stats_reply(len, ofconn, replyp); ofs->length = htons(len); ofs->table_id = 0; ofs->pad = 0; - flow_to_match(&rule->cr.flow, rule->cr.wc.wildcards, - cbdata->ofconn->flow_format, &ofs->match); + ofputil_cls_rule_to_match(&rule->cr, ofconn->flow_format, &ofs->match, + rule->flow_cookie, &ofs->cookie); calc_flow_duration(rule->created, &ofs->duration_sec, &ofs->duration_nsec); - ofs->cookie = rule->flow_cookie; ofs->priority = htons(rule->cr.priority); ofs->idle_timeout = htons(rule->idle_timeout); ofs->hard_timeout = htons(rule->hard_timeout); @@ -3424,58 +3482,59 @@ flow_stats_cb(struct cls_rule *rule_, void *cbdata_) } } -static int -table_id_to_include(uint8_t table_id) +static bool +is_valid_table(uint8_t table_id) { - return table_id == 0 || table_id == 0xff ? CLS_INC_ALL : 0; + return table_id == 0 || table_id == 0xff; } static int -handle_flow_stats_request(struct ofconn *ofconn, - const struct ofp_stats_request *osr, size_t arg_size) +handle_flow_stats_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofp_flow_stats_request *fsr; - struct flow_stats_cbdata cbdata; - struct cls_rule target; + const struct ofp_flow_stats_request *fsr = ofputil_stats_body(oh); + struct ofpbuf *reply; - if (arg_size != sizeof *fsr) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + COVERAGE_INC(ofproto_flows_req); + reply = start_ofp_stats_reply(oh, 1024); + if (is_valid_table(fsr->table_id)) { + struct cls_cursor cursor; + struct cls_rule target; + struct rule *rule; + + ofputil_cls_rule_from_match(&fsr->match, 0, NXFF_OPENFLOW10, 0, + &target); + cls_cursor_init(&cursor, &ofconn->ofproto->cls, &target); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + put_ofp_flow_stats(ofconn, rule, fsr->out_port, &reply); + } } - fsr = (struct ofp_flow_stats_request *) osr->body; + queue_tx(reply, ofconn, ofconn->reply_counter); - COVERAGE_INC(ofproto_flows_req); - cbdata.ofconn = ofconn; - cbdata.out_port = fsr->out_port; - cbdata.msg = start_ofp_stats_reply(osr, 1024); - cls_rule_from_match(&fsr->match, 0, NXFF_OPENFLOW10, 0, &target); - classifier_for_each_match(&ofconn->ofproto->cls, &target, - table_id_to_include(fsr->table_id), - flow_stats_cb, &cbdata); - queue_tx(cbdata.msg, ofconn, ofconn->reply_counter); return 0; } static void -nx_flow_stats_cb(struct cls_rule *rule_, void *cbdata_) +put_nx_flow_stats(struct ofconn *ofconn, struct rule *rule, + ovs_be16 out_port, struct ofpbuf **replyp) { - struct rule *rule = rule_from_cls_rule(rule_); - struct flow_stats_cbdata *cbdata = cbdata_; struct nx_flow_stats *nfs; uint64_t packet_count, byte_count; size_t act_len, start_len; + struct ofpbuf *reply; - if (rule_is_hidden(rule) || !rule_has_out_port(rule, cbdata->out_port)) { + if (rule_is_hidden(rule) || !rule_has_out_port(rule, out_port)) { return; } - query_stats(cbdata->ofconn->ofproto, rule, &packet_count, &byte_count); + query_stats(ofconn->ofproto, rule, &packet_count, &byte_count); act_len = sizeof *rule->actions * rule->n_actions; - start_len = cbdata->msg->size; - append_nxstats_reply(sizeof *nfs + NXM_MAX_LEN + act_len, - cbdata->ofconn, &cbdata->msg); - nfs = ofpbuf_put_uninit(cbdata->msg, sizeof *nfs); + start_len = (*replyp)->size; + append_nxstats_reply(sizeof *nfs + NXM_MAX_LEN + act_len, ofconn, replyp); + reply = *replyp; + + nfs = ofpbuf_put_uninit(reply, sizeof *nfs); nfs->table_id = 0; nfs->pad = 0; calc_flow_duration(rule->created, &nfs->duration_sec, &nfs->duration_nsec); @@ -3483,70 +3542,67 @@ nx_flow_stats_cb(struct cls_rule *rule_, void *cbdata_) nfs->priority = htons(rule->cr.priority); nfs->idle_timeout = htons(rule->idle_timeout); nfs->hard_timeout = htons(rule->hard_timeout); - nfs->match_len = htons(nx_put_match(cbdata->msg, &rule->cr)); + nfs->match_len = htons(nx_put_match(reply, &rule->cr)); memset(nfs->pad2, 0, sizeof nfs->pad2); nfs->packet_count = htonll(packet_count); nfs->byte_count = htonll(byte_count); if (rule->n_actions > 0) { - ofpbuf_put(cbdata->msg, rule->actions, act_len); + ofpbuf_put(reply, rule->actions, act_len); } - nfs->length = htons(cbdata->msg->size - start_len); + nfs->length = htons(reply->size - start_len); } static int -handle_nxst_flow(struct ofconn *ofconn, struct ofpbuf *b) +handle_nxst_flow(struct ofconn *ofconn, const struct ofp_header *oh) { struct nx_flow_stats_request *nfsr; - struct flow_stats_cbdata cbdata; struct cls_rule target; + struct ofpbuf *reply; + struct ofpbuf b; int error; + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + /* Dissect the message. */ - nfsr = ofpbuf_try_pull(b, sizeof *nfsr); - if (!nfsr) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - error = nx_pull_match(b, ntohs(nfsr->match_len), 0, &target); + nfsr = ofpbuf_pull(&b, sizeof *nfsr); + error = nx_pull_match(&b, ntohs(nfsr->match_len), 0, &target); if (error) { return error; } + if (b.size) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } COVERAGE_INC(ofproto_flows_req); - cbdata.ofconn = ofconn; - cbdata.out_port = nfsr->out_port; - cbdata.msg = start_nxstats_reply(&nfsr->nsm, 1024); - classifier_for_each_match(&ofconn->ofproto->cls, &target, - table_id_to_include(nfsr->table_id), - nx_flow_stats_cb, &cbdata); - queue_tx(cbdata.msg, ofconn, ofconn->reply_counter); + reply = start_nxstats_reply(&nfsr->nsm, 1024); + if (is_valid_table(nfsr->table_id)) { + struct cls_cursor cursor; + struct rule *rule; + + cls_cursor_init(&cursor, &ofconn->ofproto->cls, &target); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + put_nx_flow_stats(ofconn, rule, nfsr->out_port, &reply); + } + } + queue_tx(reply, ofconn, ofconn->reply_counter); + return 0; } -struct flow_stats_ds_cbdata { - struct ofproto *ofproto; - struct ds *results; -}; - static void -flow_stats_ds_cb(struct cls_rule *rule_, void *cbdata_) +flow_stats_ds(struct ofproto *ofproto, struct rule *rule, struct ds *results) { - struct rule *rule = rule_from_cls_rule(rule_); - struct flow_stats_ds_cbdata *cbdata = cbdata_; - struct ds *results = cbdata->results; - struct ofp_match match; uint64_t packet_count, byte_count; size_t act_len = sizeof *rule->actions * rule->n_actions; - query_stats(cbdata->ofproto, rule, &packet_count, &byte_count); - flow_to_match(&rule->cr.flow, rule->cr.wc.wildcards, - NXFF_OPENFLOW10, &match); + query_stats(ofproto, rule, &packet_count, &byte_count); ds_put_format(results, "duration=%llds, ", (time_msec() - rule->created) / 1000); ds_put_format(results, "priority=%u, ", rule->cr.priority); ds_put_format(results, "n_packets=%"PRIu64", ", packet_count); ds_put_format(results, "n_bytes=%"PRIu64", ", byte_count); - ofp_print_match(results, &match, true); + cls_rule_format(&rule->cr, results); if (act_len > 0) { ofp_print_actions(results, &rule->actions->header, act_len); } else { @@ -3560,45 +3616,13 @@ flow_stats_ds_cb(struct cls_rule *rule_, void *cbdata_) void ofproto_get_all_flows(struct ofproto *p, struct ds *results) { - struct ofp_match match; - struct cls_rule target; - struct flow_stats_ds_cbdata cbdata; - - memset(&match, 0, sizeof match); - match.wildcards = htonl(OVSFW_ALL); - - cbdata.ofproto = p; - cbdata.results = results; - - cls_rule_from_match(&match, 0, NXFF_OPENFLOW10, 0, &target); - classifier_for_each_match(&p->cls, &target, CLS_INC_ALL, - flow_stats_ds_cb, &cbdata); -} - -struct aggregate_stats_cbdata { - struct ofproto *ofproto; - ovs_be16 out_port; - uint64_t packet_count; - uint64_t byte_count; - uint32_t n_flows; -}; - -static void -aggregate_stats_cb(struct cls_rule *rule_, void *cbdata_) -{ - struct rule *rule = rule_from_cls_rule(rule_); - struct aggregate_stats_cbdata *cbdata = cbdata_; - uint64_t packet_count, byte_count; + struct cls_cursor cursor; + struct rule *rule; - if (rule_is_hidden(rule) || !rule_has_out_port(rule, cbdata->out_port)) { - return; + cls_cursor_init(&cursor, &p->cls, NULL); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + flow_stats_ds(p, rule, results); } - - query_stats(cbdata->ofproto, rule, &packet_count, &byte_count); - - cbdata->packet_count += packet_count; - cbdata->byte_count += byte_count; - cbdata->n_flows++; } static void @@ -3606,42 +3630,50 @@ query_aggregate_stats(struct ofproto *ofproto, struct cls_rule *target, ovs_be16 out_port, uint8_t table_id, struct ofp_aggregate_stats_reply *oasr) { - struct aggregate_stats_cbdata cbdata; + uint64_t total_packets = 0; + uint64_t total_bytes = 0; + int n_flows = 0; COVERAGE_INC(ofproto_agg_request); - cbdata.ofproto = ofproto; - cbdata.out_port = out_port; - cbdata.packet_count = 0; - cbdata.byte_count = 0; - cbdata.n_flows = 0; - classifier_for_each_match(&ofproto->cls, target, - table_id_to_include(table_id), - aggregate_stats_cb, &cbdata); - - oasr->flow_count = htonl(cbdata.n_flows); - oasr->packet_count = htonll(cbdata.packet_count); - oasr->byte_count = htonll(cbdata.byte_count); + + if (is_valid_table(table_id)) { + struct cls_cursor cursor; + struct rule *rule; + + cls_cursor_init(&cursor, &ofproto->cls, target); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + if (!rule_is_hidden(rule) && rule_has_out_port(rule, out_port)) { + uint64_t packet_count; + uint64_t byte_count; + + query_stats(ofproto, rule, &packet_count, &byte_count); + + total_packets += packet_count; + total_bytes += byte_count; + n_flows++; + } + } + } + + oasr->flow_count = htonl(n_flows); + oasr->packet_count = htonll(total_packets); + oasr->byte_count = htonll(total_bytes); memset(oasr->pad, 0, sizeof oasr->pad); } static int handle_aggregate_stats_request(struct ofconn *ofconn, - const struct ofp_stats_request *osr, - size_t arg_size) + const struct ofp_header *oh) { - struct ofp_aggregate_stats_request *request; + const struct ofp_aggregate_stats_request *request = ofputil_stats_body(oh); struct ofp_aggregate_stats_reply *reply; struct cls_rule target; struct ofpbuf *msg; - if (arg_size != sizeof *request) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - request = (struct ofp_aggregate_stats_request *) osr->body; + ofputil_cls_rule_from_match(&request->match, 0, NXFF_OPENFLOW10, 0, + &target); - cls_rule_from_match(&request->match, 0, NXFF_OPENFLOW10, 0, &target); - - msg = start_ofp_stats_reply(osr, sizeof *reply); + msg = start_ofp_stats_reply(oh, sizeof *reply); reply = append_ofp_stats_reply(sizeof *reply, ofconn, &msg); query_aggregate_stats(ofconn->ofproto, &target, request->out_port, request->table_id, reply); @@ -3650,23 +3682,26 @@ handle_aggregate_stats_request(struct ofconn *ofconn, } static int -handle_nxst_aggregate(struct ofconn *ofconn, struct ofpbuf *b) +handle_nxst_aggregate(struct ofconn *ofconn, const struct ofp_header *oh) { struct nx_aggregate_stats_request *request; struct ofp_aggregate_stats_reply *reply; struct cls_rule target; + struct ofpbuf b; struct ofpbuf *buf; int error; + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + /* Dissect the message. */ - request = ofpbuf_try_pull(b, sizeof *request); - if (!request) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - error = nx_pull_match(b, ntohs(request->match_len), 0, &target); + request = ofpbuf_pull(&b, sizeof *request); + error = nx_pull_match(&b, ntohs(request->match_len), 0, &target); if (error) { return error; } + if (b.size) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } /* Reply. */ COVERAGE_INC(ofproto_flows_req); @@ -3728,26 +3763,24 @@ handle_queue_stats_for_port(struct ofport *port, uint32_t queue_id, } static int -handle_queue_stats_request(struct ofconn *ofconn, - const struct ofp_stats_request *osr, - size_t arg_size) +handle_queue_stats_request(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofproto *ofproto = ofconn->ofproto; - struct ofp_queue_stats_request *qsr; + const struct ofp_queue_stats_request *qsr; struct queue_stats_cbdata cbdata; struct ofport *port; unsigned int port_no; uint32_t queue_id; - if (arg_size != sizeof *qsr) { + qsr = ofputil_stats_body(oh); + if (!qsr) { return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); } - qsr = (struct ofp_queue_stats_request *) osr->body; COVERAGE_INC(ofproto_queue_req); cbdata.ofconn = ofconn; - cbdata.msg = start_ofp_stats_reply(osr, 128); + cbdata.msg = start_ofp_stats_reply(oh, 128); port_no = ntohs(qsr->port_no); queue_id = ntohl(qsr->queue_id); @@ -3769,85 +3802,6 @@ handle_queue_stats_request(struct ofconn *ofconn, return 0; } -static int -handle_vendor_stats_request(struct ofconn *ofconn, - struct ofp_stats_request *osr, size_t arg_size) -{ - struct nicira_stats_msg *nsm; - struct ofpbuf b; - ovs_be32 vendor; - - if (arg_size < 4) { - VLOG_WARN_RL(&rl, "truncated vendor stats request body"); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - - memcpy(&vendor, osr->body, sizeof vendor); - if (vendor != htonl(NX_VENDOR_ID)) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR); - } - - if (ntohs(osr->header.length) < sizeof(struct nicira_stats_msg)) { - VLOG_WARN_RL(&rl, "truncated Nicira stats request"); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - - nsm = (struct nicira_stats_msg *) osr; - b.data = nsm; - b.size = ntohs(nsm->header.length); - switch (ntohl(nsm->subtype)) { - case NXST_FLOW: - return handle_nxst_flow(ofconn, &b); - - case NXST_AGGREGATE: - return handle_nxst_aggregate(ofconn, &b); - - default: - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE); - } -} - -static int -handle_stats_request(struct ofconn *ofconn, struct ofp_header *oh) -{ - struct ofp_stats_request *osr; - size_t arg_size; - int error; - - error = check_ofp_message_array(oh, OFPT_STATS_REQUEST, sizeof *osr, - 1, &arg_size); - if (error) { - return error; - } - osr = (struct ofp_stats_request *) oh; - - switch (ntohs(osr->type)) { - case OFPST_DESC: - return handle_desc_stats_request(ofconn, osr); - - case OFPST_FLOW: - return handle_flow_stats_request(ofconn, osr, arg_size); - - case OFPST_AGGREGATE: - return handle_aggregate_stats_request(ofconn, osr, arg_size); - - case OFPST_TABLE: - return handle_table_stats_request(ofconn, osr); - - case OFPST_PORT: - return handle_port_stats_request(ofconn, osr, arg_size); - - case OFPST_QUEUE: - return handle_queue_stats_request(ofconn, osr, arg_size); - - case OFPST_VENDOR: - return handle_vendor_stats_request(ofconn, osr, arg_size); - - default: - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT); - } -} - static long long int msec_from_nsec(uint64_t sec, uint32_t nsec) { @@ -3886,19 +3840,6 @@ facet_update_stats(struct ofproto *ofproto, struct facet *facet, } } -struct flow_mod { - struct cls_rule cr; - ovs_be64 cookie; - uint16_t command; - uint16_t idle_timeout; - uint16_t hard_timeout; - uint32_t buffer_id; - uint16_t out_port; - uint16_t flags; - union ofp_action *actions; - size_t n_actions; -}; - /* Implements OFPFC_ADD and the cases for OFPFC_MODIFY and OFPFC_MODIFY_STRICT * in which no matching flow already exists in the flow table. * @@ -3934,7 +3875,10 @@ add_flow(struct ofconn *ofconn, struct flow_mod *fm) rule = rule_create(&fm->cr, fm->actions, fm->n_actions, fm->idle_timeout, fm->hard_timeout, fm->cookie, fm->flags & OFPFF_SEND_FLOW_REM); - rule_insert(p, rule, packet, in_port); + rule_insert(p, rule); + if (packet) { + rule_execute(p, rule, in_port, packet); + } return error; } @@ -3976,7 +3920,6 @@ struct modify_flows_cbdata { static int modify_flow(struct ofproto *, const struct flow_mod *, struct rule *); -static void modify_flows_cb(struct cls_rule *, void *cbdata_); /* Implements OFPFC_MODIFY. Returns 0 on success or an OpenFlow error code as * encoded by ofp_mkerr() on failure. @@ -3986,19 +3929,24 @@ static void modify_flows_cb(struct cls_rule *, void *cbdata_); static int modify_flows_loose(struct ofconn *ofconn, struct flow_mod *fm) { - struct modify_flows_cbdata cbdata; + struct ofproto *p = ofconn->ofproto; + struct rule *match = NULL; + struct cls_cursor cursor; + struct rule *rule; - cbdata.ofproto = ofconn->ofproto; - cbdata.fm = fm; - cbdata.match = NULL; + cls_cursor_init(&cursor, &p->cls, &fm->cr); + CLS_CURSOR_FOR_EACH (rule, cr, &cursor) { + if (!rule_is_hidden(rule)) { + match = rule; + modify_flow(p, fm, rule); + } + } - classifier_for_each_match(&ofconn->ofproto->cls, &fm->cr, CLS_INC_ALL, - modify_flows_cb, &cbdata); - if (cbdata.match) { - /* This credits the packet to whichever flow happened to happened to - * match last. That's weird. Maybe we should do a lookup for the - * flow that actually matches the packet? Who knows. */ - send_buffered_packet(ofconn, cbdata.match, fm->buffer_id); + if (match) { + /* This credits the packet to whichever flow happened to match last. + * That's weird. Maybe we should do a lookup for the flow that + * actually matches the packet? Who knows. */ + send_buffered_packet(ofconn, match, fm->buffer_id); return 0; } else { return add_flow(ofconn, fm); @@ -4023,19 +3971,6 @@ modify_flow_strict(struct ofconn *ofconn, struct flow_mod *fm) } } -/* Callback for modify_flows_loose(). */ -static void -modify_flows_cb(struct cls_rule *rule_, void *cbdata_) -{ - struct rule *rule = rule_from_cls_rule(rule_); - struct modify_flows_cbdata *cbdata = cbdata_; - - if (!rule_is_hidden(rule)) { - cbdata->match = rule; - modify_flow(cbdata->ofproto, cbdata->fm, rule); - } -} - /* Implements core of OFPFC_MODIFY and OFPFC_MODIFY_STRICT where 'rule' has * been identified as a flow in 'p''s flow table to be modified, by changing * the rule's actions to match those in 'ofm' (which is followed by 'n_actions' @@ -4066,25 +4001,19 @@ modify_flow(struct ofproto *p, const struct flow_mod *fm, struct rule *rule) /* OFPFC_DELETE implementation. */ -struct delete_flows_cbdata { - struct ofproto *ofproto; - ovs_be16 out_port; -}; - -static void delete_flows_cb(struct cls_rule *, void *cbdata_); static void delete_flow(struct ofproto *, struct rule *, ovs_be16 out_port); /* Implements OFPFC_DELETE. */ static void delete_flows_loose(struct ofproto *p, const struct flow_mod *fm) { - struct delete_flows_cbdata cbdata; + struct rule *rule, *next_rule; + struct cls_cursor cursor; - cbdata.ofproto = p; - cbdata.out_port = htons(fm->out_port); - - classifier_for_each_match(&p->cls, &fm->cr, CLS_INC_ALL, - delete_flows_cb, &cbdata); + cls_cursor_init(&cursor, &p->cls, &fm->cr); + CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cr, &cursor) { + delete_flow(p, rule, htons(fm->out_port)); + } } /* Implements OFPFC_DELETE_STRICT. */ @@ -4097,16 +4026,6 @@ delete_flow_strict(struct ofproto *p, struct flow_mod *fm) } } -/* Callback for delete_flows_loose(). */ -static void -delete_flows_cb(struct cls_rule *rule_, void *cbdata_) -{ - struct rule *rule = rule_from_cls_rule(rule_); - struct delete_flows_cbdata *cbdata = cbdata_; - - delete_flow(cbdata->ofproto, rule, cbdata->out_port); -} - /* Implements core of OFPFC_DELETE and OFPFC_DELETE_STRICT where 'rule' has * been identified as a flow to delete from 'p''s flow table, by deleting the * flow and sending out a OFPT_FLOW_REMOVED message to any interested @@ -4131,9 +4050,10 @@ delete_flow(struct ofproto *p, struct rule *rule, ovs_be16 out_port) } static int -flow_mod_core(struct ofconn *ofconn, struct flow_mod *fm) +handle_flow_mod(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofproto *p = ofconn->ofproto; + struct flow_mod fm; int error; error = reject_slave_controller(ofconn, "flow_mod"); @@ -4141,36 +4061,41 @@ flow_mod_core(struct ofconn *ofconn, struct flow_mod *fm) return error; } - error = validate_actions(fm->actions, fm->n_actions, - &fm->cr.flow, p->max_ports); + error = ofputil_decode_flow_mod(&fm, oh, ofconn->flow_format); if (error) { return error; } - /* We do not support the emergency flow cache. It will hopefully - * get dropped from OpenFlow in the near future. */ - if (fm->flags & OFPFF_EMERG) { + /* We do not support the emergency flow cache. It will hopefully get + * dropped from OpenFlow in the near future. */ + if (fm.flags & OFPFF_EMERG) { /* There isn't a good fit for an error code, so just state that the * flow table is full. */ return ofp_mkerr(OFPET_FLOW_MOD_FAILED, OFPFMFC_ALL_TABLES_FULL); } - switch (fm->command) { + error = validate_actions(fm.actions, fm.n_actions, + &fm.cr.flow, p->max_ports); + if (error) { + return error; + } + + switch (fm.command) { case OFPFC_ADD: - return add_flow(ofconn, fm); + return add_flow(ofconn, &fm); case OFPFC_MODIFY: - return modify_flows_loose(ofconn, fm); + return modify_flows_loose(ofconn, &fm); case OFPFC_MODIFY_STRICT: - return modify_flow_strict(ofconn, fm); + return modify_flow_strict(ofconn, &fm); case OFPFC_DELETE: - delete_flows_loose(p, fm); + delete_flows_loose(p, &fm); return 0; case OFPFC_DELETE_STRICT: - delete_flow_strict(p, fm); + delete_flow_strict(p, &fm); return 0; default: @@ -4179,129 +4104,23 @@ flow_mod_core(struct ofconn *ofconn, struct flow_mod *fm) } static int -handle_ofpt_flow_mod(struct ofconn *ofconn, struct ofp_header *oh) +handle_tun_id_from_cookie(struct ofconn *ofconn, const struct ofp_header *oh) { - struct ofp_match orig_match; - struct ofp_flow_mod *ofm; - struct flow_mod fm; - struct ofpbuf b; - int error; - - b.data = oh; - b.size = ntohs(oh->length); - - /* Dissect the message. */ - ofm = ofpbuf_try_pull(&b, sizeof *ofm); - if (!ofm) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - error = ofputil_pull_actions(&b, b.size, &fm.actions, &fm.n_actions); - if (error) { - return error; - } - - /* Normalize ofm->match. If normalization actually changes anything, then - * log the differences. */ - ofm->match.pad1[0] = ofm->match.pad2[0] = 0; - orig_match = ofm->match; - normalize_match(&ofm->match); - if (memcmp(&ofm->match, &orig_match, sizeof orig_match)) { - static struct vlog_rate_limit normal_rl = VLOG_RATE_LIMIT_INIT(1, 1); - if (!VLOG_DROP_INFO(&normal_rl)) { - char *old = ofp_match_to_literal_string(&orig_match); - char *new = ofp_match_to_literal_string(&ofm->match); - VLOG_INFO("%s: normalization changed ofp_match, details:", - rconn_get_name(ofconn->rconn)); - VLOG_INFO(" pre: %s", old); - VLOG_INFO("post: %s", new); - free(old); - free(new); - } - } - - /* Translate the message. */ - cls_rule_from_match(&ofm->match, ntohs(ofm->priority), ofconn->flow_format, - ofm->cookie, &fm.cr); - fm.cookie = ofm->cookie; - fm.command = ntohs(ofm->command); - fm.idle_timeout = ntohs(ofm->idle_timeout); - fm.hard_timeout = ntohs(ofm->hard_timeout); - fm.buffer_id = ntohl(ofm->buffer_id); - fm.out_port = ntohs(ofm->out_port); - fm.flags = ntohs(ofm->flags); - - /* Execute the command. */ - return flow_mod_core(ofconn, &fm); -} - -static int -handle_nxt_flow_mod(struct ofconn *ofconn, struct ofp_header *oh) -{ - struct nx_flow_mod *nfm; - struct flow_mod fm; - struct ofpbuf b; - int error; - - b.data = oh; - b.size = ntohs(oh->length); - - /* Dissect the message. */ - nfm = ofpbuf_try_pull(&b, sizeof *nfm); - if (!nfm) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - error = nx_pull_match(&b, ntohs(nfm->match_len), ntohs(nfm->priority), - &fm.cr); - if (error) { - return error; - } - error = ofputil_pull_actions(&b, b.size, &fm.actions, &fm.n_actions); - if (error) { - return error; - } - - /* Translate the message. */ - fm.cookie = nfm->cookie; - fm.command = ntohs(nfm->command); - fm.idle_timeout = ntohs(nfm->idle_timeout); - fm.hard_timeout = ntohs(nfm->hard_timeout); - fm.buffer_id = ntohl(nfm->buffer_id); - fm.out_port = ntohs(nfm->out_port); - fm.flags = ntohs(nfm->flags); - - /* Execute the command. */ - return flow_mod_core(ofconn, &fm); -} - -static int -handle_tun_id_from_cookie(struct ofconn *ofconn, struct nxt_tun_id_cookie *msg) -{ - int error; - - error = check_ofp_message(&msg->header, OFPT_VENDOR, sizeof *msg); - if (error) { - return error; - } + const struct nxt_tun_id_cookie *msg + = (const struct nxt_tun_id_cookie *) oh; ofconn->flow_format = msg->set ? NXFF_TUN_ID_FROM_COOKIE : NXFF_OPENFLOW10; return 0; } static int -handle_role_request(struct ofconn *ofconn, struct nicira_header *msg) +handle_role_request(struct ofconn *ofconn, const struct ofp_header *oh) { - struct nx_role_request *nrr; + struct nx_role_request *nrr = (struct nx_role_request *) oh; struct nx_role_request *reply; struct ofpbuf *buf; uint32_t role; - if (ntohs(msg->header.length) != sizeof *nrr) { - VLOG_WARN_RL(&rl, "received role request of length %u (expected %zu)", - ntohs(msg->header.length), sizeof *nrr); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - nrr = (struct nx_role_request *) msg; - if (ofconn->type != OFCONN_PRIMARY) { VLOG_WARN_RL(&rl, "ignoring role request on non-controller " "connection"); @@ -4328,8 +4147,7 @@ handle_role_request(struct ofconn *ofconn, struct nicira_header *msg) } ofconn->role = role; - reply = make_nxmsg_xid(sizeof *reply, NXT_ROLE_REPLY, msg->header.xid, - &buf); + reply = make_nxmsg_xid(sizeof *reply, NXT_ROLE_REPLY, oh->xid, &buf); reply->role = htonl(role); queue_tx(buf, ofconn, ofconn->reply_counter); @@ -4337,16 +4155,11 @@ handle_role_request(struct ofconn *ofconn, struct nicira_header *msg) } static int -handle_nxt_set_flow_format(struct ofconn *ofconn, - struct nxt_set_flow_format *msg) +handle_nxt_set_flow_format(struct ofconn *ofconn, const struct ofp_header *oh) { + const struct nxt_set_flow_format *msg + = (const struct nxt_set_flow_format *) oh; uint32_t format; - int error; - - error = check_ofp_message(&msg->header, OFPT_VENDOR, sizeof *msg); - if (error) { - return error; - } format = ntohl(msg->format); if (format == NXFF_OPENFLOW10 @@ -4360,52 +4173,7 @@ handle_nxt_set_flow_format(struct ofconn *ofconn, } static int -handle_vendor(struct ofconn *ofconn, void *msg) -{ - struct ofproto *p = ofconn->ofproto; - struct ofp_vendor_header *ovh = msg; - struct nicira_header *nh; - - if (ntohs(ovh->header.length) < sizeof(struct ofp_vendor_header)) { - VLOG_WARN_RL(&rl, "received vendor message of length %u " - "(expected at least %zu)", - ntohs(ovh->header.length), sizeof(struct ofp_vendor_header)); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - if (ovh->vendor != htonl(NX_VENDOR_ID)) { - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR); - } - if (ntohs(ovh->header.length) < sizeof(struct nicira_header)) { - VLOG_WARN_RL(&rl, "received Nicira vendor message of length %u " - "(expected at least %zu)", - ntohs(ovh->header.length), sizeof(struct nicira_header)); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - - nh = msg; - switch (ntohl(nh->subtype)) { - case NXT_STATUS_REQUEST: - return switch_status_handle_request(p->switch_status, ofconn->rconn, - msg); - - case NXT_TUN_ID_FROM_COOKIE: - return handle_tun_id_from_cookie(ofconn, msg); - - case NXT_ROLE_REQUEST: - return handle_role_request(ofconn, msg); - - case NXT_SET_FLOW_FORMAT: - return handle_nxt_set_flow_format(ofconn, msg); - - case NXT_FLOW_MOD: - return handle_nxt_flow_mod(ofconn, &ovh->header); - } - - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE); -} - -static int -handle_barrier_request(struct ofconn *ofconn, struct ofp_header *oh) +handle_barrier_request(struct ofconn *ofconn, const struct ofp_header *oh) { struct ofp_header *ob; struct ofpbuf *buf; @@ -4417,71 +4185,135 @@ handle_barrier_request(struct ofconn *ofconn, struct ofp_header *oh) return 0; } -static void -handle_openflow(struct ofconn *ofconn, struct ofpbuf *ofp_msg) +static int +handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg) { - struct ofp_header *oh = ofp_msg->data; + const struct ofp_header *oh = msg->data; + const struct ofputil_msg_type *type; int error; - COVERAGE_INC(ofproto_recv_openflow); - switch (oh->type) { - case OFPT_ECHO_REQUEST: - error = handle_echo_request(ofconn, oh); - break; + error = ofputil_decode_msg_type(oh, &type); + if (error) { + return error; + } - case OFPT_ECHO_REPLY: - error = 0; - break; + switch (ofputil_msg_type_code(type)) { + /* OpenFlow requests. */ + case OFPUTIL_OFPT_ECHO_REQUEST: + return handle_echo_request(ofconn, oh); - case OFPT_FEATURES_REQUEST: - error = handle_features_request(ofconn, oh); - break; + case OFPUTIL_OFPT_FEATURES_REQUEST: + return handle_features_request(ofconn, oh); - case OFPT_GET_CONFIG_REQUEST: - error = handle_get_config_request(ofconn, oh); - break; + case OFPUTIL_OFPT_GET_CONFIG_REQUEST: + return handle_get_config_request(ofconn, oh); - case OFPT_SET_CONFIG: - error = handle_set_config(ofconn, ofp_msg->data); - break; + case OFPUTIL_OFPT_SET_CONFIG: + return handle_set_config(ofconn, msg->data); - case OFPT_PACKET_OUT: - error = handle_packet_out(ofconn, ofp_msg->data); - break; + case OFPUTIL_OFPT_PACKET_OUT: + return handle_packet_out(ofconn, oh); - case OFPT_PORT_MOD: - error = handle_port_mod(ofconn, oh); - break; + case OFPUTIL_OFPT_PORT_MOD: + return handle_port_mod(ofconn, oh); - case OFPT_FLOW_MOD: - error = handle_ofpt_flow_mod(ofconn, ofp_msg->data); - break; + case OFPUTIL_OFPT_FLOW_MOD: + return handle_flow_mod(ofconn, oh); - case OFPT_STATS_REQUEST: - error = handle_stats_request(ofconn, oh); - break; - - case OFPT_VENDOR: - error = handle_vendor(ofconn, ofp_msg->data); - break; + case OFPUTIL_OFPT_BARRIER_REQUEST: + return handle_barrier_request(ofconn, oh); - case OFPT_BARRIER_REQUEST: - error = handle_barrier_request(ofconn, oh); - break; + /* OpenFlow replies. */ + case OFPUTIL_OFPT_ECHO_REPLY: + return 0; + /* Nicira extension requests. */ + case OFPUTIL_NXT_STATUS_REQUEST: + return switch_status_handle_request( + ofconn->ofproto->switch_status, ofconn->rconn, oh); + + case OFPUTIL_NXT_TUN_ID_FROM_COOKIE: + return handle_tun_id_from_cookie(ofconn, oh); + + case OFPUTIL_NXT_ROLE_REQUEST: + return handle_role_request(ofconn, oh); + + case OFPUTIL_NXT_SET_FLOW_FORMAT: + return handle_nxt_set_flow_format(ofconn, oh); + + case OFPUTIL_NXT_FLOW_MOD: + return handle_flow_mod(ofconn, oh); + + /* OpenFlow statistics requests. */ + case OFPUTIL_OFPST_DESC_REQUEST: + return handle_desc_stats_request(ofconn, oh); + + case OFPUTIL_OFPST_FLOW_REQUEST: + return handle_flow_stats_request(ofconn, oh); + + case OFPUTIL_OFPST_AGGREGATE_REQUEST: + return handle_aggregate_stats_request(ofconn, oh); + + case OFPUTIL_OFPST_TABLE_REQUEST: + return handle_table_stats_request(ofconn, oh); + + case OFPUTIL_OFPST_PORT_REQUEST: + return handle_port_stats_request(ofconn, oh); + + case OFPUTIL_OFPST_QUEUE_REQUEST: + return handle_queue_stats_request(ofconn, oh); + + /* Nicira extension statistics requests. */ + case OFPUTIL_NXST_FLOW_REQUEST: + return handle_nxst_flow(ofconn, oh); + + case OFPUTIL_NXST_AGGREGATE_REQUEST: + return handle_nxst_aggregate(ofconn, oh); + + case OFPUTIL_INVALID: + case OFPUTIL_OFPT_HELLO: + case OFPUTIL_OFPT_ERROR: + case OFPUTIL_OFPT_FEATURES_REPLY: + case OFPUTIL_OFPT_GET_CONFIG_REPLY: + case OFPUTIL_OFPT_PACKET_IN: + case OFPUTIL_OFPT_FLOW_REMOVED: + case OFPUTIL_OFPT_PORT_STATUS: + case OFPUTIL_OFPT_BARRIER_REPLY: + case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REQUEST: + case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REPLY: + case OFPUTIL_OFPST_DESC_REPLY: + case OFPUTIL_OFPST_FLOW_REPLY: + case OFPUTIL_OFPST_QUEUE_REPLY: + case OFPUTIL_OFPST_PORT_REPLY: + case OFPUTIL_OFPST_TABLE_REPLY: + case OFPUTIL_OFPST_AGGREGATE_REPLY: + case OFPUTIL_NXT_STATUS_REPLY: + case OFPUTIL_NXT_ROLE_REPLY: + case OFPUTIL_NXT_FLOW_REMOVED: + case OFPUTIL_NXST_FLOW_REPLY: + case OFPUTIL_NXST_AGGREGATE_REPLY: default: if (VLOG_IS_WARN_ENABLED()) { char *s = ofp_to_string(oh, ntohs(oh->length), 2); VLOG_DBG_RL(&rl, "OpenFlow message ignored: %s", s); free(s); } - error = ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE); - break; + if (oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT); + } else { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE); + } } +} +static void +handle_openflow(struct ofconn *ofconn, struct ofpbuf *ofp_msg) +{ + int error = handle_openflow__(ofconn, ofp_msg); if (error) { send_error_oh(ofconn, ofp_msg->data, error); } + COVERAGE_INC(ofproto_recv_openflow); } static void @@ -4492,19 +4324,23 @@ handle_odp_miss_msg(struct ofproto *p, struct ofpbuf *packet) struct facet *facet; struct flow flow; - payload.data = msg + 1; - payload.size = msg->length - sizeof *msg; + ofpbuf_use_const(&payload, msg + 1, msg->length - sizeof *msg); flow_extract(&payload, msg->arg, msg->port, &flow); + packet->l2 = payload.l2; + packet->l3 = payload.l3; + packet->l4 = payload.l4; + packet->l7 = payload.l7; + /* Check with in-band control to see if this packet should be sent * to the local port regardless of the flow table. */ if (in_band_msg_in_hook(p->in_band, &flow, &payload)) { - union odp_action action; + struct ofpbuf odp_actions; - memset(&action, 0, sizeof(action)); - action.output.type = ODPAT_OUTPUT; - action.output.port = ODPP_LOCAL; - dpif_execute(p->dpif, &action, 1, &payload); + ofpbuf_init(&odp_actions, 32); + nl_msg_put_u32(&odp_actions, ODPAT_OUTPUT, ODPP_LOCAL); + dpif_execute(p->dpif, odp_actions.data, odp_actions.size, &payload); + ofpbuf_uninit(&odp_actions); } facet = facet_lookup_valid(p, &flow); @@ -4588,14 +4424,9 @@ handle_odp_msg(struct ofproto *p, struct ofpbuf *packet) /* Flow expiration. */ -struct expire_cbdata { - struct ofproto *ofproto; - int dp_max_idle; -}; - static int ofproto_dp_max_idle(const struct ofproto *); static void ofproto_update_used(struct ofproto *); -static void rule_expire(struct cls_rule *, void *cbdata); +static void rule_expire(struct ofproto *, struct rule *); static void ofproto_expire_facets(struct ofproto *, int dp_max_idle); /* This function is called periodically by ofproto_run(). Its job is to @@ -4607,18 +4438,22 @@ static void ofproto_expire_facets(struct ofproto *, int dp_max_idle); static int ofproto_expire(struct ofproto *ofproto) { - struct expire_cbdata cbdata; + struct rule *rule, *next_rule; + struct cls_cursor cursor; + int dp_max_idle; /* Update 'used' for each flow in the datapath. */ ofproto_update_used(ofproto); /* Expire facets that have been idle too long. */ - cbdata.dp_max_idle = ofproto_dp_max_idle(ofproto); - ofproto_expire_facets(ofproto, cbdata.dp_max_idle); + dp_max_idle = ofproto_dp_max_idle(ofproto); + ofproto_expire_facets(ofproto, dp_max_idle); /* Expire OpenFlow flows whose idle_timeout or hard_timeout has passed. */ - cbdata.ofproto = ofproto; - classifier_for_each(&ofproto->cls, CLS_INC_ALL, rule_expire, &cbdata); + cls_cursor_init(&cursor, &ofproto->cls, NULL); + CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cr, &cursor) { + rule_expire(ofproto, rule); + } /* Let the hook know that we're at a stable point: all outstanding data * in existing flows has been accounted to the account_cb. Thus, the @@ -4628,7 +4463,7 @@ ofproto_expire(struct ofproto *ofproto) ofproto->ofhooks->account_checkpoint_cb(ofproto->aux); } - return MIN(cbdata.dp_max_idle, 1000); + return MIN(dp_max_idle, 1000); } /* Update 'used' member of installed facets. */ @@ -4807,15 +4642,11 @@ ofproto_expire_facets(struct ofproto *ofproto, int dp_max_idle) } } -/* If 'cls_rule' is an OpenFlow rule, that has expired according to OpenFlow - * rules, then delete it entirely. - * - * (This is a callback function for classifier_for_each().) */ +/* If 'rule' is an OpenFlow rule, that has expired according to OpenFlow rules, + * then delete it entirely. */ static void -rule_expire(struct cls_rule *cls_rule, void *cbdata_) +rule_expire(struct ofproto *ofproto, struct rule *rule) { - struct expire_cbdata *cbdata = cbdata_; - struct rule *rule = rule_from_cls_rule(cls_rule); struct facet *facet, *next_facet; long long int now; uint8_t reason; @@ -4837,14 +4668,14 @@ rule_expire(struct cls_rule *cls_rule, void *cbdata_) /* Update stats. (This is a no-op if the rule expired due to an idle * timeout, because that only happens when the rule has no facets left.) */ LIST_FOR_EACH_SAFE (facet, next_facet, list_node, &rule->facets) { - facet_remove(cbdata->ofproto, facet); + facet_remove(ofproto, facet); } /* Get rid of the rule. */ if (!rule_is_hidden(rule)) { - rule_send_removed(cbdata->ofproto, rule, reason); + rule_send_removed(ofproto, rule, reason); } - rule_remove(cbdata->ofproto, rule); + rule_remove(ofproto, rule); } static struct ofpbuf * @@ -4854,10 +4685,9 @@ compose_ofp_flow_removed(struct ofconn *ofconn, const struct rule *rule, struct ofp_flow_removed *ofr; struct ofpbuf *buf; - ofr = make_openflow(sizeof *ofr, OFPT_FLOW_REMOVED, &buf); - flow_to_match(&rule->cr.flow, rule->cr.wc.wildcards, ofconn->flow_format, - &ofr->match); - ofr->cookie = rule->flow_cookie; + ofr = make_openflow_xid(sizeof *ofr, OFPT_FLOW_REMOVED, htonl(0), &buf); + ofputil_cls_rule_to_match(&rule->cr, ofconn->flow_format, &ofr->match, + rule->flow_cookie, &ofr->cookie); ofr->priority = htons(rule->cr.priority); ofr->reason = reason; calc_flow_duration(rule->created, &ofr->duration_sec, &ofr->duration_nsec); @@ -4875,10 +4705,10 @@ compose_nx_flow_removed(const struct rule *rule, uint8_t reason) struct ofpbuf *buf; int match_len; - nfr = make_nxmsg(sizeof *nfr, NXT_FLOW_REMOVED, &buf); - + make_nxmsg_xid(sizeof *nfr, NXT_FLOW_REMOVED, htonl(0), &buf); match_len = nx_put_match(buf, &rule->cr); + nfr = buf->data; nfr->cookie = rule->flow_cookie; nfr->priority = htons(rule->cr.priority); nfr->reason = reason; @@ -4959,8 +4789,9 @@ schedule_packet_in(struct ofconn *ofconn, struct ofpbuf *packet, int max_len, buffer_id = UINT32_MAX; } else { struct ofpbuf payload; - payload.data = opi->data; - payload.size = packet->size - offsetof(struct ofp_packet_in, data); + + ofpbuf_use_const(&payload, opi->data, + packet->size - offsetof(struct ofp_packet_in, data)); buffer_id = pktbuf_save(ofconn->pktbuf, &payload, in_port); } @@ -5095,9 +4926,177 @@ pick_fallback_dpid(void) return eth_addr_to_uint64(ea); } +static void +ofproto_unixctl_list(struct unixctl_conn *conn, const char *arg OVS_UNUSED, + void *aux OVS_UNUSED) +{ + const struct shash_node *node; + struct ds results; + + ds_init(&results); + SHASH_FOR_EACH (node, &all_ofprotos) { + ds_put_format(&results, "%s\n", node->name); + } + unixctl_command_reply(conn, 200, ds_cstr(&results)); + ds_destroy(&results); +} + +struct ofproto_trace { + struct action_xlate_ctx ctx; + struct flow flow; + struct ds *result; +}; + +static void +trace_format_rule(struct ds *result, int level, const struct rule *rule) +{ + ds_put_char_multiple(result, '\t', level); + if (!rule) { + ds_put_cstr(result, "No match\n"); + return; + } + + ds_put_format(result, "Rule: cookie=%#"PRIx64" ", + ntohll(rule->flow_cookie)); + cls_rule_format(&rule->cr, result); + ds_put_char(result, '\n'); + + ds_put_char_multiple(result, '\t', level); + ds_put_cstr(result, "OpenFlow "); + ofp_print_actions(result, (const struct ofp_action_header *) rule->actions, + rule->n_actions * sizeof *rule->actions); + ds_put_char(result, '\n'); +} + +static void +trace_format_flow(struct ds *result, int level, const char *title, + struct ofproto_trace *trace) +{ + ds_put_char_multiple(result, '\t', level); + ds_put_format(result, "%s: ", title); + if (flow_equal(&trace->ctx.flow, &trace->flow)) { + ds_put_cstr(result, "unchanged"); + } else { + flow_format(result, &trace->ctx.flow); + trace->flow = trace->ctx.flow; + } + ds_put_char(result, '\n'); +} + +static void +trace_resubmit(struct action_xlate_ctx *ctx, const struct rule *rule) +{ + struct ofproto_trace *trace = CONTAINER_OF(ctx, struct ofproto_trace, ctx); + struct ds *result = trace->result; + + ds_put_char(result, '\n'); + trace_format_flow(result, ctx->recurse + 1, "Resubmitted flow", trace); + trace_format_rule(result, ctx->recurse + 1, rule); +} + +static void +ofproto_unixctl_trace(struct unixctl_conn *conn, const char *args_, + void *aux OVS_UNUSED) +{ + char *dpname, *in_port_s, *tun_id_s, *packet_s; + char *args = xstrdup(args_); + char *save_ptr = NULL; + struct ofproto *ofproto; + struct ofpbuf packet; + struct rule *rule; + struct ds result; + struct flow flow; + uint16_t in_port; + ovs_be32 tun_id; + char *s; + + ofpbuf_init(&packet, strlen(args) / 2); + ds_init(&result); + + dpname = strtok_r(args, " ", &save_ptr); + tun_id_s = strtok_r(NULL, " ", &save_ptr); + in_port_s = strtok_r(NULL, " ", &save_ptr); + packet_s = strtok_r(NULL, "", &save_ptr); /* Get entire rest of line. */ + if (!dpname || !in_port_s || !packet_s) { + unixctl_command_reply(conn, 501, "Bad command syntax"); + goto exit; + } + + ofproto = shash_find_data(&all_ofprotos, dpname); + if (!ofproto) { + unixctl_command_reply(conn, 501, "Unknown ofproto (use ofproto/list " + "for help)"); + goto exit; + } + + tun_id = ntohl(strtoul(tun_id_s, NULL, 10)); + in_port = ofp_port_to_odp_port(atoi(in_port_s)); + + packet_s = ofpbuf_put_hex(&packet, packet_s, NULL); + packet_s += strspn(packet_s, " "); + if (*packet_s != '\0') { + unixctl_command_reply(conn, 501, "Trailing garbage in command"); + goto exit; + } + if (packet.size < ETH_HEADER_LEN) { + unixctl_command_reply(conn, 501, "Packet data too short for Ethernet"); + goto exit; + } + + ds_put_cstr(&result, "Packet: "); + s = ofp_packet_to_string(packet.data, packet.size, packet.size); + ds_put_cstr(&result, s); + free(s); + + flow_extract(&packet, tun_id, in_port, &flow); + ds_put_cstr(&result, "Flow: "); + flow_format(&result, &flow); + ds_put_char(&result, '\n'); + + rule = rule_lookup(ofproto, &flow); + trace_format_rule(&result, 0, rule); + if (rule) { + struct ofproto_trace trace; + struct ofpbuf *odp_actions; + + trace.result = &result; + trace.flow = flow; + action_xlate_ctx_init(&trace.ctx, ofproto, &flow, &packet); + trace.ctx.resubmit_hook = trace_resubmit; + odp_actions = xlate_actions(&trace.ctx, + rule->actions, rule->n_actions); + + ds_put_char(&result, '\n'); + trace_format_flow(&result, 0, "Final flow", &trace); + ds_put_cstr(&result, "Datapath actions: "); + format_odp_actions(&result, odp_actions->data, odp_actions->size); + ofpbuf_delete(odp_actions); + } + + unixctl_command_reply(conn, 200, ds_cstr(&result)); + +exit: + ds_destroy(&result); + ofpbuf_uninit(&packet); + free(args); +} + +static void +ofproto_unixctl_init(void) +{ + static bool registered; + if (registered) { + return; + } + registered = true; + + unixctl_command_register("ofproto/list", ofproto_unixctl_list, NULL); + unixctl_command_register("ofproto/trace", ofproto_unixctl_trace, NULL); +} + static bool default_normal_ofhook_cb(const struct flow *flow, const struct ofpbuf *packet, - struct odp_actions *actions, tag_type *tags, + struct ofpbuf *odp_actions, tag_type *tags, uint16_t *nf_output_iface, void *ofproto_) { struct ofproto *ofproto = ofproto_; @@ -5128,9 +5127,9 @@ default_normal_ofhook_cb(const struct flow *flow, const struct ofpbuf *packet, NULL); if (out_port < 0) { flood_packets(ofproto, flow->in_port, OFPPC_NO_FLOOD, - nf_output_iface, actions); + nf_output_iface, odp_actions); } else if (out_port != flow->in_port) { - odp_actions_add(actions, ODPAT_OUTPUT)->output.port = out_port; + nl_msg_put_u32(odp_actions, ODPAT_OUTPUT, out_port); *nf_output_iface = out_port; } else { /* Drop. */