static struct xbridge *xbridge_lookup(struct xlate_cfg *,
const struct ofproto_dpif *);
+static struct xbridge *xbridge_lookup_by_uuid(struct xlate_cfg *,
+ const struct uuid *);
static struct xbundle *xbundle_lookup(struct xlate_cfg *,
const struct ofbundle *);
static struct xport *xport_lookup(struct xlate_cfg *,
return NULL;
}
+static struct xbridge *
+xbridge_lookup_by_uuid(struct xlate_cfg *xcfg, const struct uuid *uuid)
+{
+ struct xbridge *xbridge;
+
+ HMAP_FOR_EACH (xbridge, hmap_node, &xcfg->xbridges) {
+ if (uuid_equals(ofproto_dpif_get_uuid(xbridge->ofproto), uuid)) {
+ return xbridge;
+ }
+ }
+ return NULL;
+}
+
static struct xbundle *
xbundle_lookup(struct xlate_cfg *xcfg, const struct ofbundle *ofbundle)
{
struct recirc_state state = {
.table_id = table,
- .ofproto = ctx->xbridge->ofproto,
+ .ofproto_uuid = *ofproto_dpif_get_uuid(ctx->xbridge->ofproto),
.metadata = md,
.stack = ctx->stack.data,
.n_stack = ctx->stack.size / sizeof(union mf_subvalue),
.mirrors = ctx->mirrors,
.conntracked = ctx->conntracked,
+ .ofpacts = ((struct ofpact *) ctx->action_set.data
+ + ctx->recirc_action_offset / sizeof(struct ofpact)),
+ .ofpacts_len = ctx->action_set.size - ctx->recirc_action_offset,
+ .action_set = ctx->action_set.data,
.action_set_len = ctx->recirc_action_offset,
- .ofpacts_len = ctx->action_set.size,
- .ofpacts = ctx->action_set.data,
};
/* Allocate a unique recirc id for the given metadata state in the
}
static void
-xlate_write_actions(struct xlate_ctx *ctx, const struct ofpact *a)
+xlate_write_actions__(struct xlate_ctx *ctx,
+ const struct ofpact *ofpacts, size_t ofpacts_len)
{
- const struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a);
- size_t on_len = ofpact_nest_get_action_len(on);
- const struct ofpact *inner;
-
/* Maintain actset_output depending on the contents of the action set:
*
* - OFPP_UNSET, if there is no "output" action.
* - OFPP_UNSET, if there is a "group" action.
*/
if (!ctx->action_set_has_group) {
- OFPACT_FOR_EACH (inner, on->actions, on_len) {
- if (inner->type == OFPACT_OUTPUT) {
- ctx->xin->flow.actset_output = ofpact_get_OUTPUT(inner)->port;
- } else if (inner->type == OFPACT_GROUP) {
+ const struct ofpact *a;
+ OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
+ if (a->type == OFPACT_OUTPUT) {
+ ctx->xin->flow.actset_output = ofpact_get_OUTPUT(a)->port;
+ } else if (a->type == OFPACT_GROUP) {
ctx->xin->flow.actset_output = OFPP_UNSET;
ctx->action_set_has_group = true;
break;
}
}
- ofpbuf_put(&ctx->action_set, on->actions, on_len);
+ ofpbuf_put(&ctx->action_set, ofpacts, ofpacts_len);
+}
+
+static void
+xlate_write_actions(struct xlate_ctx *ctx, const struct ofpact_nest *a)
+{
+ xlate_write_actions__(ctx, a->actions, ofpact_nest_get_action_len(a));
}
static void
/* Copy remaining actions to the action_set to be executed after recirculation.
* UNROLL_XLATE action is inserted, if not already done so, before actions that
- * may generate asynchronous messages from the current table and without
- * matching another rule. */
+ * may depend on the current table ID or flow cookie. */
static void
recirc_unroll_actions(const struct ofpact *ofpacts, size_t ofpacts_len,
struct xlate_ctx *ctx)
OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) {
switch (a->type) {
- /* May generate asynchronous messages. */
case OFPACT_OUTPUT_REG:
case OFPACT_GROUP:
case OFPACT_OUTPUT:
case OFPACT_CONTROLLER:
case OFPACT_DEC_MPLS_TTL:
case OFPACT_DEC_TTL:
+ /* These actions may generate asynchronous messages, which include
+ * table ID and flow cookie information. */
recirc_put_unroll_xlate(ctx);
break;
- /* These may not generate PACKET INs. */
+ case OFPACT_RESUBMIT:
+ if (ofpact_get_RESUBMIT(a)->table_id == 0xff) {
+ /* This resubmit action is relative to the current table, so we
+ * need to track what table that is.*/
+ recirc_put_unroll_xlate(ctx);
+ }
+ break;
+
case OFPACT_SET_TUNNEL:
case OFPACT_REG_MOVE:
case OFPACT_SET_FIELD:
case OFPACT_STACK_POP:
case OFPACT_LEARN:
case OFPACT_WRITE_METADATA:
- case OFPACT_RESUBMIT: /* May indirectly generate PACKET INs, */
- case OFPACT_GOTO_TABLE: /* but from a different table and rule. */
+ case OFPACT_GOTO_TABLE:
case OFPACT_ENQUEUE:
case OFPACT_SET_VLAN_VID:
case OFPACT_SET_VLAN_PCP:
case OFPACT_DEBUG_RECIRC:
case OFPACT_CT:
case OFPACT_NAT:
+ /* These may not generate PACKET INs. */
break;
- /* These need not be copied for restoration. */
case OFPACT_NOTE:
case OFPACT_CONJUNCTION:
+ /* These need not be copied for restoration. */
continue;
}
/* Copy the action over. */
break;
case OFPACT_RESUBMIT:
+ /* Recirculation complicates resubmit. There are two cases:
+ *
+ * - If mpls_pop has been executed, then the flow table lookup
+ * as part of resubmit might depend on fields that can only
+ * be obtained via recirculation, so the resubmit itself
+ * triggers recirculation and we need to make sure that the
+ * resubmit is executed again after recirculation.
+ * Therefore, in this case we trigger recirculation and let
+ * the code following this "switch" append the resubmit to
+ * the post-recirculation actions.
+ *
+ * - Otherwise, some action in the flow entry found by resubmit
+ * might trigger recirculation. If that happens, then we do
+ * not want to execute the resubmit again after
+ * recirculation, so we want to skip back to the head of the
+ * loop to avoid that, only adding any actions that follow
+ * the resubmit to the post-recirculation actions.
+ */
+ if (ctx->was_mpls) {
+ ctx_trigger_recirculation(ctx);
+ break;
+ }
xlate_ofpact_resubmit(ctx, ofpact_get_RESUBMIT(a));
- break;
+ continue;
case OFPACT_SET_TUNNEL:
flow->tunnel.tun_id = htonll(ofpact_get_SET_TUNNEL(a)->tun_id);
break;
case OFPACT_WRITE_ACTIONS:
- xlate_write_actions(ctx, a);
+ xlate_write_actions(ctx, ofpact_get_WRITE_ACTIONS(a));
break;
case OFPACT_WRITE_METADATA:
xin->odp_actions = odp_actions;
/* Do recirc lookup. */
- xin->recirc = flow->recirc_id
- ? recirc_id_node_find(flow->recirc_id)
- : NULL;
+ xin->recirc = NULL;
+ if (flow->recirc_id) {
+ const struct recirc_id_node *node
+ = recirc_id_node_find(flow->recirc_id);
+ if (node) {
+ xin->recirc = &node->state;
+ }
+ }
}
void
COVERAGE_INC(xlate_actions);
if (xin->recirc) {
- const struct recirc_state *state = &xin->recirc->state;
+ const struct recirc_state *state = xin->recirc;
xlate_report(&ctx, "Restoring state post-recirculation:");
}
/* Set the bridge for post-recirculation processing if needed. */
- if (ctx.xbridge->ofproto != state->ofproto) {
+ if (!uuid_equals(ofproto_dpif_get_uuid(ctx.xbridge->ofproto),
+ &state->ofproto_uuid)) {
struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp);
const struct xbridge *new_bridge
- = xbridge_lookup(xcfg, state->ofproto);
+ = xbridge_lookup_by_uuid(xcfg, &state->ofproto_uuid);
if (OVS_UNLIKELY(!new_bridge)) {
/* Drop the packet if the bridge cannot be found. */
/* Restore action set, if any. */
if (state->action_set_len) {
- const struct ofpact *a;
-
xlate_report_actions(&ctx, "- Restoring action set",
- state->ofpacts, state->action_set_len);
-
- ofpbuf_put(&ctx.action_set, state->ofpacts, state->action_set_len);
+ state->action_set, state->action_set_len);
- OFPACT_FOR_EACH(a, state->ofpacts, state->action_set_len) {
- if (a->type == OFPACT_GROUP) {
- ctx.action_set_has_group = true;
- break;
- }
- }
+ flow->actset_output = OFPP_UNSET;
+ xlate_write_actions__(&ctx, state->action_set,
+ state->action_set_len);
}
/* Restore recirculation actions. If there are no actions, processing
* will start with a lookup in the table set above. */
- if (state->ofpacts_len > state->action_set_len) {
- xin->ofpacts_len = state->ofpacts_len - state->action_set_len;
- xin->ofpacts = state->ofpacts +
- state->action_set_len / sizeof *state->ofpacts;
-
+ xin->ofpacts = state->ofpacts;
+ xin->ofpacts_len = state->ofpacts_len;
+ if (state->ofpacts_len) {
xlate_report_actions(&ctx, "- Restoring actions",
xin->ofpacts, xin->ofpacts_len);
}
projects / cascardo / ovs.git / blobdiff