Signed-off-by: Ethan Jackson <et...@nicira.com>
---
ofproto/ofproto-dpif-sflow.c | 92 ++++++++++++++++++++++++++++++++++--------
1 file changed, 75 insertions(+), 17 deletions(-)
diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 64e6c96..568565d 100644
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -42,6 +42,8 @@
VLOG_DEFINE_THIS_MODULE(sflow);
+static struct ovs_mutex mutex;
+
struct dpif_sflow_port {
struct hmap_node hmap_node; /* In struct dpif_sflow's "ports" hmap. */
SFLDataSource_instance dsi; /* sFlow library's notion of port number. */
@@ -57,7 +59,7 @@ struct dpif_sflow {
size_t n_flood, n_all;
struct hmap ports; /* Contains "struct dpif_sflow_port"s. */
uint32_t probability;
- int ref_cnt;
+ atomic_int ref_cnt;
};
static void dpif_sflow_del_port__(struct dpif_sflow *,
@@ -144,6 +146,7 @@ sflow_agent_send_packet_cb(void *ds_, SFLAgent *agent
OVS_UNUSED,
static struct dpif_sflow_port *
dpif_sflow_find_port(const struct dpif_sflow *ds, odp_port_t odp_port)
+ OVS_REQ_WRLOCK(&mutex)
{
struct dpif_sflow_port *dsp;
@@ -159,6 +162,7 @@ dpif_sflow_find_port(const struct dpif_sflow *ds,
odp_port_t odp_port)
static void
sflow_agent_get_counters(void *ds_, SFLPoller *poller,
SFL_COUNTERS_SAMPLE_TYPE *cs)
+ OVS_REQ_WRLOCK(&mutex)
{
struct dpif_sflow *ds = ds_;
SFLCounters_sample_element elem;
@@ -274,6 +278,7 @@ success:
void
dpif_sflow_clear(struct dpif_sflow *ds)
{
+ ovs_mutex_lock(&mutex);
if (ds->sflow_agent) {
sfl_agent_release(ds->sflow_agent);
ds->sflow_agent = NULL;
@@ -285,25 +290,42 @@ dpif_sflow_clear(struct dpif_sflow *ds)
/* Turn off sampling to save CPU cycles. */
ds->probability = 0;
+ ovs_mutex_unlock(&mutex);
}
bool
dpif_sflow_is_enabled(const struct dpif_sflow *ds)
{
- return ds->collectors != NULL;
+ bool enabled;
+
+ ovs_mutex_lock(&mutex);
+ enabled = ds->collectors != NULL;
+ ovs_mutex_unlock(&mutex);
+ return enabled;
}
struct dpif_sflow *
dpif_sflow_create(void)
{
+ static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
struct dpif_sflow *ds;
+ if (ovsthread_once_start(&once)) {
+ pthread_mutexattr_t attr;
+
+ xpthread_mutexattr_init(&attr);
+ xpthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ ovs_mutex_init(&mutex, &attr);
+ xpthread_mutexattr_destroy(&attr);
+ ovsthread_once_done(&once);
+ }
+
ds = xcalloc(1, sizeof *ds);
ds->next_tick = time_now() + 1;
hmap_init(&ds->ports);
ds->probability = 0;
route_table_register();
- ds->ref_cnt = 1;
+ atomic_init(&ds->ref_cnt, 1);
return ds;
}
@@ -313,8 +335,9 @@ dpif_sflow_ref(const struct dpif_sflow *ds_)
{
struct dpif_sflow *ds = CONST_CAST(struct dpif_sflow *, ds_);
if (ds) {
- ovs_assert(ds->ref_cnt > 0);
- ds->ref_cnt++;
+ int orig;
+ atomic_add(&ds->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
}
return ds;
}
@@ -325,18 +348,25 @@ dpif_sflow_ref(const struct dpif_sflow *ds_)
uint32_t
dpif_sflow_get_probability(const struct dpif_sflow *ds)
{
- return ds->probability;
+ uint32_t probability;
+ ovs_mutex_lock(&mutex);
+ probability = ds->probability;
+ ovs_mutex_unlock(&mutex);
+ return probability;
}
void
dpif_sflow_unref(struct dpif_sflow *ds)
{
+ int orig;
+
if (!ds) {
return;
}
- ovs_assert(ds->ref_cnt > 0);
- if (!--ds->ref_cnt) {
+ atomic_sub(&ds->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
+ if (orig == 1) {
struct dpif_sflow_port *dsp, *next;
route_table_unregister();
@@ -366,13 +396,14 @@ dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport
*ofport,
struct dpif_sflow_port *dsp;
int ifindex;
+ ovs_mutex_lock(&mutex);
dpif_sflow_del_port(ds, odp_port);
ifindex = netdev_get_ifindex(ofport->netdev);
if (ifindex <= 0) {
/* Not an ifindex port, so do not add a cross-reference to it here */
- return;
+ goto out;
}
/* Add to table of ports. */
@@ -386,10 +417,14 @@ dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport
*ofport,
if (ds->sflow_agent) {
dpif_sflow_add_poller(ds, dsp);
}
+
+out:
+ ovs_mutex_unlock(&mutex);
}
static void
dpif_sflow_del_port__(struct dpif_sflow *ds, struct dpif_sflow_port *dsp)
+ OVS_REQ_WRLOCK(mutex)
{
if (ds->sflow_agent) {
sfl_agent_removePoller(ds->sflow_agent, &dsp->dsi);
@@ -402,10 +437,14 @@ dpif_sflow_del_port__(struct dpif_sflow *ds, struct
dpif_sflow_port *dsp)
void
dpif_sflow_del_port(struct dpif_sflow *ds, odp_port_t odp_port)
{
- struct dpif_sflow_port *dsp = dpif_sflow_find_port(ds, odp_port);
+ struct dpif_sflow_port *dsp;
+
+ ovs_mutex_lock(&mutex);
+ dsp = dpif_sflow_find_port(ds, odp_port);
if (dsp) {
dpif_sflow_del_port__(ds, dsp);
}
+ ovs_mutex_unlock(&mutex);
}
void
@@ -421,11 +460,12 @@ dpif_sflow_set_options(struct dpif_sflow *ds,
uint32_t dsIndex;
SFLSampler *sampler;
+ ovs_mutex_lock(&mutex);
if (sset_is_empty(&options->targets) || !options->sampling_rate) {
/* No point in doing any work if there are no targets or nothing to
* sample. */
dpif_sflow_clear(ds);
- return;
+ goto out;
}
options_changed = (!ds->options
@@ -443,7 +483,7 @@ dpif_sflow_set_options(struct dpif_sflow *ds,
VLOG_WARN_RL(&rl, "no collectors could be initialized, "
"sFlow disabled");
dpif_sflow_clear(ds);
- return;
+ goto out;
}
}
@@ -452,12 +492,12 @@ dpif_sflow_set_options(struct dpif_sflow *ds,
&options->targets,
options->control_ip, &agentIP)) {
dpif_sflow_clear(ds);
- return;
+ goto out;
}
/* Avoid reconfiguring if options didn't change. */
if (!options_changed) {
- return;
+ goto out;
}
ofproto_sflow_options_destroy(ds->options);
ds->options = ofproto_sflow_options_clone(options);
@@ -502,14 +542,23 @@ dpif_sflow_set_options(struct dpif_sflow *ds,
HMAP_FOR_EACH (dsp, hmap_node, &ds->ports) {
dpif_sflow_add_poller(ds, dsp);
}
+
+out:
+ ovs_mutex_unlock(&mutex);
}
int
dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *ds,
odp_port_t odp_port)
{
- struct dpif_sflow_port *dsp = dpif_sflow_find_port(ds, odp_port);
- return dsp ? SFL_DS_INDEX(dsp->dsi) : 0;
+ struct dpif_sflow_port *dsp;
+ int ret;
+
+ ovs_mutex_lock(&mutex);
+ dsp = dpif_sflow_find_port(ds, odp_port);
+ ret = dsp ? SFL_DS_INDEX(dsp->dsi) : 0;
+ ovs_mutex_unlock(&mutex);
+ return ret;
}
void
@@ -525,9 +574,10 @@ dpif_sflow_received(struct dpif_sflow *ds, struct ofpbuf
*packet,
struct dpif_sflow_port *in_dsp;
ovs_be16 vlan_tci;
+ ovs_mutex_lock(&mutex);
sampler = ds->sflow_agent->samplers;
if (!sampler) {
- return;
+ goto out;
}
/* Build a flow sample. */
@@ -576,11 +626,16 @@ dpif_sflow_received(struct dpif_sflow *ds, struct ofpbuf
*packet,
SFLADD_ELEMENT(&fs, &hdrElem);
SFLADD_ELEMENT(&fs, &switchElem);
sfl_sampler_writeFlowSample(sampler, &fs);
+
+out:
+ ovs_mutex_unlock(&mutex);
}
void
dpif_sflow_run(struct dpif_sflow *ds)
{
+
+ ovs_mutex_lock(&mutex);
if (dpif_sflow_is_enabled(ds)) {
time_t now = time_now();
route_table_run();
@@ -589,12 +644,15 @@ dpif_sflow_run(struct dpif_sflow *ds)
ds->next_tick = now + 1;
}
}
+ ovs_mutex_unlock(&mutex);
}
void
dpif_sflow_wait(struct dpif_sflow *ds)
{
+ ovs_mutex_lock(&mutex);
if (dpif_sflow_is_enabled(ds)) {
poll_timer_wait_until(ds->next_tick * 1000LL);
}
+ ovs_mutex_unlock(&mutex);
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
