VLOG_DEFINE_THIS_MODULE(cfm);
-#define CCM_OPCODE 1 /* CFM message opcode meaning CCM. */
+#define CFM_MAX_RMPS 256
+
+/* Ethernet destination address of CCM packets. */
+static const uint8_t eth_addr_ccm[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x30 };
+static const uint8_t eth_addr_ccm_x[6] = {
+ 0x01, 0x23, 0x20, 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 {
- uint16_t mpid;
- struct list list_node; /* Node in all_cfms list. */
+ char *name; /* Name of this CFM object. */
+ struct hmap_node hmap_node; /* Node in all_cfms list. */
+ uint16_t mpid;
+ bool extended; /* Extended mode. */
bool fault; /* Indicates connectivity fault. */
- char *name; /* Name of this CFM object. */
+ bool unexpected_recv; /* Received an unexpected CCM. */
uint32_t seq; /* The sequence number of our last CCM. */
uint8_t ccm_interval; /* The CCM transmission interval. */
struct timer tx_timer; /* Send CCM when expired. */
struct timer fault_timer; /* Check for faults when expired. */
- struct hmap remote_mps; /* Expected remote MPs. */
+ struct hmap remote_mps; /* Remote MPs. */
};
/* Remote MPs represent foreign network entities that are configured to have
struct hmap_node node; /* Node in 'remote_mps' map. */
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 const uint8_t *
+cfm_ccm_addr(const struct cfm *cfm)
+{
+ return cfm->extended ? eth_addr_ccm_x : eth_addr_ccm;
+}
+
static void
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;
}
static struct remote_mp *
-lookup_remote_mp(const struct hmap *hmap, uint16_t mpid)
+lookup_remote_mp(const struct cfm *cfm, uint16_t mpid)
{
struct remote_mp *rmp;
- HMAP_FOR_EACH_IN_BUCKET (rmp, node, hash_mpid(mpid), hmap) {
+ HMAP_FOR_EACH_IN_BUCKET (rmp, node, hash_mpid(mpid), &cfm->remote_mps) {
if (rmp->mpid == mpid) {
return rmp;
}
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;
cfm = xzalloc(sizeof *cfm);
+ cfm->name = xstrdup(name);
hmap_init(&cfm->remote_mps);
cfm_generate_maid(cfm);
- list_push_back(&all_cfms, &cfm->list_node);
+ hmap_insert(&all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0));
return cfm;
}
}
hmap_destroy(&cfm->remote_mps);
- list_remove(&cfm->list_node);
+ hmap_remove(&all_cfms, &cfm->hmap_node);
+ free(cfm->name);
free(cfm);
}
void
cfm_run(struct cfm *cfm)
{
-
if (timer_expired(&cfm->fault_timer)) {
long long int interval = cfm_fault_interval(cfm);
- struct remote_mp *rmp;
+ struct remote_mp *rmp, *rmp_next;
+
+ cfm->fault = cfm->unexpected_recv;
+ cfm->unexpected_recv = false;
- cfm->fault = false;
- HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) {
- rmp->fault = !rmp->recv;
- rmp->recv = false;
+ HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->remote_mps) {
- if (rmp->fault) {
- cfm->fault = true;
- VLOG_DBG("No CCM from RMP %"PRIu16" in the last %lldms",
- rmp->mpid, interval);
+ if (!rmp->recv) {
+ VLOG_DBG("%s: No CCM from RMP %"PRIu16" in the last %lldms",
+ cfm->name, rmp->mpid, interval);
+ hmap_remove(&cfm->remote_mps, &rmp->node);
+ free(rmp);
+ } else {
+ rmp->recv = false;
+
+ if (rmp->mpid == cfm->mpid) {
+ VLOG_WARN_RL(&rl, "%s: Received CCM with local MPID (%d)",
+ cfm->name, rmp->mpid);
+ cfm->fault = true;
+ }
+
+ if (rmp->rdi) {
+ VLOG_DBG("%s: RDI bit flagged from RMP %"PRIu16, cfm->name,
+ rmp->mpid);
+ cfm->fault = true;
+ }
}
}
- if (!cfm->fault) {
- VLOG_DBG("All RMPs received CCMs in the last %lldms", interval);
+ if (hmap_is_empty(&cfm->remote_mps)) {
+ cfm->fault = true;
}
timer_set_duration(&cfm->fault_timer, interval);
bool
cfm_should_send_ccm(struct cfm *cfm)
{
-
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])
{
- timer_set_duration(&cfm->tx_timer, cfm->ccm_interval_ms);
+ struct ccm *ccm;
+ timer_set_duration(&cfm->tx_timer, cfm->ccm_interval_ms);
+ ccm = eth_compose(packet, cfm_ccm_addr(cfm), eth_src, ETH_TYPE_CFM,
+ sizeof *ccm);
ccm->mdlevel_version = 0;
ccm->opcode = CCM_OPCODE;
ccm->tlv_offset = 70;
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);
+
+ if (hmap_is_empty(&cfm->remote_mps)) {
+ ccm->flags |= CCM_RDI_MASK;
+ }
}
void
bool
cfm_configure(struct cfm *cfm, const struct cfm_settings *s)
{
- size_t i;
uint8_t interval;
- struct hmap new_rmps;
- struct remote_mp *rmp, *rmp_next;
- if (!cfm_is_valid_mpid(s->mpid) || s->interval <= 0
- || s->n_remote_mpids <= 0) {
+ if (!cfm_is_valid_mpid(s->mpid) || s->interval <= 0) {
return false;
}
cfm->mpid = s->mpid;
+ cfm->extended = s->extended;
interval = ms_to_ccm_interval(s->interval);
- if (!cfm->name || strcmp(s->name, cfm->name)) {
- free(cfm->name);
- cfm->name = xstrdup(s->name);
- }
-
if (interval != cfm->ccm_interval) {
cfm->ccm_interval = interval;
cfm->ccm_interval_ms = ccm_interval_to_ms(interval);
timer_set_duration(&cfm->fault_timer, cfm_fault_interval(cfm));
}
- hmap_init(&new_rmps);
- 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(&cfm->remote_mps, mpid))) {
- hmap_remove(&cfm->remote_mps, &rmp->node);
- } else {
- rmp = xzalloc(sizeof *rmp);
- rmp->mpid = mpid;
- }
-
- hmap_insert(&new_rmps, &rmp->node, hash_mpid(mpid));
- }
-
- 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'. */
+/* Returns true if 'cfm' should process packets from 'flow'. */
bool
-cfm_should_process_flow(const struct flow *flow)
+cfm_should_process_flow(const struct cfm *cfm, const struct flow *flow)
{
return (ntohs(flow->dl_type) == ETH_TYPE_CFM
- && eth_addr_equals(flow->dl_dst, eth_addr_ccm));
+ && eth_addr_equals(flow->dl_dst, cfm_ccm_addr(cfm)));
}
/* Updates internal statistics relevant to packet 'p'. Should be called on
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;
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;
}
* bonds. Furthermore, faults can be maliciously triggered by crafting
* invalid CCMs. */
if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) {
- VLOG_WARN_RL(&rl, "Received unexpected remote MAID from MAC "
- ETH_ADDR_FMT, ETH_ADDR_ARGS(eth->eth_src));
+ cfm->unexpected_recv = true;
+ 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(&cfm->remote_mps, ccm_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, ccm_mpid);
+ }
+ rmp = lookup_remote_mp(cfm, ccm_mpid);
if (rmp) {
rmp->recv = true;
-
- if (ccm_interval != cfm->ccm_interval) {
- VLOG_WARN_RL(&rl, "received a CCM with an invalid interval"
- " (%"PRIu8") from RMP %"PRIu16, ccm_interval,
- rmp->mpid);
- }
+ 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 {
- VLOG_WARN_RL(&rl, "Received unexpected remote MPID %d from MAC "
- ETH_ADDR_FMT, ccm_mpid, ETH_ADDR_ARGS(eth->eth_src));
+ 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));
}
- 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");
}
}
{
struct cfm *cfm;
- LIST_FOR_EACH (cfm, list_node, &all_cfms) {
- if (cfm->name && !strcmp(cfm->name, name)) {
+ HMAP_FOR_EACH_WITH_HASH (cfm, hmap_node, hash_string(name, 0), &all_cfms) {
+ if (!strcmp(cfm->name, name)) {
return cfm;
}
}
return;
}
- ds_put_format(&ds, "MPID %"PRIu16": %s\n", cfm->mpid,
- cfm->fault ? "fault" : "");
+ ds_put_format(&ds, "MPID %"PRIu16":%s%s\n", cfm->mpid,
+ 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_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, "Remote MPID %"PRIu16":%s\n", rmp->mpid,
+ rmp->rdi ? " rdi" : "");
ds_put_format(&ds, "\trecv since check: %s",
rmp->recv ? "true" : "false");
}
projects / openvswitch / blobdiff