#include "ofpbuf.h"
#include "packets.h"
#include "poll-loop.h"
+#include "timer.h"
#include "timeval.h"
#include "vlog.h"
uint8_t ccm_interval; /* The CCM transmission interval. */
int ccm_interval_ms; /* 'ccm_interval' in milliseconds. */
- long long ccm_sent; /* The time we last sent a CCM. */
- long long fault_check; /* The time we last checked for faults. */
+ struct timer tx_timer; /* Send CCM when expired. */
+ struct timer fault_timer; /* Check for faults when expired. */
- struct hmap x_remote_mps; /* Unexpected remote MPs. */
- struct hmap x_remote_maids; /* Unexpected remote MAIDs. */
+ long long x_recv_time;
};
static int
NOT_REACHED();
}
+static long long int
+cfm_fault_interval(struct cfm_internal *cfmi)
+{
+ /* According to the 802.1ag specification we should assume every other MP
+ * with the same MAID has the same transmission interval that we have. If
+ * an MP has a different interval, cfm_process_heartbeat will register it
+ * as a fault (likely due to a configuration error). Thus we can check all
+ * MPs at once making this quite a bit simpler.
+ *
+ * According to the specification we should check when (ccm_interval_ms *
+ * 3.5)ms have passed. */
+ return (cfmi->ccm_interval_ms * 7) / 2;
+}
+
static uint8_t
ms_to_ccm_interval(int interval_ms)
{
return NULL;
}
-static struct remote_maid *
-lookup_remote_maid(const struct hmap *hmap, uint8_t maid[CCM_MAID_LEN])
-{
- uint32_t hash;
- struct remote_maid *rmaid;
-
- hash = hash_bytes(maid, CCM_MAID_LEN, 0);
- HMAP_FOR_EACH_WITH_HASH (rmaid, node, hash, hmap) {
- if (memcmp(rmaid->maid, maid, CCM_MAID_LEN) == 0) {
- return rmaid;
- }
- }
- return NULL;
-}
-
/* Allocates a 'cfm' object. This object should have its 'mpid', 'maid',
* 'eth_src', and 'interval' filled out. When changes are made to the 'cfm'
* object, cfm_configure should be called before using it. */
cfmi = xzalloc(sizeof *cfmi);
cfm = &cfmi->cfm;
+ cfmi->x_recv_time = LLONG_MIN;
hmap_init(&cfm->remote_mps);
- hmap_init(&cfmi->x_remote_mps);
- hmap_init(&cfmi->x_remote_maids);
return cfm;
}
{
struct cfm_internal *cfmi = cfm_to_internal(cfm);
struct remote_mp *rmp, *rmp_next;
- struct remote_maid *rmaid, *rmaid_next;
if (!cfm) {
return;
free(rmp);
}
- HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfmi->x_remote_mps) {
- hmap_remove(&cfmi->x_remote_mps, &rmp->node);
- free(rmp);
- }
-
- HMAP_FOR_EACH_SAFE (rmaid, rmaid_next, node, &cfmi->x_remote_maids) {
- hmap_remove(&cfmi->x_remote_maids, &rmaid->node);
- free(rmaid);
- }
-
hmap_destroy(&cfm->remote_mps);
- hmap_destroy(&cfmi->x_remote_mps);
- hmap_destroy(&cfmi->x_remote_maids);
free(cfmi);
}
long long now = time_msec();
struct cfm_internal *cfmi = cfm_to_internal(cfm);
- /* According to the 802.1ag specification we should assume every other MP
- * with the same MAID has the same transmission interval that we have. If
- * an MP has a different interval, cfm_process_heartbeat will register it
- * as a fault (likely due to a configuration error). Thus we can check all
- * MPs at once making this quite a bit simpler.
- *
- * According to the specification we should check when (ccm_interval_ms *
- * 3.5)ms have passed. */
- if (now >= cfmi->fault_check + (cfmi->ccm_interval_ms * 7) / 2) {
+ if (timer_expired(&cfmi->fault_timer)) {
bool fault;
- struct remote_mp *rmp, *rmp_next;
- struct remote_maid *rmaid, *rmaid_next;
+ struct remote_mp *rmp;
+ long long int interval;
- fault = false;
+ interval = cfm_fault_interval(cfmi);
+ fault = now < cfmi->x_recv_time + interval;
HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) {
- rmp->fault = rmp->fault || cfmi->fault_check > rmp->recv_time;
- fault = rmp->fault || fault;
- }
-
- HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfmi->x_remote_mps) {
- if (cfmi->fault_check > rmp->recv_time) {
- hmap_remove(&cfmi->x_remote_mps, &rmp->node);
- free(rmp);
+ if (rmp->recv_time < timer_enabled_at(&cfmi->fault_timer, interval)
+ || timer_expired_at(&cfmi->fault_timer, rmp->recv_time)) {
+ rmp->fault = true;
}
- }
- HMAP_FOR_EACH_SAFE (rmaid, rmaid_next, node, &cfmi->x_remote_maids) {
- if (cfmi->fault_check > rmaid->recv_time) {
- hmap_remove(&cfmi->x_remote_maids, &rmaid->node);
- free(rmaid);
+ if (rmp->fault) {
+ fault = true;
}
}
- fault = (fault || !hmap_is_empty(&cfmi->x_remote_mps)
- || !hmap_is_empty(&cfmi->x_remote_maids));
-
- cfm->fault = fault;
- cfmi->fault_check = now;
+ cfm->fault = fault;
+ timer_set_duration(&cfmi->fault_timer, interval);
}
}
{
struct cfm_internal *cfmi = cfm_to_internal(cfm);
- return time_msec() >= cfmi->ccm_sent + cfmi->ccm_interval_ms;
+ return timer_expired(&cfmi->tx_timer);
}
/* Composes a CCM message into 'ccm'. Messages generated with this function
{
struct cfm_internal *cfmi = cfm_to_internal(cfm);
- cfmi->ccm_sent = time_msec();
+ timer_set_duration(&cfmi->tx_timer, cfmi->ccm_interval_ms);
ccm->mdlevel_version = 0;
ccm->opcode = CCM_OPCODE;
void
cfm_wait(struct cfm *cfm)
{
- long long wait;
struct cfm_internal *cfmi = cfm_to_internal(cfm);
- wait = MIN(cfmi->ccm_sent + cfmi->ccm_interval_ms,
- cfmi->fault_check + cfmi->ccm_interval_ms * 4);
- poll_timer_wait_until(wait);
+ timer_wait(&cfmi->tx_timer);
+ timer_wait(&cfmi->fault_timer);
}
/* Should be called whenever a client of the cfm library changes the internals
bool
cfm_configure(struct cfm *cfm)
{
- struct cfm_internal *cfmi;
+ struct cfm_internal *cfmi = cfm_to_internal(cfm);
+ uint8_t interval;
if (!cfm_is_valid_mpid(cfm->mpid) || !cfm->interval) {
return false;
}
- cfmi = cfm_to_internal(cfm);
- cfmi->ccm_interval = ms_to_ccm_interval(cfm->interval);
- cfmi->ccm_interval_ms = ccm_interval_to_ms(cfmi->ccm_interval);
+ interval = ms_to_ccm_interval(cfm->interval);
+
+ if (interval != cfmi->ccm_interval) {
+ cfmi->ccm_interval = interval;
+ cfmi->ccm_interval_ms = ccm_interval_to_ms(interval);
+
+ timer_set_expired(&cfmi->tx_timer);
+ timer_set_duration(&cfmi->fault_timer, cfm_fault_interval(cfmi));
+ }
- /* Force a resend and check in case anything changed. */
- cfmi->ccm_sent = 0;
- cfmi->fault_check = 0;
return true;
}
void
cfm_update_remote_mps(struct cfm *cfm, const uint16_t *mpids, size_t n_mpids)
{
- struct cfm_internal *cfmi = cfm_to_internal(cfm);
size_t i;
struct hmap new_rmps;
struct remote_mp *rmp, *rmp_next;
if ((rmp = lookup_remote_mp(&cfm->remote_mps, mpid))) {
hmap_remove(&cfm->remote_mps, &rmp->node);
- } else if ((rmp = lookup_remote_mp(&cfmi->x_remote_mps, mpid))) {
- hmap_remove(&cfmi->x_remote_mps, &rmp->node);
} else {
rmp = xzalloc(sizeof *rmp);
rmp->mpid = mpid;
{
struct ccm *ccm;
uint16_t ccm_mpid;
- uint32_t ccm_seq;
uint8_t ccm_interval;
struct remote_mp *rmp;
+ struct eth_header *eth;
struct cfm_internal *cfmi = cfm_to_internal(cfm);
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
+ eth = p->l2;
ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_LEN);
if (!ccm) {
}
if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) {
- struct remote_maid *rmaid;
-
- rmaid = lookup_remote_maid(&cfmi->x_remote_maids, ccm->maid);
- if (rmaid) {
- rmaid->recv_time = time_msec();
- } else {
- rmaid = xzalloc(sizeof *rmaid);
- rmaid->recv_time = time_msec();
- memcpy(rmaid->maid, ccm->maid, sizeof rmaid->maid);
- hmap_insert(&cfmi->x_remote_maids, &rmaid->node,
- hash_bytes(ccm->maid, CCM_MAID_LEN, 0));
- }
+ cfmi->x_recv_time = time_msec();
cfm->fault = true;
+ VLOG_WARN_RL(&rl, "Received unexpected remote MAID from MAC "
+ ETH_ADDR_FMT, ETH_ADDR_ARGS(eth->eth_src));
} else {
ccm_mpid = ntohs(ccm->mpid);
- ccm_seq = ntohl(ccm->seq);
ccm_interval = ccm->flags & 0x7;
rmp = lookup_remote_mp(&cfm->remote_mps, ccm_mpid);
- if (!rmp) {
- rmp = lookup_remote_mp(&cfmi->x_remote_mps, ccm_mpid);
- }
-
- if (!rmp) {
- rmp = xzalloc(sizeof *rmp);
- rmp->mpid = ccm_mpid;
- hmap_insert(&cfmi->x_remote_mps, &rmp->node, hash_mpid(ccm_mpid));
- rmp->fault = true;
- }
-
- rmp->recv_time = time_msec();
- rmp->fault = ccm_interval != cfmi->ccm_interval;
-
- if (rmp->fault) {
+ if (rmp) {
+ rmp->recv_time = time_msec();
+ rmp->fault = ccm_interval != cfmi->ccm_interval;
+ cfm->fault = rmp->fault || cfm->fault;
+ } else {
+ cfmi->x_recv_time = time_msec();
cfm->fault = true;
+ VLOG_WARN_RL(&rl, "Received unexpected remote MPID %d from MAC "
+ ETH_ADDR_FMT, ccm_mpid, ETH_ADDR_ARGS(eth->eth_src));
}
}
}
-static void
-put_remote_mp(struct ds *ds, const char *header,
- const struct remote_mp *rmp)
-{
- ds_put_format(ds, "%s %"PRIu16": %s\n", header, rmp->mpid,
- rmp->fault ? "fault" : "");
- ds_put_format(ds, "\ttime since CCM rx: %lldms\n",
- time_msec() - rmp->recv_time);
-}
-
void
cfm_dump_ds(const struct cfm *cfm, struct ds *ds)
{
cfm->fault ? "fault" : "");
ds_put_format(ds, "\tinterval: %dms\n", cfmi->ccm_interval_ms);
- ds_put_format(ds, "\ttime since CCM tx: %lldms\n", now - cfmi->ccm_sent);
- ds_put_format(ds, "\ttime since fault check: %lldms\n",
- now - cfmi->fault_check);
- ds_put_format(ds, "\tunexpected remote MAIDS: %s\n",
- !hmap_is_empty(&cfmi->x_remote_maids) ? "true" : "false");
+ ds_put_format(ds, "\tnext CCM tx: %lldms\n",
+ timer_msecs_until_expired(&cfmi->tx_timer));
+ ds_put_format(ds, "\tnext fault check: %lldms\n",
+ timer_msecs_until_expired(&cfmi->fault_timer));
+
+ if (cfmi->x_recv_time != LLONG_MIN) {
+ ds_put_format(ds, "\ttime since bad CCM rx: %lldms\n",
+ now - cfmi->x_recv_time);
+ }
ds_put_cstr(ds, "\n");
HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) {
- put_remote_mp(ds, "Remote MPID", rmp);
- }
-
- HMAP_FOR_EACH (rmp, node, &cfmi->x_remote_mps) {
- put_remote_mp(ds, "Unexpected Remote MPID", rmp);
+ ds_put_format(ds, "Remote MPID %"PRIu16": %s\n", rmp->mpid,
+ rmp->fault ? "fault" : "");
+ ds_put_format(ds, "\ttime since CCM rx: %lldms\n",
+ time_msec() - rmp->recv_time);
}
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff