X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbond.c;h=e15af04a3cf7519c12f9dcec7af27547aa2a7537;hb=0d28538d500600e346ee02fbb86962da90ce06cd;hp=85bb2da948c9d5c19bd91c045094beabf1c63129;hpb=739e1050dcc320af88e7ab227a15d26eb63e5726;p=sliver-openvswitch.git diff --git a/lib/bond.c b/lib/bond.c index 85bb2da94..e15af04a3 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -59,6 +59,7 @@ struct bond_slave { void *aux; /* Client-provided handle for this slave. */ struct netdev *netdev; /* Network device, owned by the client. */ + unsigned int change_seq; /* Tracks changes in 'netdev'. */ char *name; /* Name (a copy of netdev_get_name(netdev)). */ /* Link status. */ @@ -103,9 +104,6 @@ struct bond { /* BM_STABLE specific bonding info. */ tag_type stb_tag; /* Tag associated with this bond. */ - /* Monitoring. */ - struct netdev_monitor *monitor; /* detect == BLSM_CARRIER only. */ - /* Legacy compatibility. */ long long int next_fake_iface_update; /* LLONG_MAX if disabled. */ @@ -189,7 +187,6 @@ bond_create(const struct bond_settings *s) bond->no_slaves_tag = tag_create_random(); bond->stb_tag = tag_create_random(); bond->next_fake_iface_update = LLONG_MAX; - bond->monitor = netdev_monitor_create(); bond_reconfigure(bond, s); @@ -219,9 +216,6 @@ bond_destroy(struct bond *bond) hmap_destroy(&bond->slaves); free(bond->hash); - - netdev_monitor_destroy(bond->monitor); - free(bond->name); free(bond); } @@ -284,15 +278,11 @@ bond_reconfigure(struct bond *bond, const struct bond_settings *s) } static void -bond_slave_set_netdev__(struct bond *bond, struct bond_slave *slave, - struct netdev *netdev) +bond_slave_set_netdev__(struct bond_slave *slave, struct netdev *netdev) { if (slave->netdev != netdev) { - if (slave->netdev) { - netdev_monitor_remove(bond->monitor, slave->netdev); - } - netdev_monitor_add(bond->monitor, netdev); slave->netdev = netdev; + slave->change_seq = 0; } } @@ -334,7 +324,7 @@ bond_slave_register(struct bond *bond, void *slave_, uint32_t stb_id, bond->bond_revalidate = true; } - bond_slave_set_netdev__(bond, slave, netdev); + bond_slave_set_netdev__(slave, netdev); free(slave->name); slave->name = xstrdup(netdev_get_name(netdev)); @@ -350,7 +340,7 @@ bond_slave_set_netdev(struct bond *bond, void *slave_, struct netdev *netdev) { struct bond_slave *slave = bond_slave_lookup(bond, slave_); if (slave) { - bond_slave_set_netdev__(bond, slave, netdev); + bond_slave_set_netdev__(slave, netdev); } } @@ -368,7 +358,6 @@ bond_slave_unregister(struct bond *bond, const void *slave_) return; } - netdev_monitor_remove(bond->monitor, slave->netdev); bond_enable_slave(slave, false, NULL); del_active = bond->active_slave == slave; @@ -419,13 +408,10 @@ bond_run(struct bond *bond, struct tag_set *tags, bool lacp_negotiated) bond->lacp_negotiated = lacp_negotiated; - if (bond->monitor) { - netdev_monitor_flush(bond->monitor); - } - /* Enable slaves based on link status and LACP feedback. */ HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { bond_link_status_update(slave, tags); + slave->change_seq = netdev_change_seq(slave->netdev); } if (!bond->active_slave || !bond->active_slave->enabled) { bond_choose_active_slave(bond, tags); @@ -468,12 +454,14 @@ bond_wait(struct bond *bond) { struct bond_slave *slave; - netdev_monitor_poll_wait(bond->monitor); - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { if (slave->delay_expires != LLONG_MAX) { poll_timer_wait_until(slave->delay_expires); } + + if (slave->change_seq != netdev_change_seq(slave->netdev)) { + poll_immediate_wake(); + } } if (bond->next_fake_iface_update != LLONG_MAX) { @@ -544,7 +532,7 @@ bond_send_learning_packet(struct bond *bond, compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177, eth_src); if (vlan) { - eth_set_vlan_tci(&packet, htons(vlan)); + eth_push_vlan(&packet, htons(vlan)); } error = netdev_send(slave->netdev, &packet); ofpbuf_uninit(&packet); @@ -571,10 +559,15 @@ enum bond_verdict bond_check_admissibility(struct bond *bond, const void *slave_, const uint8_t eth_dst[ETH_ADDR_LEN], tag_type *tags) { - /* Admit all packets if LACP has been negotiated, because that means that - * the remote switch is aware of the bond and will "do the right thing". */ + struct bond_slave *slave = bond_slave_lookup(bond, slave_); + + /* LACP bonds have very loose admissibility restrictions because we can + * assume the remote switch is aware of the bond and will "do the right + * thing". However, as a precaution we drop packets on disabled slaves + * because no correctly implemented partner switch should be sending + * packets to them. */ if (bond->lacp_negotiated) { - return BV_ACCEPT; + return slave->enabled ? BV_ACCEPT : BV_DROP; } /* Drop all multicast packets on inactive slaves. */ @@ -585,6 +578,20 @@ bond_check_admissibility(struct bond *bond, const void *slave_, } } + /* Drop all packets which arrive on backup slaves. This is similar to how + * Linux bonding handles active-backup bonds. */ + if (bond->balance == BM_AB) { + *tags |= bond_get_active_slave_tag(bond); + if (bond->active_slave != slave) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + + VLOG_WARN_RL(&rl, "active-backup bond received packet on backup" + " slave (%s) destined for " ETH_ADDR_FMT, + slave->name, ETH_ADDR_ARGS(eth_dst)); + return BV_DROP; + } + } + /* Drop all packets for which we have learned a different input port, * because we probably sent the packet on one slave and got it back on the * other. Gratuitous ARP packets are an exception to this rule: the host @@ -632,7 +639,6 @@ void bond_account(struct bond *bond, const struct flow *flow, uint16_t vlan, uint64_t n_bytes) { - if (bond_is_balanced(bond)) { lookup_bond_entry(bond, flow, vlan)->tx_bytes += n_bytes; } @@ -1500,7 +1506,7 @@ bond_update_fake_slave_stats(struct bond *bond) } } - if (!netdev_open_default(bond->name, &bond_dev)) { + if (!netdev_open(bond->name, "system", &bond_dev)) { netdev_set_stats(bond_dev, &bond_stats); netdev_close(bond_dev); }