[ovs-dev] [thread-safety 02/11] stp: Make the STP module thread safe.
Ethan Jackson
ethan at nicira.com
Sat Jul 27 01:07:03 UTC 2013
Signed-off-by: Ethan Jackson <ethan at nicira.com>
---
lib/stp.c | 360 +++++++++++++++++++++++++++++++++++++-----------
lib/stp.h | 3 +-
ofproto/ofproto-dpif.c | 2 +-
tests/test-stp.c | 2 +-
4 files changed, 280 insertions(+), 87 deletions(-)
diff --git a/lib/stp.c b/lib/stp.c
index 0b32cb5..aa396b6 100644
--- a/lib/stp.c
+++ b/lib/stp.c
@@ -140,9 +140,13 @@ struct stp {
struct stp_port *first_changed_port;
void (*send_bpdu)(struct ofpbuf *bpdu, int port_no, void *aux);
void *aux;
+
+ atomic_int ref_cnt;
};
-static struct list all_stps = LIST_INITIALIZER(&all_stps);
+static struct ovs_mutex mutex;
+static struct list all_stps__ = LIST_INITIALIZER(&all_stps__);
+static struct list *all_stps OVS_GUARDED_BY(&mutex) = &all_stps__;
#define FOR_EACH_ENABLED_PORT(PORT, STP) \
for ((PORT) = stp_next_enabled_port((STP), (STP)->ports); \
@@ -150,6 +154,7 @@ static struct list all_stps = LIST_INITIALIZER(&all_stps);
(PORT) = stp_next_enabled_port((STP), (PORT) + 1))
static struct stp_port *
stp_next_enabled_port(const struct stp *stp, const struct stp_port *port)
+ OVS_REQ_WRLOCK(mutex)
{
for (; port < &stp->ports[ARRAY_SIZE(stp->ports)]; port++) {
if (port->state != STP_DISABLED) {
@@ -161,42 +166,57 @@ stp_next_enabled_port(const struct stp *stp, const struct stp_port *port)
#define MESSAGE_AGE_INCREMENT 1
-static void stp_transmit_config(struct stp_port *);
+static void stp_transmit_config(struct stp_port *) OVS_REQ_WRLOCK(mutex);
static bool stp_supersedes_port_info(const struct stp_port *,
- const struct stp_config_bpdu *);
+ const struct stp_config_bpdu *)
+ OVS_REQ_WRLOCK(mutex);
static void stp_record_config_information(struct stp_port *,
- const struct stp_config_bpdu *);
+ const struct stp_config_bpdu *)
+ OVS_REQ_WRLOCK(mutex);
static void stp_record_config_timeout_values(struct stp *,
- const struct stp_config_bpdu *);
-static bool stp_is_designated_port(const struct stp_port *);
-static void stp_config_bpdu_generation(struct stp *);
-static void stp_transmit_tcn(struct stp *);
-static void stp_configuration_update(struct stp *);
+ const struct stp_config_bpdu *)
+ OVS_REQ_WRLOCK(mutex);
+static bool stp_is_designated_port(const struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_config_bpdu_generation(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_transmit_tcn(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_configuration_update(struct stp *) OVS_REQ_WRLOCK(mutex);
static bool stp_supersedes_root(const struct stp_port *root,
- const struct stp_port *);
-static void stp_root_selection(struct stp *);
-static void stp_designated_port_selection(struct stp *);
-static void stp_become_designated_port(struct stp_port *);
-static void stp_port_state_selection(struct stp *);
-static void stp_make_forwarding(struct stp_port *);
-static void stp_make_blocking(struct stp_port *);
-static void stp_set_port_state(struct stp_port *, enum stp_state);
-static void stp_topology_change_detection(struct stp *);
-static void stp_topology_change_acknowledged(struct stp *);
-static void stp_acknowledge_topology_change(struct stp_port *);
+ const struct stp_port *) OVS_REQ_WRLOCK(mutex);
+static void stp_root_selection(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_designated_port_selection(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_become_designated_port(struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_port_state_selection(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_make_forwarding(struct stp_port *) OVS_REQ_WRLOCK(mutex);
+static void stp_make_blocking(struct stp_port *) OVS_REQ_WRLOCK(mutex);
+static void stp_set_port_state(struct stp_port *, enum stp_state)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_topology_change_detection(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_topology_change_acknowledged(struct stp *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_acknowledge_topology_change(struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
static void stp_received_config_bpdu(struct stp *, struct stp_port *,
- const struct stp_config_bpdu *);
-static void stp_received_tcn_bpdu(struct stp *, struct stp_port *);
-static void stp_hello_timer_expiry(struct stp *);
-static void stp_message_age_timer_expiry(struct stp_port *);
-static bool stp_is_designated_for_some_port(const struct stp *);
-static void stp_forward_delay_timer_expiry(struct stp_port *);
-static void stp_tcn_timer_expiry(struct stp *);
-static void stp_topology_change_timer_expiry(struct stp *);
-static void stp_hold_timer_expiry(struct stp_port *);
-static void stp_initialize_port(struct stp_port *, enum stp_state);
-static void stp_become_root_bridge(struct stp *);
-static void stp_update_bridge_timers(struct stp *);
+ const struct stp_config_bpdu *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_received_tcn_bpdu(struct stp *, struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_hello_timer_expiry(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_message_age_timer_expiry(struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
+static bool stp_is_designated_for_some_port(const struct stp *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_forward_delay_timer_expiry(struct stp_port *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_tcn_timer_expiry(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_topology_change_timer_expiry(struct stp *)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_hold_timer_expiry(struct stp_port *) OVS_REQ_WRLOCK(mutex);
+static void stp_initialize_port(struct stp_port *, enum stp_state)
+ OVS_REQ_WRLOCK(mutex);
+static void stp_become_root_bridge(struct stp *) OVS_REQ_WRLOCK(mutex);
+static void stp_update_bridge_timers(struct stp *) OVS_REQ_WRLOCK(mutex);
static int clamp(int x, int min, int max);
static int ms_to_timer(int ms);
@@ -205,7 +225,8 @@ static void stp_start_timer(struct stp_timer *, int value);
static void stp_stop_timer(struct stp_timer *);
static bool stp_timer_expired(struct stp_timer *, int elapsed, int timeout);
-static void stp_send_bpdu(struct stp_port *, const void *, size_t);
+static void stp_send_bpdu(struct stp_port *, const void *, size_t)
+ OVS_REQ_WRLOCK(&mutex);
static void stp_unixctl_tcn(struct unixctl_conn *, int argc,
const char *argv[], void *aux);
@@ -234,9 +255,21 @@ stp_create(const char *name, stp_identifier bridge_id,
void (*send_bpdu)(struct ofpbuf *bpdu, int port_no, void *aux),
void *aux)
{
+ static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
struct stp *stp;
struct stp_port *p;
+ 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);
+ }
+
+ ovs_mutex_lock(&mutex);
stp = xzalloc(sizeof *stp);
stp->name = xstrdup(name);
stp->bridge_id = bridge_id;
@@ -272,15 +305,38 @@ stp_create(const char *name, stp_identifier bridge_id,
p->path_cost = 19; /* Recommended default for 100 Mb/s link. */
stp_initialize_port(p, STP_DISABLED);
}
- list_push_back(&all_stps, &stp->node);
+ atomic_init(&stp->ref_cnt, 1);
+
+ list_push_back(all_stps, &stp->node);
+ ovs_mutex_unlock(&mutex);
+ return stp;
+}
+
+struct stp *
+stp_ref(const struct stp *stp_)
+{
+ struct stp *stp = CONST_CAST(struct stp *, stp_);
+ if (stp) {
+ int orig;
+ atomic_add(&stp->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
+ }
return stp;
}
/* Destroys 'stp'. */
void
-stp_destroy(struct stp *stp)
+stp_unref(struct stp *stp)
{
- if (stp) {
+ int orig;
+
+ if (!stp) {
+ return;
+ }
+
+ atomic_sub(&stp->ref_cnt, 1, &orig);
+ ovs_assert(orig > 0);
+ if (orig == 1) {
list_remove(&stp->node);
free(stp->name);
free(stp);
@@ -294,6 +350,7 @@ stp_tick(struct stp *stp, int ms)
struct stp_port *p;
int elapsed;
+ ovs_mutex_lock(&mutex);
/* Convert 'ms' to STP timer ticks. Preserve any leftover milliseconds
* from previous stp_tick() calls so that we don't lose STP ticks when we
* are called too frequently. */
@@ -301,7 +358,7 @@ stp_tick(struct stp *stp, int ms)
elapsed = ms_to_timer(ms);
stp->elapsed_remainder = ms - timer_to_ms(elapsed);
if (!elapsed) {
- return;
+ goto out;
}
if (stp_timer_expired(&stp->hello_timer, elapsed, stp->hello_time)) {
@@ -328,10 +385,14 @@ stp_tick(struct stp *stp, int ms)
stp_hold_timer_expiry(p);
}
}
+
+out:
+ ovs_mutex_unlock(&mutex);
}
static void
set_bridge_id(struct stp *stp, stp_identifier new_bridge_id)
+ OVS_REQ_WRLOCK(&mutex)
{
if (new_bridge_id != stp->bridge_id) {
bool root;
@@ -357,15 +418,19 @@ stp_set_bridge_id(struct stp *stp, stp_identifier bridge_id)
{
const uint64_t mac_bits = (UINT64_C(1) << 48) - 1;
const uint64_t pri_bits = ~mac_bits;
+ ovs_mutex_lock(&mutex);
set_bridge_id(stp, (stp->bridge_id & pri_bits) | (bridge_id & mac_bits));
+ ovs_mutex_unlock(&mutex);
}
void
stp_set_bridge_priority(struct stp *stp, uint16_t new_priority)
{
const uint64_t mac_bits = (UINT64_C(1) << 48) - 1;
+ ovs_mutex_lock(&mutex);
set_bridge_id(stp, ((stp->bridge_id & mac_bits)
| ((uint64_t) new_priority << 48)));
+ ovs_mutex_unlock(&mutex);
}
/* Sets the desired hello time for 'stp' to 'ms', in milliseconds. The actual
@@ -375,8 +440,10 @@ stp_set_bridge_priority(struct stp *stp, uint16_t new_priority)
void
stp_set_hello_time(struct stp *stp, int ms)
{
+ ovs_mutex_lock(&mutex);
stp->rq_hello_time = ms;
stp_update_bridge_timers(stp);
+ ovs_mutex_unlock(&mutex);
}
/* Sets the desired max age for 'stp' to 'ms', in milliseconds. The actual max
@@ -387,8 +454,10 @@ stp_set_hello_time(struct stp *stp, int ms)
void
stp_set_max_age(struct stp *stp, int ms)
{
+ ovs_mutex_lock(&mutex);
stp->rq_max_age = ms;
stp_update_bridge_timers(stp);
+ ovs_mutex_unlock(&mutex);
}
/* Sets the desired forward delay for 'stp' to 'ms', in milliseconds. The
@@ -398,29 +467,46 @@ stp_set_max_age(struct stp *stp, int ms)
void
stp_set_forward_delay(struct stp *stp, int ms)
{
+ ovs_mutex_lock(&mutex);
stp->rq_forward_delay = ms;
stp_update_bridge_timers(stp);
+ ovs_mutex_unlock(&mutex);
}
/* Returns the name given to 'stp' in the call to stp_create(). */
const char *
stp_get_name(const struct stp *stp)
{
- return stp->name;
+ char *name;
+
+ ovs_mutex_lock(&mutex);
+ name = stp->name;
+ ovs_mutex_unlock(&mutex);
+ return name;
}
/* Returns the bridge ID for 'stp'. */
stp_identifier
stp_get_bridge_id(const struct stp *stp)
{
- return stp->bridge_id;
+ stp_identifier bridge_id;
+
+ ovs_mutex_lock(&mutex);
+ bridge_id = stp->bridge_id;
+ ovs_mutex_unlock(&mutex);
+ return bridge_id;
}
/* Returns the bridge ID of the bridge currently believed to be the root. */
stp_identifier
stp_get_designated_root(const struct stp *stp)
{
- return stp->designated_root;
+ stp_identifier designated_root;
+
+ ovs_mutex_lock(&mutex);
+ designated_root = stp->designated_root;
+ ovs_mutex_unlock(&mutex);
+ return designated_root;
}
/* Returns true if 'stp' believes itself to the be root of the spanning tree,
@@ -428,14 +514,24 @@ stp_get_designated_root(const struct stp *stp)
bool
stp_is_root_bridge(const struct stp *stp)
{
- return stp->bridge_id == stp->designated_root;
+ bool is_root;
+
+ ovs_mutex_lock(&mutex);
+ is_root = stp->bridge_id == stp->designated_root;
+ ovs_mutex_unlock(&mutex);
+ return is_root;
}
/* Returns the cost of the path from 'stp' to the root of the spanning tree. */
int
stp_get_root_path_cost(const struct stp *stp)
{
- return stp->root_path_cost;
+ int cost;
+
+ ovs_mutex_lock(&mutex);
+ cost = stp->root_path_cost;
+ ovs_mutex_unlock(&mutex);
+ return cost;
}
/* Returns the bridge hello time, in ms. The returned value is not necessarily
@@ -444,7 +540,12 @@ stp_get_root_path_cost(const struct stp *stp)
int
stp_get_hello_time(const struct stp *stp)
{
- return timer_to_ms(stp->bridge_hello_time);
+ int time;
+
+ ovs_mutex_lock(&mutex);
+ time = timer_to_ms(stp->bridge_hello_time);
+ ovs_mutex_unlock(&mutex);
+ return time;
}
/* Returns the bridge max age, in ms. The returned value is not necessarily
@@ -454,7 +555,12 @@ stp_get_hello_time(const struct stp *stp)
int
stp_get_max_age(const struct stp *stp)
{
- return timer_to_ms(stp->bridge_max_age);
+ int time;
+
+ ovs_mutex_lock(&mutex);
+ time = timer_to_ms(stp->bridge_max_age);
+ ovs_mutex_unlock(&mutex);
+ return time;
}
/* Returns the bridge forward delay, in ms. The returned value is not
@@ -464,7 +570,12 @@ stp_get_max_age(const struct stp *stp)
int
stp_get_forward_delay(const struct stp *stp)
{
- return timer_to_ms(stp->bridge_forward_delay);
+ int time;
+
+ ovs_mutex_lock(&mutex);
+ time = timer_to_ms(stp->bridge_forward_delay);
+ ovs_mutex_unlock(&mutex);
+ return time;
}
/* Returns true if something has happened to 'stp' which necessitates flushing
@@ -473,8 +584,12 @@ stp_get_forward_delay(const struct stp *stp)
bool
stp_check_and_reset_fdb_flush(struct stp *stp)
{
- bool needs_flush = stp->fdb_needs_flush;
+ bool needs_flush;
+
+ ovs_mutex_lock(&mutex);
+ needs_flush = stp->fdb_needs_flush;
stp->fdb_needs_flush = false;
+ ovs_mutex_unlock(&mutex);
return needs_flush;
}
@@ -483,8 +598,13 @@ stp_check_and_reset_fdb_flush(struct stp *stp)
struct stp_port *
stp_get_port(struct stp *stp, int port_no)
{
+ struct stp_port *port;
+
+ ovs_mutex_lock(&mutex);
ovs_assert(port_no >= 0 && port_no < ARRAY_SIZE(stp->ports));
- return &stp->ports[port_no];
+ port = &stp->ports[port_no];
+ ovs_mutex_unlock(&mutex);
+ return port;
}
/* Returns the port connecting 'stp' to the root bridge, or a null pointer if
@@ -492,7 +612,12 @@ stp_get_port(struct stp *stp, int port_no)
struct stp_port *
stp_get_root_port(struct stp *stp)
{
- return stp->root_port;
+ struct stp_port *port;
+
+ ovs_mutex_lock(&mutex);
+ port = stp->root_port;
+ ovs_mutex_unlock(&mutex);
+ return port;
}
/* Finds a port whose state has changed. If successful, stores the port whose
@@ -501,20 +626,26 @@ stp_get_root_port(struct stp *stp)
bool
stp_get_changed_port(struct stp *stp, struct stp_port **portp)
{
- struct stp_port *end = &stp->ports[ARRAY_SIZE(stp->ports)];
- struct stp_port *p;
+ struct stp_port *end, *p;
+ bool changed = false;
+ ovs_mutex_lock(&mutex);
+ end = &stp->ports[ARRAY_SIZE(stp->ports)];
for (p = stp->first_changed_port; p < end; p++) {
if (p->state_changed) {
p->state_changed = false;
stp->first_changed_port = p + 1;
*portp = p;
- return true;
+ changed = true;
+ goto out;
}
}
stp->first_changed_port = end;
*portp = NULL;
- return false;
+
+out:
+ ovs_mutex_unlock(&mutex);
+ return changed;
}
/* Returns the name for the given 'state' (for use in debugging and log
@@ -589,14 +720,15 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
struct stp *stp = p->stp;
const struct stp_bpdu_header *header;
+ ovs_mutex_lock(&mutex);
if (p->state == STP_DISABLED) {
- return;
+ goto out;
}
if (bpdu_size < sizeof(struct stp_bpdu_header)) {
VLOG_WARN("%s: received runt %zu-byte BPDU", stp->name, bpdu_size);
p->error_count++;
- return;
+ goto out;
}
header = bpdu;
@@ -604,7 +736,7 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
VLOG_WARN("%s: received BPDU with unexpected protocol ID %"PRIu16,
stp->name, ntohs(header->protocol_id));
p->error_count++;
- return;
+ goto out;
}
if (header->protocol_version != STP_PROTOCOL_VERSION) {
VLOG_DBG("%s: received BPDU with unexpected protocol version %"PRIu8,
@@ -617,7 +749,7 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
VLOG_WARN("%s: received config BPDU with invalid size %zu",
stp->name, bpdu_size);
p->error_count++;
- return;
+ goto out;
}
stp_received_config_bpdu(stp, p, bpdu);
break;
@@ -627,7 +759,7 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
VLOG_WARN("%s: received TCN BPDU with invalid size %zu",
stp->name, bpdu_size);
p->error_count++;
- return;
+ goto out;
}
stp_received_tcn_bpdu(stp, p);
break;
@@ -636,16 +768,24 @@ stp_received_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
VLOG_WARN("%s: received BPDU of unexpected type %"PRIu8,
stp->name, header->bpdu_type);
p->error_count++;
- return;
+ goto out;
}
p->rx_count++;
+
+out:
+ ovs_mutex_unlock(&mutex);
}
/* Returns the STP entity in which 'p' is nested. */
struct stp *
stp_port_get_stp(struct stp_port *p)
{
- return p->stp;
+ struct stp *stp;
+
+ ovs_mutex_lock(&mutex);
+ stp = p->stp;
+ ovs_mutex_unlock(&mutex);
+ return stp;
}
/* Sets the 'aux' member of 'p'.
@@ -656,70 +796,104 @@ stp_port_get_stp(struct stp_port *p)
void
stp_port_set_aux(struct stp_port *p, void *aux)
{
+ ovs_mutex_lock(&mutex);
p->aux = aux;
+ ovs_mutex_unlock(&mutex);
}
/* Returns the 'aux' member of 'p'. */
void *
stp_port_get_aux(struct stp_port *p)
{
- return p->aux;
+ void *aux;
+
+ ovs_mutex_lock(&mutex);
+ aux = p->aux;
+ ovs_mutex_unlock(&mutex);
+ return aux;
}
/* Returns the index of port 'p' within its bridge. */
int
stp_port_no(const struct stp_port *p)
{
- struct stp *stp = p->stp;
+ struct stp *stp;
+ int index;
+
+ ovs_mutex_lock(&mutex);
+ stp = p->stp;
ovs_assert(p >= stp->ports && p < &stp->ports[ARRAY_SIZE(stp->ports)]);
- return p - stp->ports;
+ index = p - p->stp->ports;
+ ovs_mutex_unlock(&mutex);
+ return index;
}
/* Returns the port ID for 'p'. */
int
stp_port_get_id(const struct stp_port *p)
{
- return p->port_id;
+ int port_id;
+
+ ovs_mutex_lock(&mutex);
+ port_id = p->port_id;
+ ovs_mutex_unlock(&mutex);
+ return port_id;
}
/* Returns the state of port 'p'. */
enum stp_state
stp_port_get_state(const struct stp_port *p)
{
- return p->state;
+ enum stp_state state;
+
+ ovs_mutex_lock(&mutex);
+ state = p->state;
+ ovs_mutex_unlock(&mutex);
+ return state;
}
/* Returns the role of port 'p'. */
enum stp_role
stp_port_get_role(const struct stp_port *p)
{
- struct stp_port *root_port = stp_get_root_port(p->stp);
+ struct stp_port *root_port;
+ enum stp_role role;
+ ovs_mutex_lock(&mutex);
+ root_port = p->stp->root_port;
if (root_port && root_port->port_id == p->port_id) {
- return STP_ROLE_ROOT;
+ role = STP_ROLE_ROOT;
} else if (stp_is_designated_port(p)) {
- return STP_ROLE_DESIGNATED;
+ role = STP_ROLE_DESIGNATED;
} else if (p->state == STP_DISABLED) {
- return STP_ROLE_DISABLED;
+ role = STP_ROLE_DISABLED;
} else {
- return STP_ROLE_ALTERNATE;
+ role = STP_ROLE_ALTERNATE;
}
+ ovs_mutex_unlock(&mutex);
+ return role;
}
/* Retrieves BPDU transmit and receive counts for 'p'. */
-void stp_port_get_counts(const struct stp_port *p,
- int *tx_count, int *rx_count, int *error_count)
+void
+stp_port_get_counts(const struct stp_port *p,
+ int *tx_count, int *rx_count, int *error_count)
{
+ ovs_mutex_lock(&mutex);
*tx_count = p->tx_count;
*rx_count = p->rx_count;
*error_count = p->error_count;
+ ovs_mutex_unlock(&mutex);
}
/* Disables STP on port 'p'. */
void
stp_port_disable(struct stp_port *p)
{
- struct stp *stp = p->stp;
+ struct stp *stp;
+
+ ovs_mutex_lock(&mutex);
+ stp = p->stp;
if (p->state != STP_DISABLED) {
bool root = stp_is_root_bridge(stp);
stp_become_designated_port(p);
@@ -735,16 +909,19 @@ stp_port_disable(struct stp_port *p)
}
p->aux = NULL;
}
+ ovs_mutex_unlock(&mutex);
}
/* Enables STP on port 'p'. The port will initially be in "blocking" state. */
void
stp_port_enable(struct stp_port *p)
{
+ ovs_mutex_lock(&mutex);
if (p->state == STP_DISABLED) {
stp_initialize_port(p, STP_BLOCKING);
stp_port_state_selection(p->stp);
}
+ ovs_mutex_unlock(&mutex);
}
/* Sets the priority of port 'p' to 'new_priority'. Lower numerical values
@@ -752,7 +929,10 @@ stp_port_enable(struct stp_port *p)
void
stp_port_set_priority(struct stp_port *p, uint8_t new_priority)
{
- uint16_t new_port_id = (p->port_id & 0xff) | (new_priority << 8);
+ uint16_t new_port_id;
+
+ ovs_mutex_lock(&mutex);
+ new_port_id = (p->port_id & 0xff) | (new_priority << 8);
if (p->port_id != new_port_id) {
struct stp *stp = p->stp;
if (stp_is_designated_port(p)) {
@@ -765,19 +945,25 @@ stp_port_set_priority(struct stp_port *p, uint8_t new_priority)
stp_port_state_selection(stp);
}
}
+ ovs_mutex_unlock(&mutex);
}
/* Convert 'speed' (measured in Mb/s) into the path cost. */
uint16_t
stp_convert_speed_to_cost(unsigned int speed)
{
- return speed >= 10000 ? 2 /* 10 Gb/s. */
- : speed >= 1000 ? 4 /* 1 Gb/s. */
- : speed >= 100 ? 19 /* 100 Mb/s. */
- : speed >= 16 ? 62 /* 16 Mb/s. */
- : speed >= 10 ? 100 /* 10 Mb/s. */
- : speed >= 4 ? 250 /* 4 Mb/s. */
- : 19; /* 100 Mb/s (guess). */
+ uint16_t ret;
+
+ ovs_mutex_lock(&mutex);
+ ret = speed >= 10000 ? 2 /* 10 Gb/s. */
+ : speed >= 1000 ? 4 /* 1 Gb/s. */
+ : speed >= 100 ? 19 /* 100 Mb/s. */
+ : speed >= 16 ? 62 /* 16 Mb/s. */
+ : speed >= 10 ? 100 /* 10 Mb/s. */
+ : speed >= 4 ? 250 /* 4 Mb/s. */
+ : 19; /* 100 Mb/s (guess). */
+ ovs_mutex_unlock(&mutex);
+ return ret;
}
/* Sets the path cost of port 'p' to 'path_cost'. Lower values are generally
@@ -786,12 +972,14 @@ stp_convert_speed_to_cost(unsigned int speed)
void
stp_port_set_path_cost(struct stp_port *p, uint16_t path_cost)
{
+ ovs_mutex_lock(&mutex);
if (p->path_cost != path_cost) {
struct stp *stp = p->stp;
p->path_cost = path_cost;
stp_configuration_update(stp);
stp_port_state_selection(stp);
}
+ ovs_mutex_unlock(&mutex);
}
/* Sets the path cost of port 'p' based on 'speed' (measured in Mb/s). */
@@ -1353,11 +1541,11 @@ stp_send_bpdu(struct stp_port *p, const void *bpdu, size_t bpdu_size)
/* Unixctl. */
static struct stp *
-stp_find(const char *name)
+stp_find(const char *name) OVS_REQ_WRLOCK(&mutex)
{
struct stp *stp;
- LIST_FOR_EACH (stp, node, &all_stps) {
+ LIST_FOR_EACH (stp, node, all_stps) {
if (!strcmp(stp->name, name)) {
return stp;
}
@@ -1369,21 +1557,25 @@ static void
stp_unixctl_tcn(struct unixctl_conn *conn, int argc,
const char *argv[], void *aux OVS_UNUSED)
{
+ ovs_mutex_lock(&mutex);
if (argc > 1) {
struct stp *stp = stp_find(argv[1]);
if (!stp) {
unixctl_command_reply_error(conn, "no such stp object");
- return;
+ goto out;
}
stp_topology_change_detection(stp);
} else {
struct stp *stp;
- LIST_FOR_EACH (stp, node, &all_stps) {
+ LIST_FOR_EACH (stp, node, all_stps) {
stp_topology_change_detection(stp);
}
}
unixctl_command_reply(conn, "OK");
+
+out:
+ ovs_mutex_unlock(&mutex);
}
diff --git a/lib/stp.h b/lib/stp.h
index 524b9dc..affde18 100644
--- a/lib/stp.h
+++ b/lib/stp.h
@@ -60,7 +60,8 @@ struct stp *stp_create(const char *name, stp_identifier bridge_id,
void (*send_bpdu)(struct ofpbuf *bpdu, int port_no,
void *aux),
void *aux);
-void stp_destroy(struct stp *);
+struct stp *stp_ref(const struct stp *);
+void stp_unref(struct stp *);
void stp_tick(struct stp *, int ms);
void stp_set_bridge_id(struct stp *, stp_identifier bridge_id);
void stp_set_bridge_priority(struct stp *, uint16_t new_priority);
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 79e23a4..bf2c9d4 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1960,7 +1960,7 @@ set_stp(struct ofproto *ofproto_, const struct ofproto_stp_settings *s)
set_stp_port(ofport, NULL);
}
- stp_destroy(ofproto->stp);
+ stp_unref(ofproto->stp);
ofproto->stp = NULL;
}
diff --git a/tests/test-stp.c b/tests/test-stp.c
index 0acc7e0..28e9a6e 100644
--- a/tests/test-stp.c
+++ b/tests/test-stp.c
@@ -661,7 +661,7 @@ main(int argc, char *argv[])
}
for (i = 0; i < tc->n_bridges; i++) {
struct bridge *bridge = tc->bridges[i];
- stp_destroy(bridge->stp);
+ stp_unref(bridge->stp);
free(bridge);
}
free(tc);
--
1.7.9.5
More information about the dev
mailing list