This patch adds a new configuration option, "max-idle" to the
Open_vSwitch "other-config" column. This sets how long datapath flows
are cached in the datapath before revalidators expire them.
Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
v4: Remove extra "max_idle" from Flow_Table table.
v3: Use 'unsigned' instead of 'long long int' for ofproto_max_idle.
v2: Don't cache the max_idle in 'struct udpif'.
Extend range of valid values to 100-30000.
---
ofproto/ofproto-dpif-upcall.c | 5 ++---
ofproto/ofproto-provider.h | 4 ++++
ofproto/ofproto.c | 9 +++++++++
ofproto/ofproto.h | 2 ++
vswitchd/bridge.c | 2 ++
vswitchd/vswitch.xml | 15 +++++++++++++++
6 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
index e0a5aed..14afb0c 100644
--- a/ofproto/ofproto-dpif-upcall.c
+++ b/ofproto/ofproto-dpif-upcall.c
@@ -41,7 +41,6 @@
#define MAX_QUEUE_LENGTH 512
#define FLOW_MISS_MAX_BATCH 50
#define REVALIDATE_MAX_BATCH 50
-#define MAX_IDLE 1500
VLOG_DEFINE_THIS_MODULE(ofproto_dpif_upcall);
@@ -622,7 +621,7 @@ udpif_flow_dumper(void *arg)
duration);
}
- poll_timer_wait_until(start_time + MIN(MAX_IDLE, 500));
+ poll_timer_wait_until(start_time + MIN(ofproto_max_idle, 500));
seq_wait(udpif->reval_seq, udpif->last_reval_seq);
latch_wait(&udpif->exit_latch);
poll_block();
@@ -1383,7 +1382,7 @@ revalidate_udumps(struct revalidator *revalidator, struct
list *udumps)
n_flows = udpif_get_n_flows(udpif);
must_del = false;
- max_idle = MAX_IDLE;
+ max_idle = ofproto_max_idle;
if (n_flows > flow_limit) {
must_del = n_flows > 2 * flow_limit;
max_idle = 100;
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 08a8ac1..b1c78c1 100644
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -464,6 +464,10 @@ void rule_collection_destroy(struct rule_collection *);
* ofproto-dpif implementation. */
extern unsigned ofproto_flow_limit;
+/* Determines how long flows may be idle in the datapath before they are
+ * expired. */
+extern unsigned ofproto_max_idle;
+
/* Number of upcall handler and revalidator threads. Only affects the
* ofproto-dpif implementation. */
extern size_t n_handlers, n_revalidators;
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 62c97a2..7ea00da 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -307,6 +307,7 @@ static size_t allocated_ofproto_classes;
struct ovs_mutex ofproto_mutex = OVS_MUTEX_INITIALIZER;
unsigned ofproto_flow_limit = OFPROTO_FLOW_LIMIT_DEFAULT;
+unsigned ofproto_max_idle = OFPROTO_MAX_IDLE_DEFAULT;
enum ofproto_flow_miss_model flow_miss_model = OFPROTO_HANDLE_MISS_AUTO;
size_t n_handlers, n_revalidators;
@@ -698,6 +699,14 @@ ofproto_set_flow_limit(unsigned limit)
ofproto_flow_limit = limit;
}
+/* Sets the maximum idle time for flows in the datapath before they are
+ * expired. */
+void
+ofproto_set_max_idle(long long int max_idle)
+{
+ ofproto_max_idle = max_idle;
+}
+
/* Sets the path for handling flow misses. */
void
ofproto_set_flow_miss_model(unsigned model)
diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
index 0ac4454..a5d7824 100644
--- a/ofproto/ofproto.h
+++ b/ofproto/ofproto.h
@@ -214,6 +214,7 @@ int ofproto_port_dump_done(struct ofproto_port_dump *);
)
#define OFPROTO_FLOW_LIMIT_DEFAULT 200000
+#define OFPROTO_MAX_IDLE_DEFAULT 1200
/* How flow misses should be handled in ofproto-dpif */
enum ofproto_flow_miss_model {
@@ -243,6 +244,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_limit(unsigned limit);
+void ofproto_set_max_idle(long long int max_idle);
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,
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index cde4bd0..455ba14 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -494,6 +494,8 @@ bridge_reconfigure(const struct ovsrec_open_vswitch
*ovs_cfg)
ofproto_set_flow_limit(smap_get_int(&ovs_cfg->other_config, "flow-limit",
OFPROTO_FLOW_LIMIT_DEFAULT));
+ ofproto_set_max_idle(smap_get_int(&ovs_cfg->other_config, "max-idle",
+ OFPROTO_MAX_IDLE_DEFAULT));
ofproto_set_threads(
smap_get_int(&ovs_cfg->other_config, "n-handler-threads", 0),
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index e915caf..5fcfef7 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -136,6 +136,21 @@
</p>
</column>
+ <column name="other_config" key="max-idle"
+ type='{"type": "integer", "minInteger": 100,
+ "maxInteger": 30000}'>
+ <p>
+ The maximum idle time in milliseconds for flows to be cached in the
+ datapath. A lower value may improve flow setup performance, but
+ decrease the number of cached flows in the datapath. Conversely, a
+ higher value allows more flows to be maintained in the cache at the
+ expense of flow setup performance.
+ </p>
+ <p>
+ The default is 1200.
+ </p>
+ </column>
+
<column name="other_config" key="force-miss-model">
<p>
Specifies userspace behaviour for handling flow misses. This takes
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
