From: Joe Stringer <j...@wand.net.nz>
This adds support for specifying flow miss handling behaviour at
runtime, through a new "other-config" option in the Open_vSwitch table.
This is an extension to flow-eviction-threshold.
By default, the behaviour is the same as before. If force-miss-model is
set to 1, then flow miss handling will always result in the creation of
new facets and flow-eviction-threshold will be ignored. If
force-miss-model is set to 2, then flow miss handling will never result
in the creation of new facets (effectively the same as setting the
flow-eviction-threshold to 0, which is not currently configurable).
We intend to use this configuration option in the testsuite to force
particular code paths to be used, allowing us to improve test coverage.
Signed-off-by: Joe Stringer <j...@wand.net.nz>
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
v13
* First post
---
ofproto/ofproto-dpif.c | 9 +++++++++
ofproto/ofproto-provider.h | 4 ++++
ofproto/ofproto.c | 17 +++++++++++++++++
ofproto/ofproto.h | 9 +++++++++
vswitchd/bridge.c | 4 ++++
vswitchd/vswitch.xml | 23 +++++++++++++++++++++++
6 files changed, 66 insertions(+)
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index e3acbc6..037dfef 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3347,6 +3347,15 @@ flow_miss_should_make_facet(struct flow_miss *miss,
struct flow_wildcards *wc)
struct dpif_backer *backer = miss->ofproto->backer;
uint32_t hash;
+ switch (flow_miss_model) {
+ case OFPROTO_HANDLE_MISS_WITH_FACET:
+ return true;
+ case OFPROTO_HANDLE_MISS_WITHOUT_FACET:
+ return false;
+ default:
+ break;
+ }
+
if (!backer->governor) {
size_t n_subfacets;
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 41b589f..692d53c 100644
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -238,6 +238,10 @@ struct rule {
* ofproto-dpif implementation */
extern unsigned flow_eviction_threshold;
+/* Determines which model to use for handling misses in the ofproto-dpif
+ * implementation */
+extern unsigned flow_miss_model;
+
static inline struct rule *
rule_from_cls_rule(const struct cls_rule *cls_rule)
{
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index eabe850..2996ce5 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -221,6 +221,7 @@ static size_t n_ofproto_classes;
static size_t allocated_ofproto_classes;
unsigned flow_eviction_threshold = OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT;
+unsigned flow_miss_model = OFPROTO_HANDLE_MISS_AUTO;
/* Map from datapath name to struct ofproto, for use by unixctl commands. */
static struct hmap all_ofprotos = HMAP_INITIALIZER(&all_ofprotos);
@@ -573,6 +574,22 @@ ofproto_set_flow_eviction_threshold(unsigned threshold)
threshold);
}
+/* Sets the path for handling flow misses. */
+void
+ofproto_set_flow_miss_model(unsigned model)
+{
+ switch (model) {
+ case OFPROTO_HANDLE_MISS_WITH_FACET:
+ VLOG_INFO("Handling all misses by creating facets.\n");
+ case OFPROTO_HANDLE_MISS_WITHOUT_FACET:
+ VLOG_INFO("Handling all misses without creating facets.\n");
+ }
+
+ if (OFPROTO_HANDLE_MISS_AUTO <= model && model < OFPROTO_HANDLE_MISS_MAX) {
+ flow_miss_model = model;
+ }
+}
+
/* If forward_bpdu is true, the NORMAL action will forward frames with
* reserved (e.g. STP) destination Ethernet addresses. if forward_bpdu is
false,
* the NORMAL action will drop these frames. */
diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
index 5f8244c..664e9e4 100644
--- a/ofproto/ofproto.h
+++ b/ofproto/ofproto.h
@@ -216,6 +216,14 @@ int ofproto_port_dump_done(struct ofproto_port_dump *);
#define OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT 2500
#define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100
+/* How flow misses should be handled in ofproto-dpif */
+enum ofproto_flow_miss_model {
+ OFPROTO_HANDLE_MISS_AUTO, /* Based on flow eviction threshold. */
+ OFPROTO_HANDLE_MISS_WITH_FACET, /* Always create facets. */
+ OFPROTO_HANDLE_MISS_WITHOUT_FACET, /* Always handle without facets.*/
+ OFPROTO_HANDLE_MISS_MAX
+};
+
const char *ofproto_port_open_type(const char *datapath_type,
const char *port_type);
int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp);
@@ -237,6 +245,7 @@ void ofproto_set_extra_in_band_remotes(struct ofproto *,
const struct sockaddr_in *, size_t n);
void ofproto_set_in_band_queue(struct ofproto *, int queue_id);
void ofproto_set_flow_eviction_threshold(unsigned threshold);
+void ofproto_set_flow_miss_model(unsigned model);
void ofproto_set_forward_bpdu(struct ofproto *, bool forward_bpdu);
void ofproto_set_mac_table_config(struct ofproto *, unsigned idle_time,
size_t max_entries);
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 3513810..d19983a 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -498,6 +498,10 @@ bridge_reconfigure(const struct ovsrec_open_vswitch
*ovs_cfg)
smap_get_int(&ovs_cfg->other_config, "flow-eviction-threshold",
OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT));
+ ofproto_set_flow_miss_model(
+ smap_get_int(&ovs_cfg->other_config, "force-miss-model",
+ OFPROTO_HANDLE_MISS_AUTO));
+
/* Destroy "struct bridge"s, "struct port"s, and "struct iface"s according
* to 'ovs_cfg' while update the "if_cfg_queue", with only very minimal
* configuration otherwise.
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index c6750d6..a0f85a7 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -136,6 +136,29 @@
The default is 1000. Values below 100 will be rounded up to 100.
</p>
</column>
+
+ <column name="other_config" key="force-miss-model"
+ type='{"type": "integer", "minInteger": 0}'>
+ <p>
+ Specify how flow misses are handled in userspace. The following
+ values have specific meaning.
+ </p>
+ <p>
+ <dl>
+ <dt><code>0</code></dt>
+ <dd>Handle automatically based on the flow-eviction-threshold and
+ the flow setup governer (default, recommended).</dd>
+ <dt><code>1</code></dt>
+ <dd>Always create facets. Expensive kernel flow creation and
+ statistics tracking is always performed, even on flows with only
+ a small number of packets.</dd>
+ <dt><code>2</code></dt>
+ <dd>Always handle without facets. Forces flow misses to be handled
+ in userspace. May cause an increase in CPU usage and packet loss
+ on high throughput.</dd>
+ </dl>
+ </p>
+ </column>
</group>
<group title="Status">
--
1.8.2.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
