/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
* Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
*
* Licensed under the Apache License, Version 2.0 (the "License");
#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"
/* xlate_actions() initializes and uses these members. The client might want
* to look at them after it returns. */
- /* Datapath action set. This is xlate_actions()'s primary output. */
- struct odp_actions out;
-
+ 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. */
* 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 int xlate_actions(struct action_xlate_ctx *ctx,
- const union ofp_action *in, size_t n_in);
+static struct ofpbuf *xlate_actions(struct action_xlate_ctx *,
+ const union ofp_action *in, size_t n_in);
/* An OpenFlow flow. */
struct rule {
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. */
};
return !hmap_is_empty(&p->controllers);
}
+void
+ofproto_get_ofproto_controller_info(const struct ofproto * ofproto,
+ struct shash *info)
+{
+ const struct ofconn *ofconn;
+
+ shash_init(info);
+
+ HMAP_FOR_EACH (ofconn, hmap_node, &ofproto->controllers) {
+ const struct rconn *rconn = ofconn->rconn;
+ const int last_error = rconn_get_last_error(rconn);
+ struct ofproto_controller_info *cinfo = xmalloc(sizeof *cinfo);
+
+ shash_add(info, rconn_get_target(rconn), cinfo);
+
+ cinfo->is_connected = rconn_is_connected(rconn);
+ cinfo->role = ofconn->role;
+
+ cinfo->pairs.n = 0;
+
+ if (last_error == EOF) {
+ cinfo->pairs.keys[cinfo->pairs.n] = "last_error";
+ cinfo->pairs.values[cinfo->pairs.n++] = xstrdup("End of file");
+ } else if (last_error > 0) {
+ cinfo->pairs.keys[cinfo->pairs.n] = "last_error";
+ cinfo->pairs.values[cinfo->pairs.n++] =
+ xstrdup(strerror(last_error));
+ }
+
+ cinfo->pairs.keys[cinfo->pairs.n] = "state";
+ cinfo->pairs.values[cinfo->pairs.n++] =
+ xstrdup(rconn_get_state(rconn));
+
+ cinfo->pairs.keys[cinfo->pairs.n] = "time_in_state";
+ cinfo->pairs.values[cinfo->pairs.n++] =
+ xasprintf("%u", rconn_get_state_elapsed(rconn));
+ }
+}
+
+void
+ofproto_free_ofproto_controller_info(struct shash *info)
+{
+ struct shash_node *node;
+
+ SHASH_FOR_EACH (node, info) {
+ struct ofproto_controller_info *cinfo = node->data;
+ while (cinfo->pairs.n) {
+ free((char *) cinfo->pairs.values[--cinfo->pairs.n]);
+ }
+ free(cinfo);
+ }
+ shash_destroy(info);
+}
+
/* Deletes port number 'odp_port' from the datapath for 'ofproto'.
*
* This is almost the same as calling dpif_port_del() directly on the
const struct ofpbuf *packet)
{
struct action_xlate_ctx ctx;
- int error;
+ struct ofpbuf *odp_actions;
action_xlate_ctx_init(&ctx, p, flow, packet);
- error = xlate_actions(&ctx, actions, n_actions);
- if (error) {
- return error;
- }
+ 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, ctx.out.actions, ctx.out.n_actions, packet);
+ dpif_execute(p->dpif, odp_actions->data, odp_actions->size, packet);
+
+ ofpbuf_delete(odp_actions);
+
return 0;
}
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;
COVERAGE_INC(ofproto_reinit_ports);
- svec_init(&devnames);
+ shash_init(&devnames);
HMAP_FOR_EACH (ofport, hmap_node, &p->ports) {
- svec_add (&devnames, 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 *
* 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. */
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);
} 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;
}
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,
struct ofpbuf *packet)
{
struct action_xlate_ctx ctx;
+ struct ofpbuf *odp_actions;
struct facet *facet;
struct flow flow;
size_t size;
/* 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. */
action_xlate_ctx_init(&ctx, ofproto, &flow, packet);
- if (xlate_actions(&ctx, rule->actions, rule->n_actions)) {
- ofpbuf_delete(packet);
- return;
- }
-
+ odp_actions = xlate_actions(&ctx, rule->actions, rule->n_actions);
size = packet->size;
- if (execute_odp_actions(ofproto, in_port,
- ctx.out.actions, ctx.out.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. */
const struct ofpbuf *packet)
{
const struct rule *rule = facet->rule;
+ struct ofpbuf *odp_actions;
struct action_xlate_ctx ctx;
- size_t actions_len;
action_xlate_ctx_init(&ctx, p, &facet->flow, packet);
- xlate_actions(&ctx, rule->actions, rule->n_actions);
+ 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 = ctx.out.n_actions * sizeof *ctx.out.actions;
- if (facet->n_actions != ctx.out.n_actions
- || memcmp(facet->actions, ctx.out.actions, actions_len)) {
+ if (facet->actions_len != odp_actions->size
+ || memcmp(facet->actions, odp_actions->data, odp_actions->size)) {
free(facet->actions);
- facet->n_actions = ctx.out.n_actions;
- facet->actions = xmemdup(ctx.out.actions, actions_len);
+ facet->actions_len = odp_actions->size;
+ facet->actions = xmemdup(odp_actions->data, odp_actions->size);
}
+
+ ofpbuf_delete(odp_actions);
}
static int
facet_put__(struct ofproto *ofproto, struct facet *facet, int flags,
struct odp_flow_put *put)
{
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
+ struct ofpbuf key;
+
+ ofpbuf_use_stack(&key, keybuf, sizeof keybuf);
+ odp_flow_key_from_flow(&key, &facet->flow);
+ assert(key.base == keybuf);
+
memset(&put->flow.stats, 0, sizeof put->flow.stats);
- odp_flow_key_from_flow(&put->flow.key, &facet->flow);
+ put->flow.key = key.data;
+ put->flow.key_len = key.size;
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);
&& 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;
}
facet_uninstall(struct ofproto *p, struct facet *facet)
{
if (facet->installed) {
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
struct odp_flow odp_flow;
+ struct ofpbuf key;
- odp_flow_key_from_flow(&odp_flow.key, &facet->flow);
+ ofpbuf_use_stack(&key, keybuf, sizeof keybuf);
+ odp_flow_key_from_flow(&key, &facet->flow);
+ assert(key.base == keybuf);
+
+ odp_flow.key = key.data;
+ odp_flow.key_len = key.size;
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_revalidate(struct ofproto *ofproto, struct facet *facet)
{
struct action_xlate_ctx ctx;
+ struct ofpbuf *odp_actions;
struct rule *new_rule;
- size_t actions_len;
bool actions_changed;
COVERAGE_INC(facet_revalidate);
/* Calculate new ODP actions.
*
- * We are very cautious about actually modifying 'facet' state at this
- * point, 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. */
+ * 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);
- xlate_actions(&ctx, new_rule->actions, new_rule->n_actions);
- actions_len = ctx.out.n_actions * sizeof *ctx.out.actions;
- actions_changed = (facet->n_actions != ctx.out.n_actions
- || memcmp(facet->actions, ctx.out.actions,
- actions_len));
+ 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) {
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
struct odp_flow_put put;
+ struct ofpbuf key;
+
+ ofpbuf_use_stack(&key, keybuf, sizeof keybuf);
+ odp_flow_key_from_flow(&key, &facet->flow);
memset(&put.flow.stats, 0, sizeof put.flow.stats);
- odp_flow_key_from_flow(&put.flow.key, &facet->flow);
- put.flow.actions = ctx.out.actions;
- put.flow.n_actions = ctx.out.n_actions;
+ put.flow.key = key.data;
+ put.flow.key_len = key.size;
+ 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->may_install = ctx.may_set_up_flow;
if (actions_changed) {
free(facet->actions);
- facet->n_actions = ctx.out.n_actions;
- facet->actions = xmemdup(ctx.out.actions, actions_len);
+ 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);
facet->used = new_rule->created;
}
+ ofpbuf_delete(odp_actions);
+
return true;
}
\f
send_error_oh(const struct ofconn *ofconn, const struct ofp_header *oh,
int error)
{
- struct ofpbuf *buf = make_ofp_error_msg(error, oh);
+ struct ofpbuf *buf = ofputil_encode_error_msg(error, oh);
if (buf) {
COVERAGE_INC(ofproto_error);
queue_tx(buf, ofconn, ofconn->reply_counter);
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;
-}
-
/* Maximum depth of flow table recursion (due to NXAST_RESUBMIT actions) in a
* flow translation. */
-#define MAX_RESUBMIT_RECURSION 8
+#define MAX_RESUBMIT_RECURSION 16
static void do_xlate_actions(const union ofp_action *in, size_t n_in,
struct action_xlate_ctx *ctx);
*/
}
- 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;
}
ctx->recurse--;
}
} else {
- struct vlog_rate_limit recurse_rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ static struct vlog_rate_limit recurse_rl = VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_ERR_RL(&recurse_rl, "NXAST_RESUBMIT recursed over %d times",
MAX_RESUBMIT_RECURSION);
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;
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);
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);
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;
}
}
/* 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) {
}
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
{
ovs_be16 tci = ctx->flow.vlan_tci;
if (!(tci & htons(VLAN_CFI))) {
- odp_actions_add(&ctx->out, ODPAT_STRIP_VLAN);
+ 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 = tci & ~htons(VLAN_CFI);
+ nl_msg_put_be16(ctx->odp_actions, ODPAT_SET_DL_TCI,
+ tci & ~htons(VLAN_CFI));
}
}
+struct xlate_reg_state {
+ ovs_be16 vlan_tci;
+ ovs_be64 tun_id;
+};
+
static void
-xlate_reg_move_action(struct action_xlate_ctx *ctx,
- const struct nx_action_reg_move *narm)
+save_reg_state(const struct action_xlate_ctx *ctx,
+ struct xlate_reg_state *state)
{
- ovs_be16 old_tci = ctx->flow.vlan_tci;
-
- nxm_execute_reg_move(narm, &ctx->flow);
+ state->vlan_tci = ctx->flow.vlan_tci;
+ state->tun_id = ctx->flow.tun_id;
+}
- if (ctx->flow.vlan_tci != old_tci) {
+static void
+update_reg_state(struct action_xlate_ctx *ctx,
+ const struct xlate_reg_state *state)
+{
+ if (ctx->flow.vlan_tci != state->vlan_tci) {
xlate_set_dl_tci(ctx);
}
+ if (ctx->flow.tun_id != state->tun_id) {
+ nl_msg_put_be64(ctx->odp_actions, ODPAT_SET_TUNNEL, ctx->flow.tun_id);
+ }
}
static void
const struct nx_action_resubmit *nar;
const struct nx_action_set_tunnel *nast;
const struct nx_action_set_queue *nasq;
- union odp_action *oa;
+ const struct nx_action_multipath *nam;
enum nx_action_subtype subtype = ntohs(nah->subtype);
+ struct xlate_reg_state state;
+ ovs_be64 tun_id;
assert(nah->vendor == htonl(NX_VENDOR_ID));
switch (subtype) {
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;
break;
case NXAST_POP_QUEUE:
- odp_actions_add(&ctx->out, ODPAT_POP_PRIORITY);
+ add_pop_action(ctx);
break;
case NXAST_REG_MOVE:
- xlate_reg_move_action(ctx, (const struct nx_action_reg_move *) nah);
+ save_reg_state(ctx, &state);
+ nxm_execute_reg_move((const struct nx_action_reg_move *) nah,
+ &ctx->flow);
+ update_reg_state(ctx, &state);
break;
case NXAST_REG_LOAD:
+ save_reg_state(ctx, &state);
nxm_execute_reg_load((const struct nx_action_reg_load *) nah,
&ctx->flow);
+ update_reg_state(ctx, &state);
+ break;
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. */
for (ia = actions_first(&iter, in, n_in); ia; ia = actions_next(&iter)) {
enum ofp_action_type type = ntohs(ia->type);
- union odp_action *oa;
+ const struct ofp_action_dl_addr *oada;
switch (type) {
case OFPAT_OUTPUT:
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:
ctx->resubmit_hook = NULL;
}
-static int
+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(&ctx->out);
+
+ 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(ctx->ofproto->in_band, &ctx->flow, &ctx->out)) {
+ 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 (odp_actions_overflow(&ctx->out)) {
- COVERAGE_INC(odp_overflow);
- odp_actions_init(&ctx->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
struct ofpbuf payload, *buffer;
union ofp_action *ofp_actions;
struct action_xlate_ctx ctx;
+ struct ofpbuf *odp_actions;
struct ofpbuf request;
struct flow flow;
size_t n_ofp_actions;
/* Send. */
action_xlate_ctx_init(&ctx, p, &flow, &payload);
- error = xlate_actions(&ctx, ofp_actions, n_ofp_actions);
- if (!error) {
- dpif_execute(p->dpif, ctx.out.actions, ctx.out.n_actions, &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);
nsm->type = htons(OFPST_VENDOR);
nsm->flags = htons(0);
nsm->vendor = htonl(NX_VENDOR_ID);
- nsm->subtype = htonl(subtype);
+ nsm->subtype = subtype;
return msg;
}
query_stats(struct ofproto *p, struct rule *rule,
uint64_t *packet_countp, uint64_t *byte_countp)
{
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
uint64_t packet_count, byte_count;
struct facet *facet;
- struct odp_flow *odp_flows;
- size_t n_odp_flows;
+ struct ofpbuf key;
/* Start from historical data for 'rule' itself that are no longer tracked
* by the datapath. This counts, for example, facets that have expired. */
packet_count = rule->packet_count;
byte_count = rule->byte_count;
- /* Prepare to ask the datapath for statistics on all of the rule's facets.
+ /* Ask the datapath for statistics on all of the rule's facets. (We could
+ * batch up statistics requests using dpif_flow_get_multiple(), but that is
+ * not yet implemented.)
*
* Also, add any statistics that are not tracked by the datapath for each
* facet. This includes, for example, statistics for packets that were
* executed "by hand" by ofproto via dpif_execute() but must be accounted
* to a rule. */
- odp_flows = xzalloc(list_size(&rule->facets) * sizeof *odp_flows);
- n_odp_flows = 0;
+ ofpbuf_use_stack(&key, keybuf, sizeof keybuf);
LIST_FOR_EACH (facet, list_node, &rule->facets) {
- struct odp_flow *odp_flow = &odp_flows[n_odp_flows++];
- odp_flow_key_from_flow(&odp_flow->key, &facet->flow);
- packet_count += facet->packet_count;
- byte_count += facet->byte_count;
- }
+ struct odp_flow odp_flow;
- /* Fetch up-to-date statistics from the datapath and add them in. */
- if (!dpif_flow_get_multiple(p->dpif, odp_flows, n_odp_flows)) {
- size_t i;
+ ofpbuf_clear(&key);
+ odp_flow_key_from_flow(&key, &facet->flow);
- for (i = 0; i < n_odp_flows; i++) {
- struct odp_flow *odp_flow = &odp_flows[i];
- packet_count += odp_flow->stats.n_packets;
- byte_count += odp_flow->stats.n_bytes;
+ odp_flow.key = key.data;
+ odp_flow.key_len = key.size;
+ odp_flow.actions = NULL;
+ odp_flow.actions_len = 0;
+ odp_flow.flags = 0;
+ if (!dpif_flow_get(p->dpif, &odp_flow)) {
+ packet_count += odp_flow.stats.n_packets;
+ byte_count += odp_flow.stats.n_bytes;
}
+
+ packet_count += facet->packet_count;
+ byte_count += facet->byte_count;
}
- free(odp_flows);
/* Return the stats to the caller. */
*packet_countp = packet_count;
ofs->length = htons(len);
ofs->table_id = 0;
ofs->pad = 0;
- ofputil_cls_rule_to_match(&rule->cr, 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);
act_len = sizeof *rule->actions * rule->n_actions;
- start_len = (*replyp)->size;
append_nxstats_reply(sizeof *nfs + NXM_MAX_LEN + act_len, ofconn, replyp);
+ start_len = (*replyp)->size;
reply = *replyp;
nfs = ofpbuf_put_uninit(reply, sizeof *nfs);
static void
flow_stats_ds(struct ofproto *ofproto, struct rule *rule, struct ds *results)
{
- struct ofp_match match;
uint64_t packet_count, byte_count;
size_t act_len = sizeof *rule->actions * rule->n_actions;
query_stats(ofproto, rule, &packet_count, &byte_count);
- ofputil_cls_rule_to_match(&rule->cr, NXFF_OPENFLOW10, &match);
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 {
/* 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);
static void
ofproto_update_used(struct ofproto *p)
{
- struct odp_flow *flows;
- size_t n_flows;
- size_t i;
- int error;
-
- error = dpif_flow_list_all(p->dpif, &flows, &n_flows);
- if (error) {
- return;
- }
+ struct dpif_flow_dump dump;
- for (i = 0; i < n_flows; i++) {
- struct odp_flow *f = &flows[i];
+ dpif_flow_dump_start(&dump, p->dpif);
+ for (;;) {
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
struct facet *facet;
+ struct odp_flow f;
struct flow flow;
- odp_flow_key_to_flow(&f->key, &flow);
+ memset(&f, 0, sizeof f);
+ f.key = (struct nlattr *) keybuf;
+ f.key_len = sizeof keybuf;
+ if (!dpif_flow_dump_next(&dump, &f)) {
+ break;
+ }
+
+ if (f.key_len > sizeof keybuf) {
+ VLOG_WARN_RL(&rl, "ODP flow key overflowed buffer");
+ continue;
+ }
+ if (odp_flow_key_to_flow(f.key, f.key_len, &flow)) {
+ struct ds s;
+
+ ds_init(&s);
+ odp_flow_key_format(f.key, f.key_len, &s);
+ VLOG_WARN_RL(&rl, "failed to convert ODP flow key to flow: %s",
+ ds_cstr(&s));
+ ds_destroy(&s);
+
+ continue;
+ }
facet = facet_find(p, &flow);
if (facet && facet->installed) {
- facet_update_time(p, facet, &f->stats);
- facet_account(p, facet, f->stats.n_bytes);
+ facet_update_time(p, facet, &f.stats);
+ facet_account(p, facet, f.stats.n_bytes);
} else {
/* There's a flow in the datapath that we know nothing about.
* Delete it. */
COVERAGE_INC(ofproto_unexpected_rule);
- dpif_flow_del(p->dpif, f);
+ dpif_flow_del(p->dpif, &f);
}
-
}
- free(flows);
+ dpif_flow_dump_done(&dump);
}
/* Calculates and returns the number of milliseconds of idle time after which
* ofproto_update_used() zeroed TCP flags. */
memset(&odp_flow, 0, sizeof odp_flow);
if (facet->installed) {
- odp_flow_key_from_flow(&odp_flow.key, &facet->flow);
+ uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
+ struct ofpbuf key;
+
+ ofpbuf_use_stack(&key, keybuf, sizeof keybuf);
+ odp_flow_key_from_flow(&key, &facet->flow);
+
+ odp_flow.key = key.data;
+ odp_flow.key_len = key.size;
odp_flow.flags = ODPFF_ZERO_TCP_FLAGS;
dpif_flow_get(ofproto->dpif, &odp_flow);
struct ofp_flow_removed *ofr;
struct ofpbuf *buf;
- ofr = make_openflow(sizeof *ofr, OFPT_FLOW_REMOVED, &buf);
- ofputil_cls_rule_to_match(&rule->cr, 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);
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;
struct ds result;
struct flow flow;
uint16_t in_port;
- ovs_be32 tun_id;
+ ovs_be64 tun_id;
char *s;
ofpbuf_init(&packet, strlen(args) / 2);
goto exit;
}
- tun_id = ntohl(strtoul(tun_id_s, NULL, 10));
+ tun_id = htonll(strtoull(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);
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;
- xlate_actions(&trace.ctx, rule->actions, rule->n_actions);
+ 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,
- trace.ctx.out.actions, trace.ctx.out.n_actions);
+ format_odp_actions(&result, odp_actions->data, odp_actions->size);
+ ofpbuf_delete(odp_actions);
}
unixctl_command_reply(conn, 200, ds_cstr(&result));
\f
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_;
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. */