X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcfm.c;h=e56ccab75eea36295fd4c0b52c244b8b102f04ec;hb=a9a2da38941ea4d312559543a3fb813d8fe7fd4e;hp=05c23828d51f96ce9ab58c7aad1b5b5efd77a19c;hpb=93b8df3853659238df58b1e1e69a0c5608e208f8;p=openvswitch diff --git a/lib/cfm.c b/lib/cfm.c index 05c23828..e56ccab7 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -36,11 +36,37 @@ VLOG_DEFINE_THIS_MODULE(cfm); -#define CCM_OPCODE 1 /* CFM message opcode meaning CCM. */ - -struct cfm_internal { - struct cfm cfm; - struct list list_node; /* Node in all_cfms list. */ +/* Ethernet destination address of CCM packets. */ +static const uint8_t eth_addr_ccm[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x30 }; + +#define ETH_TYPE_CFM 0x8902 + +/* A 'ccm' represents a Continuity Check Message from the 802.1ag + * specification. Continuity Check Messages are broadcast periodically so that + * hosts can determine whom they have connectivity to. */ +#define CCM_LEN 74 +#define CCM_MAID_LEN 48 +#define CCM_OPCODE 1 /* CFM message opcode meaning CCM. */ +#define CCM_RDI_MASK 0x80 +struct ccm { + uint8_t mdlevel_version; /* MD Level and Version */ + uint8_t opcode; + uint8_t flags; + uint8_t tlv_offset; + ovs_be32 seq; + ovs_be16 mpid; + uint8_t maid[CCM_MAID_LEN]; + uint8_t zero[16]; /* Defined by ITU-T Y.1731 should be zero */ +} __attribute__((packed)); +BUILD_ASSERT_DECL(CCM_LEN == sizeof(struct ccm)); + +struct cfm { + char *name; /* Name of this CFM object. */ + struct hmap_node hmap_node; /* Node in all_cfms list. */ + + uint16_t mpid; + bool fault; /* Indicates connectivity fault. */ + bool recv_fault; /* Indicates an inability to receive CCMs. */ uint32_t seq; /* The sequence number of our last CCM. */ uint8_t ccm_interval; /* The CCM transmission interval. */ @@ -61,34 +87,36 @@ struct remote_mp { bool recv; /* CCM was received since last fault check. */ bool fault; /* Indicates a connectivity fault. */ + bool rdi; /* Remote Defect Indicator. Indicates remote_mp isn't + receiving CCMs that it's expecting to. */ }; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); -static struct list all_cfms = LIST_INITIALIZER(&all_cfms); +static struct hmap all_cfms = HMAP_INITIALIZER(&all_cfms); static void cfm_unixctl_show(struct unixctl_conn *, const char *args, void *aux); static void -cfm_generate_maid(struct cfm_internal *cfmi) +cfm_generate_maid(struct cfm *cfm) { - const char *ovs_md_name = "ovs_md"; - const char *ovs_ma_name = "ovs_ma"; + const char *ovs_md_name = "ovs"; + const char *ovs_ma_name = "ovs"; uint8_t *ma_p; size_t md_len, ma_len; - memset(cfmi->maid, 0, CCM_MAID_LEN); + memset(cfm->maid, 0, CCM_MAID_LEN); md_len = strlen(ovs_md_name); ma_len = strlen(ovs_ma_name); assert(md_len && ma_len && md_len + ma_len + 4 <= CCM_MAID_LEN); - cfmi->maid[0] = 4; /* MD name string format. */ - cfmi->maid[1] = md_len; /* MD name size. */ - memcpy(&cfmi->maid[2], ovs_md_name, md_len); /* MD name. */ + cfm->maid[0] = 4; /* MD name string format. */ + cfm->maid[1] = md_len; /* MD name size. */ + memcpy(&cfm->maid[2], ovs_md_name, md_len); /* MD name. */ - ma_p = cfmi->maid + 2 + md_len; + ma_p = cfm->maid + 2 + md_len; ma_p[0] = 2; /* MA name string format. */ ma_p[1] = ma_len; /* MA name size. */ memcpy(&ma_p[2], ovs_ma_name, ma_len); /* MA name. */ @@ -113,7 +141,7 @@ ccm_interval_to_ms(uint8_t interval) } static long long int -cfm_fault_interval(struct cfm_internal *cfmi) +cfm_fault_interval(struct cfm *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 @@ -123,7 +151,7 @@ cfm_fault_interval(struct cfm_internal *cfmi) * * According to the specification we should check when (ccm_interval_ms * * 3.5)ms have passed. */ - return (cfmi->ccm_interval_ms * 7) / 2; + return (cfm->ccm_interval_ms * 7) / 2; } static uint8_t @@ -140,12 +168,6 @@ ms_to_ccm_interval(int interval_ms) return 1; } -static struct cfm_internal * -cfm_to_internal(const struct cfm *cfm) -{ - return CONTAINER_OF(cfm, struct cfm_internal, cfm); -} - static uint32_t hash_mpid(uint8_t mpid) { @@ -179,72 +201,74 @@ cfm_init(void) unixctl_command_register("cfm/show", cfm_unixctl_show, NULL); } -/* Allocates a 'cfm' object. This object should have its 'mpid', 'maid', - * 'eth_src', and 'interval' filled out. cfm_configure() should be called - * whenever changes are made to 'cfm', and before cfm_run() is called for the - * first time. */ +/* Allocates a 'cfm' object called 'name'. 'cfm' should be initialized by + * cfm_configure() before use. */ struct cfm * -cfm_create(void) +cfm_create(const char *name) { struct cfm *cfm; - struct cfm_internal *cfmi; - - cfmi = xzalloc(sizeof *cfmi); - cfm = &cfmi->cfm; - hmap_init(&cfmi->remote_mps); - cfm_generate_maid(cfmi); - list_push_back(&all_cfms, &cfmi->list_node); + cfm = xzalloc(sizeof *cfm); + cfm->name = xstrdup(name); + hmap_init(&cfm->remote_mps); + cfm_generate_maid(cfm); + hmap_insert(&all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0)); return cfm; } void cfm_destroy(struct cfm *cfm) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); struct remote_mp *rmp, *rmp_next; if (!cfm) { return; } - HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfmi->remote_mps) { - hmap_remove(&cfmi->remote_mps, &rmp->node); + HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->remote_mps) { + hmap_remove(&cfm->remote_mps, &rmp->node); free(rmp); } - hmap_destroy(&cfmi->remote_mps); - list_remove(&cfmi->list_node); - free(cfmi); + hmap_destroy(&cfm->remote_mps); + hmap_remove(&all_cfms, &cfm->hmap_node); + free(cfm->name); + free(cfm); } /* Should be run periodically to update fault statistics messages. */ void cfm_run(struct cfm *cfm) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); - - if (timer_expired(&cfmi->fault_timer)) { - long long int interval = cfm_fault_interval(cfmi); + if (timer_expired(&cfm->fault_timer)) { + long long int interval = cfm_fault_interval(cfm); struct remote_mp *rmp; cfm->fault = false; - HMAP_FOR_EACH (rmp, node, &cfmi->remote_mps) { + cfm->recv_fault = false; + HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) { rmp->fault = !rmp->recv; rmp->recv = false; if (rmp->fault) { + cfm->recv_fault = true; + VLOG_DBG("%s: No CCM from RMP %"PRIu16" in the last %lldms", + cfm->name, rmp->mpid, interval); + } else if (rmp->rdi) { cfm->fault = true; - VLOG_DBG("No CCM from RMP %"PRIu16" in the last %lldms", - rmp->mpid, interval); + VLOG_DBG("%s: RDI bit flagged from RMP %"PRIu16, cfm->name, + rmp->mpid); } } - if (!cfm->fault) { - VLOG_DBG("All RMPs received CCMs in the last %lldms", interval); + if (cfm->recv_fault) { + cfm->fault = true; + } else { + VLOG_DBG("%s: All RMPs received CCMs in the last %lldms", + cfm->name, interval); } - timer_set_duration(&cfmi->fault_timer, interval); + timer_set_duration(&cfm->fault_timer, interval); } } @@ -253,85 +277,78 @@ cfm_run(struct cfm *cfm) bool cfm_should_send_ccm(struct cfm *cfm) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); - - return timer_expired(&cfmi->tx_timer); + return timer_expired(&cfm->tx_timer); } -/* Composes a CCM message into 'ccm'. Messages generated with this function +/* Composes a CCM message into 'packet'. Messages generated with this function * should be sent whenever cfm_should_send_ccm() indicates. */ void -cfm_compose_ccm(struct cfm *cfm, struct ccm *ccm) +cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet, + uint8_t eth_src[ETH_ADDR_LEN]) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); + struct ccm *ccm; - timer_set_duration(&cfmi->tx_timer, cfmi->ccm_interval_ms); + timer_set_duration(&cfm->tx_timer, cfm->ccm_interval_ms); + ccm = eth_compose(packet, eth_addr_ccm, eth_src, ETH_TYPE_CFM, + sizeof *ccm); ccm->mdlevel_version = 0; ccm->opcode = CCM_OPCODE; ccm->tlv_offset = 70; - ccm->seq = htonl(++cfmi->seq); - ccm->mpid = htons(cfmi->cfm.mpid); - ccm->flags = cfmi->ccm_interval; - memcpy(ccm->maid, cfmi->maid, sizeof ccm->maid); + ccm->seq = htonl(++cfm->seq); + ccm->mpid = htons(cfm->mpid); + ccm->flags = cfm->ccm_interval; + memcpy(ccm->maid, cfm->maid, sizeof ccm->maid); + + if (cfm->recv_fault) { + ccm->flags |= CCM_RDI_MASK; + } } void cfm_wait(struct cfm *cfm) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); - timer_wait(&cfmi->tx_timer); - timer_wait(&cfmi->fault_timer); + timer_wait(&cfm->tx_timer); + timer_wait(&cfm->fault_timer); } -/* Should be called whenever a client of the cfm library changes the internals - * of 'cfm'. Returns true if 'cfm' is valid. */ +/* Configures 'cfm' with settings from 's'. */ bool -cfm_configure(struct cfm *cfm) +cfm_configure(struct cfm *cfm, const struct cfm_settings *s) { - struct cfm_internal *cfmi = cfm_to_internal(cfm); + size_t i; uint8_t interval; + struct hmap new_rmps; + struct remote_mp *rmp, *rmp_next; - if (!cfm_is_valid_mpid(cfm->mpid) || !cfm->interval) { + if (!cfm_is_valid_mpid(s->mpid) || s->interval <= 0 + || s->n_remote_mpids <= 0) { return false; } - interval = ms_to_ccm_interval(cfm->interval); + cfm->mpid = s->mpid; + interval = ms_to_ccm_interval(s->interval); - if (interval != cfmi->ccm_interval) { - cfmi->ccm_interval = interval; - cfmi->ccm_interval_ms = ccm_interval_to_ms(interval); + if (interval != cfm->ccm_interval) { + cfm->ccm_interval = interval; + cfm->ccm_interval_ms = ccm_interval_to_ms(interval); - timer_set_expired(&cfmi->tx_timer); - timer_set_duration(&cfmi->fault_timer, cfm_fault_interval(cfmi)); + timer_set_expired(&cfm->tx_timer); + timer_set_duration(&cfm->fault_timer, cfm_fault_interval(cfm)); } - return true; -} - -/* Given an array of MPIDs, updates the 'remote_mps' map of 'cfm' to reflect - * it. Invalid MPIDs are skipped. */ -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; - hmap_init(&new_rmps); - - for (i = 0; i < n_mpids; i++) { - uint16_t mpid = mpids[i]; + for (i = 0; i < s->n_remote_mpids; i++) { + uint16_t mpid = s->remote_mpids[i]; if (!cfm_is_valid_mpid(mpid) || lookup_remote_mp(&new_rmps, mpid)) { continue; } - if ((rmp = lookup_remote_mp(&cfmi->remote_mps, mpid))) { - hmap_remove(&cfmi->remote_mps, &rmp->node); + if ((rmp = lookup_remote_mp(&cfm->remote_mps, mpid))) { + hmap_remove(&cfm->remote_mps, &rmp->node); } else { rmp = xzalloc(sizeof *rmp); rmp->mpid = mpid; @@ -340,14 +357,14 @@ cfm_update_remote_mps(struct cfm *cfm, const uint16_t *mpids, size_t n_mpids) hmap_insert(&new_rmps, &rmp->node, hash_mpid(mpid)); } - hmap_swap(&new_rmps, &cfmi->remote_mps); - + hmap_swap(&new_rmps, &cfm->remote_mps); HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &new_rmps) { hmap_remove(&new_rmps, &rmp->node); free(rmp); } - hmap_destroy(&new_rmps); + + return true; } /* Returns true if the CFM library should process packets from 'flow'. */ @@ -365,23 +382,24 @@ void cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) { struct ccm *ccm; + bool ccm_rdi; uint16_t ccm_mpid; uint8_t ccm_interval; struct remote_mp *rmp; struct eth_header *eth; - struct cfm_internal *cfmi = cfm_to_internal(cfm); eth = p->l2; ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_LEN); if (!ccm) { - VLOG_INFO_RL(&rl, "Received an un-parseable 802.1ag CCM heartbeat."); + VLOG_INFO_RL(&rl, "%s: Received an unparseable 802.1ag CCM heartbeat.", + cfm->name); return; } if (ccm->opcode != CCM_OPCODE) { - VLOG_INFO_RL(&rl, "Received an unsupported 802.1ag message. " - "(opcode %u)", ccm->opcode); + VLOG_INFO_RL(&rl, "%s: Received an unsupported 802.1ag message. " + "(opcode %u)", cfm->name, ccm->opcode); return; } @@ -394,41 +412,53 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) * them judiciously, especially when CFM is used to check slave status of * bonds. Furthermore, faults can be maliciously triggered by crafting * invalid CCMs. */ - if (memcmp(ccm->maid, cfmi->maid, sizeof ccm->maid)) { - VLOG_WARN_RL(&rl, "Received unexpected remote MAID from MAC " - ETH_ADDR_FMT, ETH_ADDR_ARGS(eth->eth_src)); + if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) { + VLOG_WARN_RL(&rl, "%s: Received unexpected remote MAID from MAC " + ETH_ADDR_FMT, cfm->name, ETH_ADDR_ARGS(eth->eth_src)); } else { ccm_mpid = ntohs(ccm->mpid); ccm_interval = ccm->flags & 0x7; + ccm_rdi = ccm->flags & CCM_RDI_MASK; - rmp = lookup_remote_mp(&cfmi->remote_mps, ccm_mpid); + rmp = lookup_remote_mp(&cfm->remote_mps, ccm_mpid); if (rmp) { rmp->recv = true; + rmp->rdi = ccm_rdi; - if (ccm_interval != cfmi->ccm_interval) { - VLOG_WARN_RL(&rl, "received a CCM with an invalid interval" - " (%"PRIu8") from RMP %"PRIu16, ccm_interval, - rmp->mpid); + if (ccm_interval != cfm->ccm_interval) { + VLOG_WARN_RL(&rl, "%s: received a CCM with an invalid interval" + " (%"PRIu8") from RMP %"PRIu16, cfm->name, + ccm_interval, rmp->mpid); } } else { - VLOG_WARN_RL(&rl, "Received unexpected remote MPID %d from MAC " - ETH_ADDR_FMT, ccm_mpid, ETH_ADDR_ARGS(eth->eth_src)); + VLOG_WARN_RL(&rl, "%s: Received unexpected remote MPID %d from" + " MAC " ETH_ADDR_FMT, cfm->name, ccm_mpid, + ETH_ADDR_ARGS(eth->eth_src)); } - VLOG_DBG("Received CCM (mpid %"PRIu16") (interval %"PRIu8")", ccm_mpid, - ccm_interval); + VLOG_DBG("%s: Received CCM (seq %"PRIu32") (mpid %"PRIu16")" + " (interval %"PRIu8") (RDI %s)", cfm->name, ntohl(ccm->seq), + ccm_mpid, ccm_interval, ccm_rdi ? "true" : "false"); } } -static struct cfm_internal * +/* Gets the fault status of 'cfm'. Returns true when 'cfm' has detected + * connectivity problems, false otherwise. */ +bool +cfm_get_fault(const struct cfm *cfm) +{ + return cfm->fault; +} + +static struct cfm * cfm_find(const char *name) { - struct cfm_internal *cfmi; + struct cfm *cfm; - LIST_FOR_EACH (cfmi, list_node, &all_cfms) { - if (cfmi->cfm.name && !strcmp(cfmi->cfm.name, name)) { - return cfmi; + HMAP_FOR_EACH_WITH_HASH (cfm, hmap_node, hash_string(name, 0), &all_cfms) { + if (!strcmp(cfm->name, name)) { + return cfm; } } return NULL; @@ -439,26 +469,27 @@ cfm_unixctl_show(struct unixctl_conn *conn, const char *args, void *aux OVS_UNUSED) { struct ds ds = DS_EMPTY_INITIALIZER; - const struct cfm_internal *cfmi; + const struct cfm *cfm; struct remote_mp *rmp; - cfmi = cfm_find(args); - if (!cfmi) { + cfm = cfm_find(args); + if (!cfm) { unixctl_command_reply(conn, 501, "no such CFM object"); return; } - ds_put_format(&ds, "MPID %"PRIu16": %s\n", cfmi->cfm.mpid, - cfmi->cfm.fault ? "fault" : ""); + ds_put_format(&ds, "MPID %"PRIu16":%s%s\n", cfm->mpid, + cfm->fault ? " fault" : "", + cfm->recv_fault ? " recv_fault" : ""); - ds_put_format(&ds, "\tinterval: %dms\n", cfmi->ccm_interval_ms); + ds_put_format(&ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); ds_put_format(&ds, "\tnext CCM tx: %lldms\n", - timer_msecs_until_expired(&cfmi->tx_timer)); + timer_msecs_until_expired(&cfm->tx_timer)); ds_put_format(&ds, "\tnext fault check: %lldms\n", - timer_msecs_until_expired(&cfmi->fault_timer)); + timer_msecs_until_expired(&cfm->fault_timer)); ds_put_cstr(&ds, "\n"); - HMAP_FOR_EACH (rmp, node, &cfmi->remote_mps) { + 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, "\trecv since check: %s",