X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcfm.c;h=f6cfb2e675ef2edfa5d2bf94cbf055e7312561a9;hb=33d532dafaf36cafa1f65c8d4ed042e9ddef8078;hp=bdefde6c10379567dc5ed8d73a0fa53c08385a06;hpb=f805c4cc6e3de7ecd6de9bae99c0405e84334d1e;p=openvswitch diff --git a/lib/cfm.c b/lib/cfm.c index bdefde6c..f6cfb2e6 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -21,12 +21,14 @@ #include #include +#include "dynamic-string.h" #include "flow.h" #include "hash.h" #include "hmap.h" #include "ofpbuf.h" #include "packets.h" #include "poll-loop.h" +#include "timer.h" #include "timeval.h" #include "vlog.h" @@ -41,8 +43,10 @@ struct cfm_internal { 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. */ + + long long x_recv_time; }; static int @@ -78,7 +82,7 @@ ms_to_ccm_interval(int interval_ms) } static struct cfm_internal * -cfm_to_internal(struct cfm *cfm) +cfm_to_internal(const struct cfm *cfm) { return CONTAINER_OF(cfm, struct cfm_internal, cfm); } @@ -110,21 +114,6 @@ lookup_remote_mp(const struct hmap *hmap, uint16_t mpid) 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. */ @@ -136,18 +125,17 @@ cfm_create(void) cfmi = xzalloc(sizeof *cfmi); cfm = &cfmi->cfm; + cfmi->x_recv_time = LLONG_MIN; hmap_init(&cfm->remote_mps); - hmap_init(&cfm->x_remote_mps); - hmap_init(&cfm->x_remote_maids); return cfm; } void cfm_destroy(struct cfm *cfm) { + struct cfm_internal *cfmi = cfm_to_internal(cfm); struct remote_mp *rmp, *rmp_next; - struct remote_maid *rmaid, *rmaid_next; if (!cfm) { return; @@ -158,20 +146,8 @@ cfm_destroy(struct cfm *cfm) free(rmp); } - HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->x_remote_mps) { - hmap_remove(&cfm->x_remote_mps, &rmp->node); - free(rmp); - } - - HMAP_FOR_EACH_SAFE (rmaid, rmaid_next, node, &cfm->x_remote_maids) { - hmap_remove(&cfm->x_remote_maids, &rmaid->node); - free(rmaid); - } - hmap_destroy(&cfm->remote_mps); - hmap_destroy(&cfm->x_remote_mps); - hmap_destroy(&cfm->x_remote_maids); - free(cfm_to_internal(cfm)); + free(cfmi); } /* Should be run periodically to update fault statistics messages. */ @@ -180,6 +156,7 @@ cfm_run(struct cfm *cfm) { long long now = time_msec(); struct cfm_internal *cfmi = cfm_to_internal(cfm); + long long fault_interval; /* 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 @@ -188,39 +165,26 @@ cfm_run(struct cfm *cfm) * 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. We changed the multiplier to 4 to avoid messy - * floating point arithmetic and add a bit of wiggle room. */ - if (now >= cfmi->fault_check + cfmi->ccm_interval_ms * 4) { + * 3.5)ms have passed. */ + fault_interval = (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; - fault = false; + fault = now < cfmi->x_recv_time + fault_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, &cfm->x_remote_mps) { - if (cfmi->fault_check > rmp->recv_time) { - hmap_remove(&cfm->x_remote_mps, &rmp->node); - free(rmp); + if (timer_expired_at(&cfmi->fault_timer, rmp->recv_time)) { + rmp->fault = true; } - } - HMAP_FOR_EACH_SAFE (rmaid, rmaid_next, node, &cfm->x_remote_maids) { - if (cfmi->fault_check > rmaid->recv_time) { - hmap_remove(&cfm->x_remote_maids, &rmaid->node); - free(rmaid); + if (rmp->fault) { + fault = true; } } - fault = (fault || !hmap_is_empty(&cfm->x_remote_mps) - || !hmap_is_empty(&cfm->x_remote_maids)); - - cfm->fault = fault; - cfmi->fault_check = now; + cfm->fault = fault; + timer_set_duration(&cfmi->fault_timer, fault_interval); } } @@ -231,7 +195,7 @@ cfm_should_send_ccm(struct cfm *cfm) { 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 @@ -241,7 +205,7 @@ cfm_compose_ccm(struct cfm *cfm, struct ccm *ccm) { 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; @@ -255,12 +219,10 @@ cfm_compose_ccm(struct cfm *cfm, struct ccm *ccm) 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 @@ -279,8 +241,8 @@ cfm_configure(struct cfm *cfm) cfmi->ccm_interval_ms = ccm_interval_to_ms(cfmi->ccm_interval); /* Force a resend and check in case anything changed. */ - cfmi->ccm_sent = 0; - cfmi->fault_check = 0; + timer_set_expired(&cfmi->tx_timer); + timer_set_expired(&cfmi->fault_timer); return true; } @@ -305,8 +267,6 @@ cfm_update_remote_mps(struct cfm *cfm, const uint16_t *mpids, size_t n_mpids) if ((rmp = lookup_remote_mp(&cfm->remote_mps, mpid))) { hmap_remove(&cfm->remote_mps, &rmp->node); - } else if ((rmp = lookup_remote_mp(&cfm->x_remote_mps, mpid))) { - hmap_remove(&cfm->x_remote_mps, &rmp->node); } else { rmp = xzalloc(sizeof *rmp); rmp->mpid = mpid; @@ -386,13 +346,14 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) { 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) { @@ -407,42 +368,55 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) } if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) { - struct remote_maid *rmaid; - - rmaid = lookup_remote_maid(&cfm->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(&cfm->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(&cfm->x_remote_mps, ccm_mpid); + 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)); } + } +} - if (!rmp) { - rmp = xzalloc(sizeof *rmp); - rmp->mpid = ccm_mpid; - hmap_insert(&cfm->x_remote_mps, &rmp->node, hash_mpid(ccm_mpid)); - rmp->fault = true; - } +void +cfm_dump_ds(const struct cfm *cfm, struct ds *ds) +{ + const struct cfm_internal *cfmi = cfm_to_internal(cfm); + long long int now = time_msec(); + struct remote_mp *rmp; - rmp->recv_time = time_msec(); - rmp->fault = ccm_interval != cfmi->ccm_interval; + ds_put_format(ds, "MPID %"PRIu16": %s\n", cfm->mpid, + cfm->fault ? "fault" : ""); - if (rmp->fault) { - cfm->fault = true; - } + ds_put_format(ds, "\tinterval: %dms\n", cfmi->ccm_interval_ms); + 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) { + 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); } }