#include <sys/types.h>
#include <unistd.h>
#include "bitmap.h"
+#include "cfm.h"
#include "classifier.h"
#include "coverage.h"
#include "dirs.h"
VLOG_DEFINE_THIS_MODULE(bridge);
+COVERAGE_DEFINE(bridge_flush);
+COVERAGE_DEFINE(bridge_process_flow);
+COVERAGE_DEFINE(bridge_reconfigure);
+
struct dst {
uint16_t vlan;
uint16_t dp_ifidx;
struct netdev *netdev; /* Network device. */
bool enabled; /* May be chosen for flows? */
const char *type; /* Usually same as cfg->type. */
+ struct cfm *cfm; /* Connectivity Fault Management */
const struct ovsrec_interface *cfg;
};
static void iface_set_mac(struct iface *);
static void iface_set_ofport(const struct ovsrec_interface *, int64_t ofport);
static void iface_update_qos(struct iface *, const struct ovsrec_qos *);
+static void iface_update_cfm(struct iface *);
+static void iface_refresh_cfm_stats(struct iface *iface);
+static void iface_send_packet(struct iface *, struct ofpbuf *packet);
static void shash_from_ovs_idl_map(char **keys, char **values, size_t n,
struct shash *);
bridge_init(const char *remote)
{
/* Create connection to database. */
- idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
+ idl = ovsdb_idl_create(remote, &ovsrec_idl_class, true);
- ovsdb_idl_set_write_only(idl, &ovsrec_open_vswitch_col_cur_cfg);
- ovsdb_idl_set_write_only(idl, &ovsrec_open_vswitch_col_statistics);
+ ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_cur_cfg);
+ ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_statistics);
ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_external_ids);
ovsdb_idl_omit(idl, &ovsrec_bridge_col_external_ids);
ovsdb_idl_omit(idl, &ovsrec_port_col_external_ids);
ovsdb_idl_omit(idl, &ovsrec_port_col_fake_bridge);
- ovsdb_idl_set_write_only(idl, &ovsrec_interface_col_ofport);
- ovsdb_idl_set_write_only(idl, &ovsrec_interface_col_statistics);
+ ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_ofport);
+ ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_statistics);
ovsdb_idl_omit(idl, &ovsrec_interface_col_external_ids);
/* Register unixctl commands. */
iterate_and_prune_ifaces(br, set_iface_properties, NULL);
}
+ LIST_FOR_EACH (br, node, &all_bridges) {
+ struct iface *iface;
+ HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
+ iface_update_cfm(iface);
+ }
+ }
+
free(managers);
}
return eth_addr_to_uint64(hash);
}
+static void
+iface_refresh_cfm_stats(struct iface *iface)
+{
+ size_t i;
+ struct cfm *cfm;
+ const struct ovsrec_monitor *mon;
+
+ mon = iface->cfg->monitor;
+ cfm = iface->cfm;
+
+ if (!cfm || !mon) {
+ return;
+ }
+
+ for (i = 0; i < mon->n_remote_mps; i++) {
+ const struct ovsrec_maintenance_point *mp;
+ const struct remote_mp *rmp;
+
+ mp = mon->remote_mps[i];
+ rmp = cfm_get_remote_mp(cfm, mp->mpid);
+
+ ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1);
+ }
+
+ if (hmap_is_empty(&cfm->x_remote_mps)) {
+ ovsrec_monitor_set_unexpected_remote_mpids(mon, NULL, 0);
+ } else {
+ size_t length;
+ struct remote_mp *rmp;
+ int64_t *x_remote_mps;
+
+ length = hmap_count(&cfm->x_remote_mps);
+ x_remote_mps = xzalloc(length * sizeof *x_remote_mps);
+
+ i = 0;
+ HMAP_FOR_EACH (rmp, node, &cfm->x_remote_mps) {
+ x_remote_mps[i++] = rmp->mpid;
+ }
+
+ ovsrec_monitor_set_unexpected_remote_mpids(mon, x_remote_mps, length);
+ free(x_remote_mps);
+ }
+
+ if (hmap_is_empty(&cfm->x_remote_maids)) {
+ ovsrec_monitor_set_unexpected_remote_maids(mon, NULL, 0);
+ } else {
+ size_t length;
+ char **x_remote_maids;
+ struct remote_maid *rmaid;
+
+ length = hmap_count(&cfm->x_remote_maids);
+ x_remote_maids = xzalloc(length * sizeof *x_remote_maids);
+
+ i = 0;
+ HMAP_FOR_EACH (rmaid, node, &cfm->x_remote_maids) {
+ size_t j;
+
+ x_remote_maids[i] = xzalloc(CCM_MAID_LEN * 2 + 1);
+
+ for (j = 0; j < CCM_MAID_LEN; j++) {
+ snprintf(&x_remote_maids[i][j * 2], 3, "%02hhx",
+ rmaid->maid[j]);
+ }
+ i++;
+ }
+ ovsrec_monitor_set_unexpected_remote_maids(mon, x_remote_maids, length);
+
+ for (i = 0; i < length; i++) {
+ free(x_remote_maids[i]);
+ }
+ free(x_remote_maids);
+ }
+
+ ovsrec_monitor_set_fault(mon, &cfm->fault, 1);
+}
+
static void
iface_refresh_stats(struct iface *iface)
{
for (j = 0; j < port->n_ifaces; j++) {
struct iface *iface = port->ifaces[j];
iface_refresh_stats(iface);
+ iface_refresh_cfm_stats(iface);
}
}
}
bridge_wait(void)
{
struct bridge *br;
+ struct iface *iface;
LIST_FOR_EACH (br, node, &all_bridges) {
ofproto_wait(br->ofproto);
mac_learning_wait(br->ml);
bond_wait(br);
+
+ HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
+ if (iface->cfm) {
+ cfm_wait(iface->cfm);
+ }
+ }
}
ovsdb_idl_wait(idl);
poll_timer_wait_until(stats_timer);
bridge_run_one(struct bridge *br)
{
int error;
+ struct iface *iface;
error = ofproto_run1(br->ofproto);
if (error) {
error = ofproto_run2(br->ofproto, br->flush);
br->flush = false;
+ HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
+ struct ofpbuf *packet;
+
+ if (!iface->cfm) {
+ continue;
+ }
+
+ packet = cfm_run(iface->cfm);
+ if (packet) {
+ iface_send_packet(iface, packet);
+ ofpbuf_uninit(packet);
+ free(packet);
+ }
+ }
+
return error;
}
/* Configure OpenFlow controller connection snooping. */
svec_init(&snoops);
svec_add_nocopy(&snoops, xasprintf("punix:%s/%s.snoop",
- ovs_rundir, br->name));
+ ovs_rundir(), br->name));
svec_init(&old_snoops);
ofproto_get_snoops(br->ofproto, &old_snoops);
if (!svec_equal(&snoops, &old_snoops)) {
bridge_ofproto_controller_for_mgmt(const struct bridge *br,
struct ofproto_controller *oc)
{
- oc->target = xasprintf("punix:%s/%s.mgmt", ovs_rundir, br->name);
+ oc->target = xasprintf("punix:%s/%s.mgmt", ovs_rundir(), br->name);
oc->max_backoff = 0;
oc->probe_interval = 60;
oc->band = OFPROTO_OUT_OF_BAND;
{
p->vlan = (out_port->vlan >= 0 ? OFP_VLAN_NONE
: in_port->vlan >= 0 ? in_port->vlan
- : ntohs(flow->dl_vlan));
+ : flow->vlan_tci == 0 ? OFP_VLAN_NONE
+ : vlan_tci_to_vid(flow->vlan_tci));
return choose_output_iface(out_port, flow->dl_src, &p->dp_ifidx, tags);
}
struct dst dsts[], tag_type *tags, uint16_t *nf_output_iface)
{
mirror_mask_t mirrors = in_port->src_mirrors;
+ int flow_vlan;
struct dst *dst = dsts;
size_t i;
+ flow_vlan = vlan_tci_to_vid(flow->vlan_tci);
+ if (flow_vlan == 0) {
+ flow_vlan = OFP_VLAN_NONE;
+ }
+
if (out_port == FLOOD_PORT) {
/* XXX use ODP_FLOOD if no vlans or bonding. */
/* XXX even better, define each VLAN as a datapath port group */
if (port_includes_vlan(port, m->out_vlan)
&& set_dst(dst, flow, in_port, port, tags))
{
- int flow_vlan;
if (port->vlan < 0) {
dst->vlan = m->out_vlan;
* tagging tags place. This is necessary because
* dst->vlan is the final vlan, after removing implicit
* tags. */
- flow_vlan = ntohs(flow->dl_vlan);
- if (flow_vlan == 0) {
- flow_vlan = OFP_VLAN_NONE;
- }
if (port == in_port && dst->vlan == flow_vlan) {
/* Don't send out input port on same VLAN. */
continue;
mirrors &= mirrors - 1;
}
- partition_dsts(dsts, dst - dsts, ntohs(flow->dl_vlan));
+ partition_dsts(dsts, dst - dsts, flow_vlan);
return dst - dsts;
}
n_dsts = compose_dsts(br, flow, vlan, in_port, out_port, dsts, tags,
nf_output_iface);
- cur_vlan = ntohs(flow->dl_vlan);
+ cur_vlan = vlan_tci_to_vid(flow->vlan_tci);
+ if (cur_vlan == 0) {
+ cur_vlan = OFP_VLAN_NONE;
+ }
for (p = dsts; p < &dsts[n_dsts]; p++) {
union odp_action *a;
if (p->vlan != cur_vlan) {
} else {
a = odp_actions_add(actions, ODPAT_SET_DL_TCI);
a->dl_tci.tci = htons(p->vlan & VLAN_VID_MASK);
- a->dl_tci.tci |= htons(flow->dl_vlan_pcp << VLAN_PCP_SHIFT);
+ a->dl_tci.tci |= flow->vlan_tci & htons(VLAN_PCP_MASK);
}
cur_vlan = p->vlan;
}
static int flow_get_vlan(struct bridge *br, const struct flow *flow,
struct port *in_port, bool have_packet)
{
- /* Note that dl_vlan of 0 and of OFP_VLAN_NONE both mean that the packet
- * belongs to VLAN 0, so we should treat both cases identically. (In the
- * former case, the packet has an 802.1Q header that specifies VLAN 0,
- * presumably to allow a priority to be specified. In the latter case, the
- * packet does not have any 802.1Q header.) */
- int vlan = ntohs(flow->dl_vlan);
- if (vlan == OFP_VLAN_NONE) {
- vlan = 0;
- }
+ int vlan = vlan_tci_to_vid(flow->vlan_tci);
if (in_port->vlan >= 0) {
if (vlan) {
/* XXX support double tagging? */
if (have_packet) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
- VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %"PRIu16" tagged "
+ VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %d tagged "
"packet received on port %s configured with "
"implicit VLAN %"PRIu16,
- br->name, ntohs(flow->dl_vlan),
- in_port->name, in_port->vlan);
+ br->name, vlan, in_port->name, in_port->vlan);
}
return -1;
}
struct odp_actions *actions, tag_type *tags,
uint16_t *nf_output_iface, void *br_)
{
+ struct iface *iface;
struct bridge *br = br_;
COVERAGE_INC(bridge_process_flow);
+ iface = iface_from_dp_ifidx(br, flow->in_port);
+
+ if (cfm_should_process_flow(flow)) {
+ if (packet && iface->cfm) {
+ cfm_process_heartbeat(iface->cfm, packet);
+ }
+ return false;
+ }
+
return process_flow(br, flow, packet, actions, tags, nf_output_iface);
}
\f
/* Interface functions. */
+static void
+iface_send_packet(struct iface *iface, struct ofpbuf *packet)
+{
+ struct flow flow;
+ union ofp_action action;
+
+ memset(&action, 0, sizeof action);
+ action.output.type = htons(OFPAT_OUTPUT);
+ action.output.len = htons(sizeof action);
+ action.output.port = htons(odp_port_to_ofp_port(iface->dp_ifidx));
+
+ flow_extract(packet, 0, ODPP_NONE, &flow);
+
+ if (ofproto_send_packet(iface->port->bridge->ofproto, &flow, &action, 1,
+ packet)) {
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+ VLOG_WARN_RL(&rl, "interface %s: Failed to send packet.", iface->name);
+ }
+}
+
static struct iface *
iface_create(struct port *port, const struct ovsrec_interface *if_cfg)
{
bond_send_learning_packets(port);
}
+ cfm_destroy(iface->cfm);
+
free(iface->name);
free(iface);
}
}
}
+
+static void
+iface_update_cfm(struct iface *iface)
+{
+ size_t i;
+ struct cfm *cfm;
+ uint16_t *remote_mps;
+ struct ovsrec_monitor *mon;
+ uint8_t ea[ETH_ADDR_LEN], maid[CCM_MAID_LEN];
+
+ mon = iface->cfg->monitor;
+
+ if (!mon) {
+ return;
+ }
+
+ if (netdev_get_etheraddr(iface->netdev, ea)) {
+ VLOG_WARN("interface %s: Failed to get ethernet address. "
+ "Skipping Monitor.", iface->name);
+ return;
+ }
+
+ if (!cfm_generate_maid(mon->md_name, mon->ma_name, maid)) {
+ VLOG_WARN("interface %s: Failed to generate MAID.", iface->name);
+ return;
+ }
+
+ if (!iface->cfm) {
+ iface->cfm = cfm_create();
+ }
+
+ cfm = iface->cfm;
+ cfm->mpid = mon->mpid;
+ cfm->interval = mon->interval ? *mon->interval : 1000;
+
+ memcpy(cfm->eth_src, ea, sizeof cfm->eth_src);
+ memcpy(cfm->maid, maid, sizeof cfm->maid);
+
+ remote_mps = xzalloc(mon->n_remote_mps * sizeof *remote_mps);
+ for(i = 0; i < mon->n_remote_mps; i++) {
+ remote_mps[i] = mon->remote_mps[i]->mpid;
+ }
+ cfm_update_remote_mps(cfm, remote_mps, mon->n_remote_mps);
+ free(remote_mps);
+
+ if (!cfm_configure(iface->cfm)) {
+ cfm_destroy(iface->cfm);
+ iface->cfm = NULL;
+ }
+}
\f
/* Port mirroring. */