A conjunctive flow consists of two or more multiple flows with
conjunction actions. When input to the ofproto/trace command
matches a conjunctive flow, it outputs flows of all dimensions.
Signed-off-by: Nobuhiro MIKI <nm...@yahoo-corp.jp>
---
v3:
* Remove struct flow changes.
* Use struct 'cls_rule' instead of struct 'flow'.
* Add priority and id conditionals for 'soft' arrays.
* Use 'minimask' in struct 'cls_rule' as mask.
* Use hmapx instead of ovs_list to store conj flows.
* Passe 'conj_flows' as an argument only when tracing.
v2:
* Reimplemented v1 with a safer and cleaner approach,
since v1 was a messy implementation that rewrote const variables.
---
lib/classifier.c | 43 +++++++++++++++++++++++++++++++-----
lib/classifier.h | 4 +++-
lib/flow.h | 7 ++++++
lib/ovs-router.c | 5 +++--
lib/tnl-ports.c | 6 ++---
ofproto/ofproto-dpif-xlate.c | 35 +++++++++++++++++++++++++++--
ofproto/ofproto-dpif-xlate.h | 3 +++
ofproto/ofproto-dpif.c | 25 +++++++++++++++------
ofproto/ofproto-dpif.h | 3 ++-
tests/classifier.at | 9 ++++++++
tests/test-classifier.c | 8 +++----
11 files changed, 122 insertions(+), 26 deletions(-)
diff --git a/lib/classifier.c b/lib/classifier.c
index 18dbfc83ad44..b8a6e5ba495b 100644
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -853,6 +853,24 @@ trie_ctx_init(struct trie_ctx *ctx, const struct cls_trie
*trie)
ctx->lookup_done = false;
}
+static void
+insert_conj_flows(struct hmapx *conj_flows, uint32_t id, int priority,
+ struct cls_conjunction_set **soft, size_t n_soft)
+{
+ int i;
+
+ if (!conj_flows) {
+ return;
+ }
+
+ for (i = 0; i < n_soft; i++) {
+ if (miniflow_get_conj_id(&soft[i]->match->flow) == id &&
+ soft[i]->priority > priority) {
+ hmapx_add(conj_flows, (void *) (soft[i]->match->cls_rule));
+ }
+ }
+}
+
struct conjunctive_match {
struct hmap_node hmap_node;
uint32_t id;
@@ -933,11 +951,15 @@ free_conjunctive_matches(struct hmap *matches,
* recursion within this function itself.
*
* 'flow' is non-const to allow for temporary modifications during the lookup.
- * Any changes are restored before returning. */
+ * Any changes are restored before returning.
+ *
+ * 'conj_flows' is an optional parameter. If it is non-null, the matching
+ * conjunctive flows are inserted. */
static const struct cls_rule *
classifier_lookup__(const struct classifier *cls, ovs_version_t version,
struct flow *flow, struct flow_wildcards *wc,
- bool allow_conjunctive_matches)
+ bool allow_conjunctive_matches,
+ struct hmapx *conj_flows)
{
struct trie_ctx trie_ctx[CLS_MAX_TRIES];
const struct cls_match *match;
@@ -1097,10 +1119,15 @@ classifier_lookup__(const struct classifier *cls,
ovs_version_t version,
const struct cls_rule *rule;
flow->conj_id = id;
- rule = classifier_lookup__(cls, version, flow, wc, false);
+ rule = classifier_lookup__(cls, version, flow, wc, false,
+ conj_flows);
flow->conj_id = saved_conj_id;
if (rule) {
+ if (allow_conjunctive_matches) {
+ insert_conj_flows(conj_flows, flow->conj_id,
+ hard->priority, soft, n_soft);
+ }
free_conjunctive_matches(&matches,
cm_stubs, ARRAY_SIZE(cm_stubs));
if (soft != soft_stub) {
@@ -1161,12 +1188,16 @@ classifier_lookup__(const struct classifier *cls,
ovs_version_t version,
* flow_wildcards_init_catchall()).
*
* 'flow' is non-const to allow for temporary modifications during the lookup.
- * Any changes are restored before returning. */
+ * Any changes are restored before returning.
+ *
+ * 'conj_flows' is an optional parameter. If it is non-null, the matching
+ * conjunctive flows are inserted. */
const struct cls_rule *
classifier_lookup(const struct classifier *cls, ovs_version_t version,
- struct flow *flow, struct flow_wildcards *wc)
+ struct flow *flow, struct flow_wildcards *wc,
+ struct hmapx *conj_flows)
{
- return classifier_lookup__(cls, version, flow, wc, true);
+ return classifier_lookup__(cls, version, flow, wc, true, conj_flows);
}
/* Finds and returns a rule in 'cls' with exactly the same priority and
diff --git a/lib/classifier.h b/lib/classifier.h
index f646a8f7429b..f55a2cba998e 100644
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -299,6 +299,7 @@
* parallel to the rule's removal. */
#include "cmap.h"
+#include "hmapx.h"
#include "openvswitch/match.h"
#include "openvswitch/meta-flow.h"
#include "pvector.h"
@@ -398,7 +399,8 @@ static inline void classifier_publish(struct classifier *);
* and each other. */
const struct cls_rule *classifier_lookup(const struct classifier *,
ovs_version_t, struct flow *,
- struct flow_wildcards *);
+ struct flow_wildcards *,
+ struct hmapx *conj_flows);
bool classifier_rule_overlaps(const struct classifier *,
const struct cls_rule *, ovs_version_t);
const struct cls_rule *classifier_find_rule_exactly(const struct classifier *,
diff --git a/lib/flow.h b/lib/flow.h
index a9d026e1ce3b..f58cb6b4dbfc 100644
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -884,6 +884,13 @@ miniflow_get_recirc_id(const struct miniflow *flow)
return MINIFLOW_GET_U32(flow, recirc_id);
}
+/* Returns the conj_id in 'flow.' */
+static inline uint32_t
+miniflow_get_conj_id(const struct miniflow *flow)
+{
+ return MINIFLOW_GET_U32(flow, conj_id);
+}
+
/* Returns the dp_hash in 'flow.' */
static inline uint32_t
miniflow_get_dp_hash(const struct miniflow *flow)
diff --git a/lib/ovs-router.c b/lib/ovs-router.c
index 7c04bb0e6b14..ca014d80ed31 100644
--- a/lib/ovs-router.c
+++ b/lib/ovs-router.c
@@ -115,7 +115,8 @@ ovs_router_lookup(uint32_t mark, const struct in6_addr
*ip6_dst,
const struct cls_rule *cr_src;
struct flow flow_src = {.ipv6_dst = *src, .pkt_mark = mark};
- cr_src = classifier_lookup(&cls, OVS_VERSION_MAX, &flow_src, NULL);
+ cr_src = classifier_lookup(&cls, OVS_VERSION_MAX, &flow_src, NULL,
+ NULL);
if (cr_src) {
struct ovs_router_entry *p_src = ovs_router_entry_cast(cr_src);
if (!p_src->local) {
@@ -126,7 +127,7 @@ ovs_router_lookup(uint32_t mark, const struct in6_addr
*ip6_dst,
}
}
- cr = classifier_lookup(&cls, OVS_VERSION_MAX, &flow, NULL);
+ cr = classifier_lookup(&cls, OVS_VERSION_MAX, &flow, NULL, NULL);
if (cr) {
struct ovs_router_entry *p = ovs_router_entry_cast(cr);
diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c
index f16409a0bf08..bb0b0b0c55f4 100644
--- a/lib/tnl-ports.c
+++ b/lib/tnl-ports.c
@@ -112,7 +112,7 @@ map_insert(odp_port_t port, struct eth_addr mac, struct
in6_addr *addr,
tnl_port_init_flow(&match.flow, mac, addr, nw_proto, tp_port);
do {
- cr = classifier_lookup(&cls, OVS_VERSION_MAX, &match.flow, NULL);
+ cr = classifier_lookup(&cls, OVS_VERSION_MAX, &match.flow, NULL, NULL);
p = tnl_port_cast(cr);
/* Try again if the rule was released before we get the reference. */
} while (p && !ovs_refcount_try_ref_rcu(&p->ref_cnt));
@@ -247,7 +247,7 @@ map_delete(struct eth_addr mac, struct in6_addr *addr,
tnl_port_init_flow(&flow, mac, addr, nw_proto, tp_port);
- cr = classifier_lookup(&cls, OVS_VERSION_MAX, &flow, NULL);
+ cr = classifier_lookup(&cls, OVS_VERSION_MAX, &flow, NULL, NULL);
tnl_port_unref(cr);
}
@@ -305,7 +305,7 @@ odp_port_t
tnl_port_map_lookup(struct flow *flow, struct flow_wildcards *wc)
{
const struct cls_rule *cr = classifier_lookup(&cls, OVS_VERSION_MAX, flow,
- wc);
+ wc, NULL);
return (cr) ? tnl_port_cast(cr)->portno : ODPP_NONE;
}
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index be4bd6657688..e3d7a232f4d4 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -866,6 +866,29 @@ xlate_report_action_set(const struct xlate_ctx *ctx, const
char *verb)
}
}
+static void
+xlate_report_conj_matches(const struct xlate_ctx *ctx)
+{
+ struct hmapx_node *node;
+ struct cls_rule *rule;
+ struct match match;
+
+
+ /* NOTE: The conj flows have meaning in order. But now they
+ * are put into the hmapx structure, so the order may
+ * have been rearranged. */
+ HMAPX_FOR_EACH (node, &ctx->xout->conj_flows) {
+ rule = node->data;
+ minimatch_expand(&rule->match, &match);
+
+ struct ds s = DS_EMPTY_INITIALIZER;
+ match_format(&match, NULL, &s, OFP_DEFAULT_PRIORITY);
+ xlate_report_debug(ctx, OFT_DETAIL, "conj. %s",
+ ds_cstr(&s));
+
+ ds_destroy(&s);
+ }
+}
/* If tracing is enabled in 'ctx', appends a node representing 'rule' (in
* OpenFlow table 'table_id') to the trace and makes this node the parent for
@@ -918,6 +941,8 @@ xlate_report_table(const struct xlate_ctx *ctx, struct
rule_dpif *rule,
ctx->xin->trace = &oftrace_report(ctx->xin->trace, OFT_TABLE,
ds_cstr(&s))->subs;
ds_destroy(&s);
+
+ xlate_report_conj_matches(ctx);
}
/* If tracing is enabled in 'ctx', adds an OFT_DETAIL trace node to 'ctx'
@@ -4653,7 +4678,8 @@ xlate_table_action(struct xlate_ctx *ctx, ofp_port_t
in_port, uint8_t table_id,
ctx->xin->resubmit_stats,
&ctx->table_id, in_port,
may_packet_in, honor_table_miss,
- ctx->xin->xcache);
+ ctx->xin->xcache,
+ &ctx->xout->conj_flows);
/* Swap back. */
if (with_ct_orig) {
tuple_swap(&ctx->xin->flow, ctx->wc);
@@ -7970,6 +7996,7 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
*xout)
*xout = (struct xlate_out) {
.slow = 0,
.recircs = RECIRC_REFS_EMPTY_INITIALIZER,
+ .conj_flows = HMAPX_INITIALIZER(&xout->conj_flows),
};
struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp);
@@ -8181,7 +8208,8 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
*xout)
ctx.rule = rule_dpif_lookup_from_table(
ctx.xbridge->ofproto, ctx.xin->tables_version, flow, ctx.wc,
ctx.xin->resubmit_stats, &ctx.table_id,
- flow->in_port.ofp_port, true, true, ctx.xin->xcache);
+ flow->in_port.ofp_port, true, true, ctx.xin->xcache,
+ ctx.xin->trace ? &ctx.xout->conj_flows : NULL);
if (ctx.xin->resubmit_stats) {
rule_dpif_credit_stats(ctx.rule, ctx.xin->resubmit_stats, false);
}
@@ -8375,6 +8403,9 @@ exit:
ofpbuf_uninit(&scratch_actions);
ofpbuf_delete(ctx.encap_data);
+ /* Clean up 'conj_flows' as it is no longer needed. */
+ hmapx_destroy(&xout->conj_flows);
+
/* Make sure we return a "drop flow" in case of an error. */
if (ctx.error) {
xout->slow = 0;
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index 05b46fb26b1c..3d549239dfea 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -61,6 +61,9 @@ struct xlate_out {
/* Recirc action IDs on which references are held. */
struct recirc_refs recircs;
+
+ /* Set of matching conjunctive flows. */
+ struct hmapx conj_flows;
};
struct xlate_in {
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index ba5706f6adcc..8cc0a6506534 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -4383,15 +4383,20 @@ ofproto_dpif_get_tables_version(struct ofproto_dpif
*ofproto)
* a reference.
*
* 'flow' is non-const to allow for temporary modifications during the lookup.
- * Any changes are restored before returning. */
+ * Any changes are restored before returning.
+ *
+ * 'conj_flows' is an optional parameter. If it is non-null, the matching
+ * conjunctive flows are inserted. */
static struct rule_dpif *
rule_dpif_lookup_in_table(struct ofproto_dpif *ofproto, ovs_version_t version,
uint8_t table_id, struct flow *flow,
- struct flow_wildcards *wc)
+ struct flow_wildcards *wc,
+ struct hmapx *conj_flows)
{
struct classifier *cls = &ofproto->up.tables[table_id].cls;
return rule_dpif_cast(rule_from_cls_rule(classifier_lookup(cls, version,
- flow, wc)));
+ flow, wc,
+ conj_flows)));
}
void
@@ -4433,7 +4438,10 @@ ofproto_dpif_credit_table_stats(struct ofproto_dpif
*ofproto, uint8_t table_id,
* 'in_port'. This is needed for resubmit action support.
*
* 'flow' is non-const to allow for temporary modifications during the lookup.
- * Any changes are restored before returning. */
+ * Any changes are restored before returning.
+ *
+ * 'conj_flows' is an optional parameter. If it is non-null, the matching
+ * conjunctive flows are inserted. */
struct rule_dpif *
rule_dpif_lookup_from_table(struct ofproto_dpif *ofproto,
ovs_version_t version, struct flow *flow,
@@ -4441,7 +4449,8 @@ rule_dpif_lookup_from_table(struct ofproto_dpif *ofproto,
const struct dpif_flow_stats *stats,
uint8_t *table_id, ofp_port_t in_port,
bool may_packet_in, bool honor_table_miss,
- struct xlate_cache *xcache)
+ struct xlate_cache *xcache,
+ struct hmapx *conj_flows)
{
ovs_be16 old_tp_src = flow->tp_src, old_tp_dst = flow->tp_dst;
ofp_port_t old_in_port = flow->in_port.ofp_port;
@@ -4497,7 +4506,8 @@ rule_dpif_lookup_from_table(struct ofproto_dpif *ofproto,
next_id++, next_id += (next_id == TBL_INTERNAL))
{
*table_id = next_id;
- rule = rule_dpif_lookup_in_table(ofproto, version, next_id, flow, wc);
+ rule = rule_dpif_lookup_in_table(ofproto, version, next_id, flow, wc,
+ conj_flows);
if (stats) {
struct oftable *tbl = &ofproto->up.tables[next_id];
unsigned long orig;
@@ -6680,7 +6690,8 @@ ofproto_dpif_add_internal_flow(struct ofproto_dpif
*ofproto,
rule = rule_dpif_lookup_in_table(ofproto,
ofproto_dpif_get_tables_version(ofproto),
- TBL_INTERNAL, &match->flow, &match->wc);
+ TBL_INTERNAL, &match->flow, &match->wc,
+ NULL);
if (rule) {
*rulep = &rule->up;
} else {
diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h
index d8e0cd37ac5b..1fe22ab41bd9 100644
--- a/ofproto/ofproto-dpif.h
+++ b/ofproto/ofproto-dpif.h
@@ -103,7 +103,8 @@ struct rule_dpif *rule_dpif_lookup_from_table(struct
ofproto_dpif *,
ofp_port_t in_port,
bool may_packet_in,
bool honor_table_miss,
- struct xlate_cache *);
+ struct xlate_cache *,
+ struct hmapx *conj_flows);
void rule_dpif_credit_stats(struct rule_dpif *,
const struct dpif_flow_stats *, bool);
diff --git a/tests/classifier.at b/tests/classifier.at
index de2705653e00..00239d13669e 100644
--- a/tests/classifier.at
+++ b/tests/classifier.at
@@ -278,6 +278,15 @@ for src in 0 1 2 3 4 5 6 7; do
])
done
done
+dnl Check detailed output for conjunctive match.
+AT_CHECK([ovs-appctl ofproto/trace br0
"in_port=1,dl_type=0x0800,nw_src=10.0.0.7,nw_dst=10.0.0.5" | grep conj\\. |
sort], [0], [dnl
+ -> conj. ip,nw_dst=10.0.0.5
+ -> conj. ip,nw_src=10.0.0.7
+])
+AT_CHECK([ovs-appctl ofproto/trace br0
"in_port=1,dl_type=0x0800,nw_src=10.0.0.1,nw_dst=10.0.0.5" | grep conj\\. |
sort], [0], [dnl
+ -> conj. ip,nw_dst=10.0.0.5
+ -> conj. ip,nw_src=10.0.0.1
+])
OVS_VSWITCHD_STOP
AT_CLEANUP
diff --git a/tests/test-classifier.c b/tests/test-classifier.c
index cff00c8fa35e..2c1604a01e2e 100644
--- a/tests/test-classifier.c
+++ b/tests/test-classifier.c
@@ -441,7 +441,7 @@ compare_classifiers(struct classifier *cls, size_t
n_invisible_rules,
/* This assertion is here to suppress a GCC 4.9 array-bounds warning */
ovs_assert(cls->n_tries <= CLS_MAX_TRIES);
- cr0 = classifier_lookup(cls, version, &flow, &wc);
+ cr0 = classifier_lookup(cls, version, &flow, &wc, NULL);
cr1 = tcls_lookup(tcls, &flow);
assert((cr0 == NULL) == (cr1 == NULL));
if (cr0 != NULL) {
@@ -454,7 +454,7 @@ compare_classifiers(struct classifier *cls, size_t
n_invisible_rules,
/* Make sure the rule should have been visible. */
assert(cls_rule_visible_in_version(cr0, version));
}
- cr2 = classifier_lookup(cls, version, &flow, NULL);
+ cr2 = classifier_lookup(cls, version, &flow, NULL, NULL);
assert(cr2 == cr0);
}
}
@@ -1370,10 +1370,10 @@ lookup_classifier(void *aux_)
if (aux->use_wc) {
flow_wildcards_init_catchall(&wc);
cr = classifier_lookup(aux->cls, version, &aux->lookup_flows[x],
- &wc);
+ &wc, NULL);
} else {
cr = classifier_lookup(aux->cls, version, &aux->lookup_flows[x],
- NULL);
+ NULL, NULL);
}
if (cr) {
hits++;
--
2.39.3
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
