X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbond.c;h=9a13874e588245728d7e0bf897cc5344365a5bf0;hb=520e9a2acdcf6136bf0a20586df6351ecf72dd3e;hp=4e68fc8654959bbc374127666547d75e4b22f2af;hpb=c8544aa15f8811e9d6329d4a5e612ff7acb926c9;p=openvswitch diff --git a/lib/bond.c b/lib/bond.c index 4e68fc86..9a13874e 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -59,12 +59,13 @@ 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. */ long long delay_expires; /* Time after which 'enabled' may change. */ bool enabled; /* May be chosen for flows? */ - bool lacp_may_enable; /* LACP considers this interface bondable. */ + bool may_enable; /* Client considers this slave bondable. */ tag_type tag; /* Tag associated with this slave. */ /* Rebalancing info. Used only by bond_rebalance(). */ @@ -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; @@ -396,13 +385,15 @@ bond_slave_unregister(struct bond *bond, const void *slave_) } } -/* Should be called on each slave in 'bond' before bond_run() to indicate the - * results of lacp_slave_may_enable() on 'slave_'. */ +/* Should be called on each slave in 'bond' before bond_run() to indicate + * whether or not 'slave_' may be enabled. This function is intended to allow + * other protocols to have some impact on bonding decisions. For example LACP + * or high level link monitoring protocols may decide that a given slave should + * not be able to send traffic. */ void -bond_slave_set_lacp_may_enable(struct bond *bond, void *slave_, - bool may_enable) +bond_slave_set_may_enable(struct bond *bond, void *slave_, bool may_enable) { - bond_slave_lookup(bond, slave_)->lacp_may_enable = may_enable; + bond_slave_lookup(bond, slave_)->may_enable = may_enable; } /* Performs periodic maintenance on 'bond'. The caller must provide 'tags' to @@ -417,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); @@ -466,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) { @@ -569,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. */ @@ -583,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 @@ -964,8 +973,8 @@ bond_unixctl_show(struct unixctl_conn *conn, slave->delay_expires - time_msec()); } - ds_put_format(&ds, "\tlacp_may_enable: %s\n", - slave->lacp_may_enable ? "true" : "false"); + ds_put_format(&ds, "\tmay_enable: %s\n", + slave->may_enable ? "true" : "false"); if (!bond_is_balanced(bond)) { continue; @@ -1271,7 +1280,7 @@ bond_link_status_update(struct bond_slave *slave, struct tag_set *tags) struct bond *bond = slave->bond; bool up; - up = netdev_get_carrier(slave->netdev) && slave->lacp_may_enable; + up = netdev_get_carrier(slave->netdev) && slave->may_enable; if ((up == slave->enabled) != (slave->delay_expires == LLONG_MAX)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); VLOG_INFO_RL(&rl, "interface %s: link state %s", @@ -1303,8 +1312,8 @@ bond_link_status_update(struct bond_slave *slave, struct tag_set *tags) static bool bond_is_tcp_hash(const struct bond *bond) { - return (bond->balance == BM_TCP || bond->balance == BM_STABLE) - && bond->lacp_negotiated; + return (bond->balance == BM_TCP && bond->lacp_negotiated) + || bond->balance == BM_STABLE; } static unsigned int @@ -1420,7 +1429,7 @@ bond_choose_slave(const struct bond *bond) best = NULL; HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { if (slave->delay_expires != LLONG_MAX - && slave->lacp_may_enable + && slave->may_enable && (!best || slave->delay_expires < best->delay_expires)) { best = slave; }