X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcfm.c;h=0d79beedbc527c5993dcbe610ee00660eca02991;hb=0e70cdcb8ddeb20417e682fd63769f9d16601b07;hp=cb5df8cc177f786d868a65d8b875deb664a4b851;hpb=de72402954abc382e63532e6d179583c5eea6227;p=openvswitch diff --git a/lib/cfm.c b/lib/cfm.c index cb5df8cc..0d79beed 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -22,6 +22,7 @@ #include #include +#include "byte-order.h" #include "dynamic-string.h" #include "flow.h" #include "hash.h" @@ -48,8 +49,13 @@ static const uint8_t eth_addr_ccm_x[6] = { /* 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 + * hosts can determine whom they have connectivity to. + * + * The minimum length of a CCM as specified by IEEE 802.1ag is 75 bytes. + * Previous versions of Open vSwitch generated 74-byte CCM messages, so we + * accept such messages too. */ +#define CCM_LEN 75 +#define CCM_ACCEPT_LEN 74 #define CCM_MAID_LEN 48 #define CCM_OPCODE 1 /* CFM message opcode meaning CCM. */ #define CCM_RDI_MASK 0x80 @@ -64,7 +70,12 @@ struct ccm { /* Defined by ITU-T Y.1731 should be zero */ ovs_be16 interval_ms_x; /* Transmission interval in ms. */ - uint8_t zero[14]; + ovs_be64 mpid64; /* MPID in extended mode. */ + uint8_t opdown; /* Operationally down. */ + uint8_t zero[5]; + + /* TLV space. */ + uint8_t end_tlv; } __attribute__((packed)); BUILD_ASSERT_DECL(CCM_LEN == sizeof(struct ccm)); @@ -72,10 +83,12 @@ struct cfm { char *name; /* Name of this CFM object. */ struct hmap_node hmap_node; /* Node in all_cfms list. */ - uint16_t mpid; + uint64_t mpid; bool extended; /* Extended mode. */ bool fault; /* Indicates connectivity fault. */ bool unexpected_recv; /* Received an unexpected CCM. */ + bool opup; /* Operational State. */ + bool remote_opup; /* Remote Operational State. */ uint32_t seq; /* The sequence number of our last CCM. */ uint8_t ccm_interval; /* The CCM transmission interval. */ @@ -86,17 +99,23 @@ struct cfm { struct timer fault_timer; /* Check for faults when expired. */ struct hmap remote_mps; /* Remote MPs. */ + + /* Result of cfm_get_remote_mpids(). Updated only during fault check to + * avoid flapping. */ + uint64_t *rmps_array; /* Cache of remote_mps. */ + size_t rmps_array_len; /* Number of rmps in 'rmps_array'. */ }; /* Remote MPs represent foreign network entities that are configured to have * the same MAID as this CFM instance. */ struct remote_mp { - uint16_t mpid; /* The Maintenance Point ID of this 'remote_mp'. */ + uint64_t mpid; /* The Maintenance Point ID of this 'remote_mp'. */ struct hmap_node node; /* Node in 'remote_mps' map. */ bool recv; /* CCM was received since last fault check. */ bool rdi; /* Remote Defect Indicator. Indicates remote_mp isn't receiving CCMs that it's expecting to. */ + bool opup; /* Operational State. */ }; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); @@ -183,20 +202,21 @@ ms_to_ccm_interval(int interval_ms) } static uint32_t -hash_mpid(uint8_t mpid) +hash_mpid(uint64_t mpid) { - return hash_int(mpid, 0); + return hash_bytes(&mpid, sizeof mpid, 0); } static bool -cfm_is_valid_mpid(uint32_t mpid) +cfm_is_valid_mpid(bool extended, uint64_t mpid) { - /* 802.1ag specification requires MPIDs to be within the range [1, 8191] */ - return mpid >= 1 && mpid <= 8191; + /* 802.1ag specification requires MPIDs to be within the range [1, 8191]. + * In extended mode we relax this requirement. */ + return mpid >= 1 && (extended || mpid <= 8191); } static struct remote_mp * -lookup_remote_mp(const struct cfm *cfm, uint16_t mpid) +lookup_remote_mp(const struct cfm *cfm, uint64_t mpid) { struct remote_mp *rmp; @@ -212,7 +232,8 @@ lookup_remote_mp(const struct cfm *cfm, uint16_t mpid) void cfm_init(void) { - unixctl_command_register("cfm/show", cfm_unixctl_show, NULL); + unixctl_command_register("cfm/show", "[interface]", cfm_unixctl_show, + NULL); } /* Allocates a 'cfm' object called 'name'. 'cfm' should be initialized by @@ -227,6 +248,7 @@ cfm_create(const char *name) hmap_init(&cfm->remote_mps); cfm_generate_maid(cfm); hmap_insert(&all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0)); + cfm->remote_opup = true; return cfm; } @@ -246,6 +268,7 @@ cfm_destroy(struct cfm *cfm) hmap_destroy(&cfm->remote_mps); hmap_remove(&all_cfms, &cfm->hmap_node); + free(cfm->rmps_array); free(cfm->name); free(cfm); } @@ -261,10 +284,16 @@ cfm_run(struct cfm *cfm) cfm->fault = cfm->unexpected_recv; cfm->unexpected_recv = false; + cfm->rmps_array_len = 0; + free(cfm->rmps_array); + cfm->rmps_array = xmalloc(hmap_count(&cfm->remote_mps) * + sizeof *cfm->rmps_array); + + cfm->remote_opup = true; HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->remote_mps) { if (!rmp->recv) { - VLOG_DBG("%s: No CCM from RMP %"PRIu16" in the last %lldms", + VLOG_DBG("%s: no CCM from RMP %"PRIu64" in the last %lldms", cfm->name, rmp->mpid, interval); hmap_remove(&cfm->remote_mps, &rmp->node); free(rmp); @@ -272,16 +301,22 @@ cfm_run(struct cfm *cfm) rmp->recv = false; if (rmp->mpid == cfm->mpid) { - VLOG_WARN_RL(&rl, "%s: Received CCM with local MPID (%d)", - cfm->name, rmp->mpid); + VLOG_WARN_RL(&rl,"%s: received CCM with local MPID" + " %"PRIu64, cfm->name, rmp->mpid); cfm->fault = true; } if (rmp->rdi) { - VLOG_DBG("%s: RDI bit flagged from RMP %"PRIu16, cfm->name, + VLOG_DBG("%s: RDI bit flagged from RMP %"PRIu64, cfm->name, rmp->mpid); cfm->fault = true; } + + if (!rmp->opup) { + cfm->remote_opup = rmp->opup; + } + + cfm->rmps_array[cfm->rmps_array_len++] = rmp->mpid; } } @@ -316,10 +351,20 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet, ccm->opcode = CCM_OPCODE; ccm->tlv_offset = 70; ccm->seq = htonl(++cfm->seq); - ccm->mpid = htons(cfm->mpid); ccm->flags = cfm->ccm_interval; memcpy(ccm->maid, cfm->maid, sizeof ccm->maid); memset(ccm->zero, 0, sizeof ccm->zero); + ccm->end_tlv = 0; + + if (cfm->extended) { + ccm->mpid = htons(hash_mpid(cfm->mpid)); + ccm->mpid64 = htonll(cfm->mpid); + ccm->opdown = !cfm->opup; + } else { + ccm->mpid = htons(cfm->mpid); + ccm->mpid64 = htonll(0); + ccm->opdown = 0; + } if (cfm->ccm_interval == 0) { assert(cfm->extended); @@ -334,7 +379,6 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet, void cfm_wait(struct cfm *cfm) { - timer_wait(&cfm->tx_timer); timer_wait(&cfm->fault_timer); } @@ -346,12 +390,13 @@ cfm_configure(struct cfm *cfm, const struct cfm_settings *s) uint8_t interval; int interval_ms; - if (!cfm_is_valid_mpid(s->mpid) || s->interval <= 0) { + if (!cfm_is_valid_mpid(s->extended, s->mpid) || s->interval <= 0) { return false; } cfm->mpid = s->mpid; cfm->extended = s->extended; + cfm->opup = s->opup; interval = ms_to_ccm_interval(s->interval); interval_ms = ccm_interval_to_ms(interval); @@ -389,7 +434,7 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) struct eth_header *eth; eth = p->l2; - ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_LEN); + ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_ACCEPT_LEN); if (!ccm) { VLOG_INFO_RL(&rl, "%s: Received an unparseable 802.1ag CCM heartbeat.", @@ -417,44 +462,57 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) VLOG_WARN_RL(&rl, "%s: Received unexpected remote MAID from MAC " ETH_ADDR_FMT, cfm->name, ETH_ADDR_ARGS(eth->eth_src)); } else { - uint16_t ccm_mpid = ntohs(ccm->mpid); uint8_t ccm_interval = ccm->flags & 0x7; bool ccm_rdi = ccm->flags & CCM_RDI_MASK; uint16_t ccm_interval_ms_x = ntohs(ccm->interval_ms_x); struct remote_mp *rmp; + uint64_t ccm_mpid; + bool ccm_opdown; + + if (cfm->extended) { + ccm_mpid = ntohll(ccm->mpid64); + ccm_opdown = ccm->opdown; + } else { + ccm_mpid = ntohs(ccm->mpid); + ccm_opdown = false; + } if (ccm_interval != cfm->ccm_interval) { VLOG_WARN_RL(&rl, "%s: received a CCM with an invalid interval" - " (%"PRIu8") from RMP %"PRIu16, cfm->name, + " (%"PRIu8") from RMP %"PRIu64, cfm->name, ccm_interval, ccm_mpid); } if (cfm->extended && ccm_interval == 0 && ccm_interval_ms_x != cfm->ccm_interval_ms) { VLOG_WARN_RL(&rl, "%s: received a CCM with an invalid extended" - " interval (%"PRIu16"ms) from RMP %"PRIu16, cfm->name, + " interval (%"PRIu16"ms) from RMP %"PRIu64, cfm->name, ccm_interval_ms_x, ccm_mpid); } rmp = lookup_remote_mp(cfm, ccm_mpid); + if (!rmp) { + if (hmap_count(&cfm->remote_mps) < CFM_MAX_RMPS) { + rmp = xmalloc(sizeof *rmp); + hmap_insert(&cfm->remote_mps, &rmp->node, hash_mpid(ccm_mpid)); + } else { + cfm->unexpected_recv = true; + VLOG_WARN_RL(&rl, + "%s: dropped CCM with MPID %"PRIu64" from MAC " + ETH_ADDR_FMT, cfm->name, ccm_mpid, + ETH_ADDR_ARGS(eth->eth_src)); + } + } + if (rmp) { - rmp->recv = true; - rmp->rdi = ccm_rdi; - } else if (hmap_count(&cfm->remote_mps) < CFM_MAX_RMPS) { - rmp = xmalloc(sizeof *rmp); rmp->mpid = ccm_mpid; rmp->recv = true; rmp->rdi = ccm_rdi; - hmap_insert(&cfm->remote_mps, &rmp->node, hash_mpid(rmp->mpid)); - } else { - cfm->unexpected_recv = true; - VLOG_WARN_RL(&rl, "%s: dropped CCM with MPID %d from MAC " - ETH_ADDR_FMT, cfm->name, ccm_mpid, - ETH_ADDR_ARGS(eth->eth_src)); + rmp->opup = !ccm_opdown; } - VLOG_DBG("%s: Received CCM (seq %"PRIu32") (mpid %"PRIu16")" + VLOG_DBG("%s: received CCM (seq %"PRIu32") (mpid %"PRIu64")" " (interval %"PRIu8") (RDI %s)", cfm->name, ntohl(ccm->seq), ccm_mpid, ccm_interval, ccm_rdi ? "true" : "false"); } @@ -468,6 +526,27 @@ cfm_get_fault(const struct cfm *cfm) return cfm->fault; } +/* Gets the operational state of 'cfm'. 'cfm' is considered operationally down + * if it has received a CCM with the operationally down bit set from any of its + * remote maintenance points. Returns true if 'cfm' is operationally up. False + * otherwise. */ +bool +cfm_get_opup(const struct cfm *cfm) +{ + return cfm->remote_opup; +} + +/* Populates 'rmps' with an array of remote maintenance points reachable by + * 'cfm'. The number of remote maintenance points is written to 'n_rmps'. + * 'cfm' retains ownership of the array written to 'rmps' */ +void +cfm_get_remote_mpids(const struct cfm *cfm, const uint64_t **rmps, + size_t *n_rmps) +{ + *rmps = cfm->rmps_array; + *n_rmps = cfm->rmps_array_len; +} + static struct cfm * cfm_find(const char *name) { @@ -482,35 +561,53 @@ cfm_find(const char *name) } static void -cfm_unixctl_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +cfm_print_details(struct ds *ds, const struct cfm *cfm) { - struct ds ds = DS_EMPTY_INITIALIZER; - const struct cfm *cfm; struct remote_mp *rmp; - cfm = cfm_find(args); - if (!cfm) { - unixctl_command_reply(conn, 501, "no such CFM object"); - return; - } - - ds_put_format(&ds, "MPID %"PRIu16":%s%s\n", cfm->mpid, + ds_put_format(ds, "---- %s ----\n", cfm->name); + ds_put_format(ds, "MPID %"PRIu64":%s%s%s\n", cfm->mpid, + cfm->extended ? " extended" : "", cfm->fault ? " fault" : "", cfm->unexpected_recv ? " unexpected_recv" : ""); - ds_put_format(&ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); - ds_put_format(&ds, "\tnext CCM tx: %lldms\n", + ds_put_format(ds, "\topstate: %s\n", cfm->opup ? "up" : "down"); + ds_put_format(ds, "\tremote_opstate: %s\n", + cfm->remote_opup ? "up" : "down"); + ds_put_format(ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); + ds_put_format(ds, "\tnext CCM tx: %lldms\n", timer_msecs_until_expired(&cfm->tx_timer)); - ds_put_format(&ds, "\tnext fault check: %lldms\n", + ds_put_format(ds, "\tnext fault check: %lldms\n", timer_msecs_until_expired(&cfm->fault_timer)); - ds_put_cstr(&ds, "\n"); HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) { - ds_put_format(&ds, "Remote MPID %"PRIu16":%s\n", rmp->mpid, + ds_put_format(ds, "Remote MPID %"PRIu64":%s\n", + rmp->mpid, rmp->rdi ? " rdi" : ""); - ds_put_format(&ds, "\trecv since check: %s", + ds_put_format(ds, "\trecv since check: %s\n", rmp->recv ? "true" : "false"); + ds_put_format(ds, "\topstate: %s\n", rmp->opup? "up" : "down"); + } +} + +static void +cfm_unixctl_show(struct unixctl_conn *conn, + const char *args, void *aux OVS_UNUSED) +{ + struct ds ds = DS_EMPTY_INITIALIZER; + const struct cfm *cfm; + + if (strlen(args)) { + cfm = cfm_find(args); + if (!cfm) { + unixctl_command_reply(conn, 501, "no such CFM object"); + return; + } + cfm_print_details(&ds, cfm); + } else { + HMAP_FOR_EACH (cfm, hmap_node, &all_cfms) { + cfm_print_details(&ds, cfm); + } } unixctl_command_reply(conn, 200, ds_cstr(&ds));