Signed-off-by: Ethan Jackson <et...@nicira.com>
---
ofproto/ofproto-dpif-xlate.c | 39 +++++++++++++++++++++++++++++++++--
ofproto/ofproto-dpif-xlate.h | 46 +++++++-----------------------------------
ofproto/ofproto-dpif.c | 18 ++++++++---------
3 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index ca65080..e4b1fd3 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -43,6 +43,41 @@ COVERAGE_DEFINE(ofproto_dpif_xlate);
VLOG_DEFINE_THIS_MODULE(ofproto_dpif_xlate);
+struct xlate_ctx {
+ struct xlate_in *xin;
+ struct xlate_out *xout;
+
+ struct ofproto_dpif *ofproto;
+
+ /* Flow at the last commit. */
+ struct flow base_flow;
+
+ /* Tunnel IP destination address as received. This is stored separately
+ * as the base_flow.tunnel is cleared on init to reflect the datapath
+ * behavior. Used to make sure not to send tunneled output to ourselves,
+ * which might lead to an infinite loop. This could happen easily
+ * if a tunnel is marked as 'ip_remote=flow', and the flow does not
+ * actually set the tun_dst field. */
+ ovs_be32 orig_tunnel_ip_dst;
+
+ /* Stack for the push and pop actions. Each stack element is of type
+ * "union mf_subvalue". */
+ union mf_subvalue init_stack[1024 / sizeof(union mf_subvalue)];
+ struct ofpbuf stack;
+
+ /* The rule that we are currently translating, or NULL. */
+ struct rule_dpif *rule;
+
+ int recurse; /* Recursion level, via xlate_table_action. */
+ bool max_resubmit_trigger; /* Recursed too deeply during translation. */
+ uint32_t orig_skb_priority; /* Priority when packet arrived. */
+ uint8_t table_id; /* OpenFlow table ID where flow was found. */
+ uint32_t sflow_n_outputs; /* Number of output ports. */
+ uint32_t sflow_odp_port; /* Output port for composing sFlow action. */
+ uint16_t user_cookie_offset;/* Used for user_action_cookie fixup. */
+ bool exit; /* No further actions should be processed. */
+};
+
/* A controller may use OFPP_NONE as the ingress port to indicate that
* it did not arrive on a "real" port. 'ofpp_none_bundle' exists for
* when an input bundle is needed for validation (e.g., mirroring or
@@ -924,7 +959,7 @@ ctx_rule_hooks(struct xlate_ctx *ctx, struct rule_dpif
*rule,
bool may_packet_in)
{
if (ctx->xin->resubmit_hook) {
- ctx->xin->resubmit_hook(ctx, rule);
+ ctx->xin->resubmit_hook(ctx->xin, rule, ctx->recurse);
}
if (rule == NULL && may_packet_in) {
/* XXX
@@ -1765,7 +1800,7 @@ static void
xlate_report(struct xlate_ctx *ctx, const char *s)
{
if (ctx->xin->report_hook) {
- ctx->xin->report_hook(ctx, s);
+ ctx->xin->report_hook(ctx->xin, s, ctx->recurse);
}
}
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index bffd217..9eecf51 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -88,14 +88,18 @@ struct xlate_in {
* 'rule' is the rule being submitted into. It will be null if the
* resubmit or OFPP_TABLE action didn't find a matching rule.
*
+ * 'recurse' is the resubmit recursion depth at time of invocation.
+ *
* This is normally null so the client has to set it manually after
* calling xlate_in_init(). */
- void (*resubmit_hook)(struct xlate_ctx *, struct rule_dpif *rule);
+ void (*resubmit_hook)(struct xlate_in *, struct rule_dpif *rule,
+ int recurse);
/* If nonnull, flow translation calls this function to report some
* significant decision, e.g. to explain why OFPP_NORMAL translation
- * dropped a packet. */
- void (*report_hook)(struct xlate_ctx *, const char *s);
+ * dropped a packet. 'recurse' is the resubmit recursion depth at time of
+ * invocation. */
+ void (*report_hook)(struct xlate_in *, const char *s, int recurse);
/* If nonnull, flow translation credits the specified statistics to each
* rule reached through a resubmit or OFPP_TABLE action.
@@ -105,42 +109,6 @@ struct xlate_in {
const struct dpif_flow_stats *resubmit_stats;
};
-/* Context used by xlate_actions() and its callees. */
-struct xlate_ctx {
- struct xlate_in *xin;
- struct xlate_out *xout;
-
- struct ofproto_dpif *ofproto;
-
- /* Flow at the last commit. */
- struct flow base_flow;
-
- /* Tunnel IP destination address as received. This is stored separately
- * as the base_flow.tunnel is cleared on init to reflect the datapath
- * behavior. Used to make sure not to send tunneled output to ourselves,
- * which might lead to an infinite loop. This could happen easily
- * if a tunnel is marked as 'ip_remote=flow', and the flow does not
- * actually set the tun_dst field. */
- ovs_be32 orig_tunnel_ip_dst;
-
- /* Stack for the push and pop actions. Each stack element is of type
- * "union mf_subvalue". */
- union mf_subvalue init_stack[1024 / sizeof(union mf_subvalue)];
- struct ofpbuf stack;
-
- /* The rule that we are currently translating, or NULL. */
- struct rule_dpif *rule;
-
- int recurse; /* Recursion level, via xlate_table_action. */
- bool max_resubmit_trigger; /* Recursed too deeply during translation. */
- uint32_t orig_skb_priority; /* Priority when packet arrived. */
- uint8_t table_id; /* OpenFlow table ID where flow was found. */
- uint32_t sflow_n_outputs; /* Number of output ports. */
- uint32_t sflow_odp_port; /* Output port for composing sFlow action. */
- uint16_t user_cookie_offset;/* Used for user_action_cookie fixup. */
- bool exit; /* No further actions should be processed. */
-};
-
void xlate_actions(struct xlate_in *, struct xlate_out *);
void xlate_in_init(struct xlate_in *, struct ofproto_dpif *,
const struct flow *, struct rule_dpif *,
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 3bc8dd7..2684b7a 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -5702,25 +5702,25 @@ trace_format_odp(struct ds *result, int level, const
char *title,
}
static void
-trace_resubmit(struct xlate_ctx *ctx, struct rule_dpif *rule)
+trace_resubmit(struct xlate_in *xin, struct rule_dpif *rule, int recurse)
{
- struct trace_ctx *trace = CONTAINER_OF(ctx->xin, struct trace_ctx, xin);
+ struct trace_ctx *trace = CONTAINER_OF(xin, struct trace_ctx, xin);
struct ds *result = trace->result;
ds_put_char(result, '\n');
- trace_format_flow(result, ctx->recurse + 1, "Resubmitted flow", trace);
- trace_format_regs(result, ctx->recurse + 1, "Resubmitted regs", trace);
- trace_format_odp(result, ctx->recurse + 1, "Resubmitted odp", trace);
- trace_format_rule(result, ctx->table_id, ctx->recurse + 1, rule);
+ trace_format_flow(result, recurse + 1, "Resubmitted flow", trace);
+ trace_format_regs(result, recurse + 1, "Resubmitted regs", trace);
+ trace_format_odp(result, recurse + 1, "Resubmitted odp", trace);
+ trace_format_rule(result, rule->up.table_id, recurse + 1, rule);
}
static void
-trace_report(struct xlate_ctx *ctx, const char *s)
+trace_report(struct xlate_in *xin, const char *s, int recurse)
{
- struct trace_ctx *trace = CONTAINER_OF(ctx->xin, struct trace_ctx, xin);
+ struct trace_ctx *trace = CONTAINER_OF(xin, struct trace_ctx, xin);
struct ds *result = trace->result;
- ds_put_char_multiple(result, '\t', ctx->recurse);
+ ds_put_char_multiple(result, '\t', recurse);
ds_put_cstr(result, s);
ds_put_char(result, '\n');
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
