In future patches upcall handler threads will need to update netflow.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
long long int reconfig_time; /* When we reconfigured the timeouts. */
struct hmap flows; /* Contains 'netflow_flows'. */
long long int reconfig_time; /* When we reconfigured the timeouts. */
struct hmap flows; /* Contains 'netflow_flows'. */
long long int used; /* Last-used time (0 if never used). */
};
long long int used; /* Last-used time (0 if never used). */
};
+static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
+
static struct netflow_flow *netflow_flow_lookup(const struct netflow *,
static struct netflow_flow *netflow_flow_lookup(const struct netflow *,
+ const struct flow *)
+ OVS_REQUIRES(mutex);
static uint32_t netflow_flow_hash(const struct flow *);
static uint32_t netflow_flow_hash(const struct flow *);
-static void netflow_expire__(struct netflow *, struct netflow_flow *);
+static void netflow_expire__(struct netflow *, struct netflow_flow *)
+ OVS_REQUIRES(mutex);
+static void netflow_run__(struct netflow *) OVS_REQUIRES(mutex);
void
netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
void
netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
static void
gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
uint32_t packet_count, uint32_t byte_count)
static void
gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow,
uint32_t packet_count, uint32_t byte_count)
{
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
{
struct netflow_v5_header *nf_hdr;
struct netflow_v5_record *nf_rec;
/* NetFlow messages are limited to 30 records. */
if (ntohs(nf_hdr->count) >= 30) {
/* NetFlow messages are limited to 30 records. */
if (ntohs(nf_hdr->count) >= 30) {
netflow_flow_update(struct netflow *nf, struct flow *flow,
ofp_port_t output_iface,
const struct dpif_flow_stats *stats)
netflow_flow_update(struct netflow *nf, struct flow *flow,
ofp_port_t output_iface,
const struct dpif_flow_stats *stats)
{
struct netflow_flow *nf_flow;
long long int used;
{
struct netflow_flow *nf_flow;
long long int used;
+ ovs_mutex_lock(&mutex);
nf_flow = netflow_flow_lookup(nf, flow);
if (!nf_flow) {
nf_flow = xzalloc(sizeof *nf_flow);
nf_flow = netflow_flow_lookup(nf, flow);
if (!nf_flow) {
nf_flow = xzalloc(sizeof *nf_flow);
nf_flow->last_expired = time_msec();
}
}
nf_flow->last_expired = time_msec();
}
}
+
+ ovs_mutex_unlock(&mutex);
}
static void
netflow_expire__(struct netflow *nf, struct netflow_flow *nf_flow)
}
static void
netflow_expire__(struct netflow *nf, struct netflow_flow *nf_flow)
-netflow_expire(struct netflow *nf, struct flow *flow)
+netflow_expire(struct netflow *nf, struct flow *flow) OVS_EXCLUDED(mutex)
- struct netflow_flow *nf_flow = netflow_flow_lookup(nf, flow);
+ struct netflow_flow *nf_flow;
+ ovs_mutex_lock(&mutex);
+ nf_flow = netflow_flow_lookup(nf, flow);
if (nf_flow) {
netflow_expire__(nf, nf_flow);
}
if (nf_flow) {
netflow_expire__(nf, nf_flow);
}
+ ovs_mutex_unlock(&mutex);
-netflow_flow_clear(struct netflow *nf, struct flow *flow)
+netflow_flow_clear(struct netflow *nf, struct flow *flow) OVS_EXCLUDED(mutex)
- struct netflow_flow *nf_flow = netflow_flow_lookup(nf, flow);
+ struct netflow_flow *nf_flow;
+ ovs_mutex_lock(&mutex);
+ nf_flow = netflow_flow_lookup(nf, flow);
if (nf_flow) {
ovs_assert(!nf_flow->packet_count);
ovs_assert(!nf_flow->byte_count);
hmap_remove(&nf->flows, &nf_flow->hmap_node);
free(nf_flow);
}
if (nf_flow) {
ovs_assert(!nf_flow->packet_count);
ovs_assert(!nf_flow->byte_count);
hmap_remove(&nf->flows, &nf_flow->hmap_node);
free(nf_flow);
}
+ ovs_mutex_unlock(&mutex);
}
/* Returns true if it's time to send out a round of NetFlow active timeouts,
* false otherwise. */
}
/* Returns true if it's time to send out a round of NetFlow active timeouts,
* false otherwise. */
-void
-netflow_run(struct netflow *nf)
+static void
+netflow_run__(struct netflow *nf) OVS_REQUIRES(mutex)
{
long long int now = time_msec();
struct netflow_flow *nf_flow, *next;
{
long long int now = time_msec();
struct netflow_flow *nf_flow, *next;
-netflow_wait(struct netflow *nf)
+netflow_run(struct netflow *nf)
+ ovs_mutex_lock(&mutex);
+ netflow_run__(nf);
+ ovs_mutex_unlock(&mutex);
+}
+
+void
+netflow_wait(struct netflow *nf) OVS_EXCLUDED(mutex)
+{
+ ovs_mutex_lock(&mutex);
if (nf->active_timeout) {
poll_timer_wait_until(nf->next_timeout);
}
if (nf->packet.size) {
poll_immediate_wake();
}
if (nf->active_timeout) {
poll_timer_wait_until(nf->next_timeout);
}
if (nf->packet.size) {
poll_immediate_wake();
}
+ ovs_mutex_unlock(&mutex);
}
int
netflow_set_options(struct netflow *nf,
const struct netflow_options *nf_options)
}
int
netflow_set_options(struct netflow *nf,
const struct netflow_options *nf_options)
{
int error = 0;
long long int old_timeout;
{
int error = 0;
long long int old_timeout;
+ ovs_mutex_lock(&mutex);
nf->engine_type = nf_options->engine_type;
nf->engine_id = nf_options->engine_id;
nf->add_id_to_iface = nf_options->add_id_to_iface;
nf->engine_type = nf_options->engine_type;
nf->engine_id = nf_options->engine_id;
nf->add_id_to_iface = nf_options->add_id_to_iface;
nf->reconfig_time = time_msec();
nf->next_timeout = time_msec();
}
nf->reconfig_time = time_msec();
nf->next_timeout = time_msec();
}
+ ovs_mutex_unlock(&mutex);
nf->add_id_to_iface = false;
nf->netflow_cnt = 0;
hmap_init(&nf->flows);
nf->add_id_to_iface = false;
nf->netflow_cnt = 0;
hmap_init(&nf->flows);
+ atomic_init(&nf->ref_cnt, 1);
ofpbuf_init(&nf->packet, 1500);
return nf;
}
ofpbuf_init(&nf->packet, 1500);
return nf;
}
-void
-netflow_destroy(struct netflow *nf)
+struct netflow *
+netflow_ref(const struct netflow *nf_)
+ struct netflow *nf = CONST_CAST(struct netflow *, nf_);
+ int orig;
+ atomic_add(&nf->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
+ }
+ return nf;
+}
+
+void
+netflow_unref(struct netflow *nf)
+{
+ int orig;
+
+ if (!nf) {
+ return;
+ }
+
+ atomic_sub(&nf->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
+ if (orig == 1) {
ofpbuf_uninit(&nf->packet);
collectors_destroy(nf->collectors);
free(nf);
ofpbuf_uninit(&nf->packet);
collectors_destroy(nf->collectors);
free(nf);
static struct netflow_flow *
netflow_flow_lookup(const struct netflow *nf, const struct flow *flow)
static struct netflow_flow *
netflow_flow_lookup(const struct netflow *nf, const struct flow *flow)
{
struct netflow_flow *nf_flow;
{
struct netflow_flow *nf_flow;
#define NF_OUT_DROP OFP_PORT_C(UINT16_MAX - 2)
struct netflow *netflow_create(void);
#define NF_OUT_DROP OFP_PORT_C(UINT16_MAX - 2)
struct netflow *netflow_create(void);
-void netflow_destroy(struct netflow *);
+struct netflow *netflow_ref(const struct netflow *);
+void netflow_unref(struct netflow *);
+
int netflow_set_options(struct netflow *, const struct netflow_options *);
void netflow_expire(struct netflow *, struct flow *);
int netflow_set_options(struct netflow *, const struct netflow_options *);
void netflow_expire(struct netflow *, struct flow *);
mbridge_unref(ofproto->mbridge);
mbridge_unref(ofproto->mbridge);
- netflow_destroy(ofproto->netflow);
+ netflow_unref(ofproto->netflow);
dpif_sflow_unref(ofproto->sflow);
hmap_destroy(&ofproto->bundles);
mac_learning_unref(ofproto->ml);
dpif_sflow_unref(ofproto->sflow);
hmap_destroy(&ofproto->bundles);
mac_learning_unref(ofproto->ml);
return netflow_set_options(ofproto->netflow, netflow_options);
} else if (ofproto->netflow) {
ofproto->backer->need_revalidate = REV_RECONFIGURE;
return netflow_set_options(ofproto->netflow, netflow_options);
} else if (ofproto->netflow) {
ofproto->backer->need_revalidate = REV_RECONFIGURE;
- netflow_destroy(ofproto->netflow);
+ netflow_unref(ofproto->netflow);
ofproto->netflow = NULL;
}
ofproto->netflow = NULL;
}