| Message ID | 20201212203901.351331-1-vladimir.oltean@nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,net-next] net: dsa: reference count the host mdb addresses | expand |
On Sun, Dec 13, 2020 at 01:08:55AM +0100, Andrew Lunn wrote: > > > And you need some way to cleanup the allocated memory when the commit > > > never happens because some other layer has said No! > > > > So this would be a fatal problem with the switchdev transactional model > > if I am not misunderstanding it. On one hand there's this nice, bubbly > > idea that you should preallocate memory in the prepare phase, so that > > there's one reason less to fail at commit time. But on the other hand, > > if "the commit phase might never happen" is even a remove possibility, > > all of that goes to trash - how are you even supposed to free the > > preallocated memory. > > It can definitely happen, that commit is never called: > > static int switchdev_port_obj_add_now(struct net_device *dev, > const struct switchdev_obj *obj, > struct netlink_ext_ack *extack) > { > > /* Phase I: prepare for obj add. Driver/device should fail > * here if there are going to be issues in the commit phase, > * such as lack of resources or support. The driver/device > * should reserve resources needed for the commit phase here, > * but should not commit the obj. > */ > > trans.ph_prepare = true; > err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD, > dev, obj, &trans, extack); > if (err) > return err; > > /* Phase II: commit obj add. This cannot fail as a fault > * of driver/device. If it does, it's a bug in the driver/device > * because the driver said everythings was OK in phase I. > */ > > trans.ph_prepare = false; > err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD, > dev, obj, &trans, extack); > WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id); > > return err; > > So if any notifier returns an error during prepare, the commit is > never called. > > So the memory you allocated and added to the list may never get > used. Its refcount stays zero. Which is why i suggested making the > MDB remove call do a general garbage collect. It is not perfect, the > cleanup could be deferred a long time, but is should get removed > eventually. What would the garbage collection look like?
On Sun, Dec 13, 2020 at 12:14:19AM +0000, Vladimir Oltean wrote: > On Sun, Dec 13, 2020 at 01:08:55AM +0100, Andrew Lunn wrote: > > > > And you need some way to cleanup the allocated memory when the commit > > > > never happens because some other layer has said No! > > > > > > So this would be a fatal problem with the switchdev transactional model > > > if I am not misunderstanding it. On one hand there's this nice, bubbly > > > idea that you should preallocate memory in the prepare phase, so that > > > there's one reason less to fail at commit time. But on the other hand, > > > if "the commit phase might never happen" is even a remove possibility, > > > all of that goes to trash - how are you even supposed to free the > > > preallocated memory. > > > > It can definitely happen, that commit is never called: > > > > static int switchdev_port_obj_add_now(struct net_device *dev, > > const struct switchdev_obj *obj, > > struct netlink_ext_ack *extack) > > { > > > > /* Phase I: prepare for obj add. Driver/device should fail > > * here if there are going to be issues in the commit phase, > > * such as lack of resources or support. The driver/device > > * should reserve resources needed for the commit phase here, > > * but should not commit the obj. > > */ > > > > trans.ph_prepare = true; > > err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD, > > dev, obj, &trans, extack); > > if (err) > > return err; > > > > /* Phase II: commit obj add. This cannot fail as a fault > > * of driver/device. If it does, it's a bug in the driver/device > > * because the driver said everythings was OK in phase I. > > */ > > > > trans.ph_prepare = false; > > err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD, > > dev, obj, &trans, extack); > > WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id); > > > > return err; > > > > So if any notifier returns an error during prepare, the commit is > > never called. > > > > So the memory you allocated and added to the list may never get > > used. Its refcount stays zero. Which is why i suggested making the > > MDB remove call do a general garbage collect. It is not perfect, the > > cleanup could be deferred a long time, but is should get removed > > eventually. > > What would the garbage collection look like? struct dsa_host_addr *a; list_for_each_entry_safe(a, addr_list, list) if (refcount_read(&a->refcount) == 0) { list_del(&a->list); free(a); } } Andrew
diff --git a/include/net/dsa.h b/include/net/dsa.h index 4e60d2610f20..e639db28e238 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -253,6 +253,13 @@ struct dsa_link { struct list_head list; }; +struct dsa_host_addr { + unsigned char addr[ETH_ALEN]; + u16 vid; + refcount_t refcount; + struct list_head list; +}; + struct dsa_switch { bool setup; @@ -335,6 +342,8 @@ struct dsa_switch { */ bool mtu_enforcement_ingress; + struct list_head host_mdb; + size_t num_ports; }; diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 183003e45762..52b3ef34a2cb 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -413,6 +413,8 @@ static int dsa_switch_setup(struct dsa_switch *ds) if (ds->setup) return 0; + INIT_LIST_HEAD(&ds->host_mdb); + /* Initialize ds->phys_mii_mask before registering the slave MDIO bus * driver and before ops->setup() has run, since the switch drivers and * the slave MDIO bus driver rely on these values for probing PHY diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 4a0498bf6c65..e0667be7d5ed 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -376,6 +376,123 @@ static int dsa_slave_vlan_add(struct net_device *dev, return 0; } +static struct dsa_host_addr * +dsa_host_addr_find(struct list_head *addr_list, + const struct switchdev_obj_port_mdb *mdb) +{ + struct dsa_host_addr *a; + + list_for_each_entry(a, addr_list, list) + if (ether_addr_equal(a->addr, mdb->addr) && a->vid == mdb->vid) + return a; + + return NULL; +} + +/* DSA can directly translate this to a normal MDB add, but on the CPU port. + * But because multiple user ports can join the same multicast group and the + * bridge will emit a notification for each port, we need to add/delete the + * entry towards the host only once, so we reference count it. + */ +static int dsa_host_mdb_add(struct dsa_port *dp, + const struct switchdev_obj_port_mdb *mdb, + struct switchdev_trans *trans) +{ + struct dsa_port *cpu_dp = dp->cpu_dp; + struct dsa_switch *ds = dp->ds; + struct dsa_host_addr *a; + int err; + + /* Complication created by the fact that addition has two phases, but + * deletion only has one phase, and we need reference counting. + * The strategy is to do the memory allocation in the prepare phase, + * but initialize the refcount in the commit phase. + * + * Have mdb | mdb has refcount > 0 | Commit phase | Resolution + * -------------+-----------------------+---------------+--------------- + * no | - | no | Alloc & proceed + * no | - | yes | Error + * yes | no | no | Error + * yes | no | yes | Proceed + * yes | yes | no | Ignore + * yes | yes | yes | Add refcount + */ + a = dsa_host_addr_find(&ds->host_mdb, mdb); + if (!a) { + if (WARN_ON(switchdev_trans_ph_commit(trans))) + return -EINVAL; + + a = kzalloc(sizeof(*a), GFP_KERNEL); + if (!a) + return -ENOMEM; + + err = dsa_port_mdb_add(cpu_dp, mdb, trans); + if (err) { + kfree(a); + return err; + } + + ether_addr_copy(a->addr, mdb->addr); + a->vid = mdb->vid; + refcount_set(&a->refcount, 0); + list_add_tail(&a->list, &ds->host_mdb); + + return 0; + } + + /* If we are in the prepare phase, and a host mdb exists, + * then ignore it. The refcount will be incremented during + * commit, if propagation to hardware went well. + */ + if (switchdev_trans_ph_prepare(trans)) + return 0; + + /* In the commit phase, a host mdb might exist either left as + * unfinished work by the previous prepare phase (this will have + * refcount 0), or as a complete entry installed for another port. + */ + if (refcount_read(&a->refcount) > 0) { + refcount_inc(&a->refcount); + return 0; + } + + err = dsa_port_mdb_add(cpu_dp, mdb, trans); + if (err) { + list_del(&a->list); + kfree(a); + return err; + } + + refcount_set(&a->refcount, 1); + + return 0; +} + +static int dsa_host_mdb_del(struct dsa_port *dp, + const struct switchdev_obj_port_mdb *mdb) +{ + struct dsa_port *cpu_dp = dp->cpu_dp; + struct dsa_switch *ds = dp->ds; + struct dsa_host_addr *a; + int err; + + a = dsa_host_addr_find(&ds->host_mdb, mdb); + if (!a) + return -ENOENT; + + if (!refcount_dec_and_test(&a->refcount)) + return 0; + + err = dsa_port_mdb_del(cpu_dp, mdb); + if (err) + return err; + + list_del(&a->list); + kfree(a); + + return 0; +} + static int dsa_slave_port_obj_add(struct net_device *dev, const struct switchdev_obj *obj, struct switchdev_trans *trans, @@ -396,11 +513,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev, err = dsa_port_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj), trans); break; case SWITCHDEV_OBJ_ID_HOST_MDB: - /* DSA can directly translate this to a normal MDB add, - * but on the CPU port. - */ - err = dsa_port_mdb_add(dp->cpu_dp, SWITCHDEV_OBJ_PORT_MDB(obj), - trans); + err = dsa_host_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj), trans); break; case SWITCHDEV_OBJ_ID_PORT_VLAN: err = dsa_slave_vlan_add(dev, obj, trans); @@ -455,10 +568,7 @@ static int dsa_slave_port_obj_del(struct net_device *dev, err = dsa_port_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj)); break; case SWITCHDEV_OBJ_ID_HOST_MDB: - /* DSA can directly translate this to a normal MDB add, - * but on the CPU port. - */ - err = dsa_port_mdb_del(dp->cpu_dp, SWITCHDEV_OBJ_PORT_MDB(obj)); + err = dsa_host_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj)); break; case SWITCHDEV_OBJ_ID_PORT_VLAN: err = dsa_slave_vlan_del(dev, obj);
Currently any DSA switch that is strict when implementing the mdb operations prints these benign errors after the addresses expire, with at least 2 ports bridged: [ 286.013814] mscc_felix 0000:00:00.5 swp3: failed (err=-2) to del object (id=3) The reason has to do with this piece of code: netdev_for_each_lower_dev(dev, lower_dev, iter) br_mdb_switchdev_host_port(dev, lower_dev, mp, type); called from: br_multicast_group_expired -> br_multicast_host_leave -> br_mdb_notify -> br_mdb_switchdev_host Basically, that code is correct. It tells each switchdev port that the host can leave that multicast group. But in the case of DSA, all user ports are connected to the host through the same pipe. So, because DSA translates a host MDB to a normal MDB on the CPU port, this means that when all user ports leave a multicast group, DSA tries to remove it N times from the CPU port. We should be reference-counting these addresses. Otherwise, the first port on which the MDB expires will cause an entry removal from the CPU port, which will break the host MDB for the remaining ports. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- Changes in v3: - Allocating memory for host mdb in prepare phase, but setting refcount to 1 in commit phase. This complicates the implementation of the state machine a little bit. Changes in v2: - Re-targeted against net-next, since this is not breaking any use case that I know of. - Re-did the refcounting logic. The problem is that the MDB addition is two-phase, but the deletion is one-phase. So refcounting on addition needs to be done only on one phase - the commit one. Before, we had a problem there, and for host MDB additions where an entry already existed on the CPU port, we would call the prepare phase but never commit. This would break drivers that allocate memory on prepare, and then expect the commit phase to actually apply. So we're not doing this any longer. Both prepare and commit phases are now stubbed out for additions of host MDB entries that are already present on the CPU port. - Renamed dsa_host_mdb_find into dsa_host_addr_find, and we're now passing it the host_mdb list rather than struct dsa_switch *ds. This is a generic function and we might be able to reuse it in the future for host FDB entries (such as slave net_device MAC addresses). - Left the allocation as GFP_KERNEL, since that is fine - the switchdev notifier runs as deferred, therefore in process context. include/net/dsa.h | 9 ++++ net/dsa/dsa2.c | 2 + net/dsa/slave.c | 128 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 130 insertions(+), 9 deletions(-)