In some cases, a controller may want to take an interface down for
forwarding purposes, but avoid completely deconfiguring CFM and
thus lose all connectivity monitoring. The new 'cfm_opstate'
setting is a way to achieve this behavior.
/* Defined by ITU-T Y.1731 should be zero */
ovs_be16 interval_ms_x; /* Transmission interval in ms. */
ovs_be64 mpid64; /* MPID in extended mode. */
/* Defined by ITU-T Y.1731 should be zero */
ovs_be16 interval_ms_x; /* Transmission interval in ms. */
ovs_be64 mpid64; /* MPID in extended mode. */
+ uint8_t opdown; /* Operationally down. */
+ uint8_t zero[5];
/* TLV space. */
uint8_t end_tlv;
/* TLV space. */
uint8_t end_tlv;
bool extended; /* Extended mode. */
bool fault; /* Indicates connectivity fault. */
bool unexpected_recv; /* Received an unexpected CCM. */
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. */
uint32_t seq; /* The sequence number of our last CCM. */
uint8_t ccm_interval; /* The CCM transmission interval. */
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 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);
};
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
hmap_init(&cfm->remote_mps);
cfm_generate_maid(cfm);
hmap_insert(&all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0));
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;
cfm->rmps_array = xmalloc(hmap_count(&cfm->remote_mps) *
sizeof *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) {
HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->remote_mps) {
if (!rmp->recv) {
+ if (!rmp->opup) {
+ cfm->remote_opup = rmp->opup;
+ }
+
cfm->rmps_array[cfm->rmps_array_len++] = rmp->mpid;
}
}
cfm->rmps_array[cfm->rmps_array_len++] = rmp->mpid;
}
}
if (cfm->extended) {
ccm->mpid = htons(hash_mpid(cfm->mpid));
ccm->mpid64 = htonll(cfm->mpid);
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);
} else {
ccm->mpid = htons(cfm->mpid);
ccm->mpid64 = htonll(0);
}
if (cfm->ccm_interval == 0) {
}
if (cfm->ccm_interval == 0) {
cfm->mpid = s->mpid;
cfm->extended = s->extended;
cfm->mpid = s->mpid;
cfm->extended = s->extended;
interval = ms_to_ccm_interval(s->interval);
interval_ms = ccm_interval_to_ms(interval);
interval = ms_to_ccm_interval(s->interval);
interval_ms = ccm_interval_to_ms(interval);
struct remote_mp *rmp;
uint64_t ccm_mpid;
struct remote_mp *rmp;
uint64_t ccm_mpid;
- ccm_mpid = cfm->extended ? ntohll(ccm->mpid64) : ntohs(ccm->mpid);
+ 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"
if (ccm_interval != cfm->ccm_interval) {
VLOG_WARN_RL(&rl, "%s: received a CCM with an invalid interval"
}
rmp = lookup_remote_mp(cfm, 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));
+ }
+ }
+
- 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;
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 %"PRIu64" 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 %"PRIu64")"
}
VLOG_DBG("%s: received CCM (seq %"PRIu32") (mpid %"PRIu64")"
+/* 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' */
/* 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' */
cfm->fault ? " fault" : "",
cfm->unexpected_recv ? " unexpected_recv" : "");
cfm->fault ? " fault" : "",
cfm->unexpected_recv ? " unexpected_recv" : "");
+ 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, "\tinterval: %dms\n", cfm->ccm_interval_ms);
ds_put_format(ds, "\tnext CCM tx: %lldms\n",
timer_msecs_until_expired(&cfm->tx_timer));
rmp->rdi ? " rdi" : "");
ds_put_format(ds, "\trecv since check: %s\n",
rmp->recv ? "true" : "false");
rmp->rdi ? " rdi" : "");
ds_put_format(ds, "\trecv since check: %s\n",
rmp->recv ? "true" : "false");
+ ds_put_format(ds, "\topstate: %s\n", rmp->opup? "up" : "down");
uint64_t mpid; /* The MPID of this CFM. */
int interval; /* The requested transmission interval. */
bool extended; /* Run in extended mode. */
uint64_t mpid; /* The MPID of this CFM. */
int interval; /* The requested transmission interval. */
bool extended; /* Run in extended mode. */
+ bool opup; /* Operational State. */
bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *);
void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
bool cfm_get_fault(const struct cfm *);
bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *);
void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
bool cfm_get_fault(const struct cfm *);
+bool cfm_get_opup(const struct cfm *);
void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
size_t *n_rmps);
void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
size_t *n_rmps);
ofpbuf_uninit(&packet);
}
ofpbuf_uninit(&packet);
}
- enable = enable && !cfm_get_fault(ofport->cfm);
+ enable = enable && !cfm_get_fault(ofport->cfm)
+ && cfm_get_opup(ofport->cfm);
iface_configure_cfm(struct iface *iface)
{
const struct ovsrec_interface *cfg = iface->cfg;
iface_configure_cfm(struct iface *iface)
{
const struct ovsrec_interface *cfg = iface->cfg;
- const char *extended_str;
+ const char *extended_str, *opstate_str;
struct cfm_settings s;
if (!cfg->n_cfm_mpid) {
struct cfm_settings s;
if (!cfg->n_cfm_mpid) {
"false");
s.extended = !strcasecmp("true", extended_str);
"false");
s.extended = !strcasecmp("true", extended_str);
+ opstate_str = get_interface_other_config(iface->cfg, "cfm_opstate", "up");
+ s.opup = !strcasecmp("up", opstate_str);
+
ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s);
}
ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s);
}
compatibility with 802.1ag compliant implementations. Defaults to
<code>false</code>.
</column>
compatibility with 802.1ag compliant implementations. Defaults to
<code>false</code>.
</column>
+ <column name="other_config" key="cfm_opstate">
+ When <code>down</code>, the CFM module marks all CCMs it generates as
+ operationally down without triggering a fault. This allows remote
+ maintenance points to choose not to forward traffic to the
+ <ref table="Interface"/> on which this CFM module is running.
+ Currently, in Open vSwitch, the opdown bit of CCMs affects
+ <ref table="Interface"/>s participating in bonds, and the bundle
+ OpenFlow action. This setting is ignored when CFM is not in extended
+ mode. Defaults to <code>up</code>.
+ </column>
</group>
<group title="Bonding Configuration">
</group>
<group title="Bonding Configuration">