| Message ID | 20201208120802.1268708-8-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | LAG offload for Ocelot DSA switches | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | fail | Series longer than 15 patches |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 4 this patch: 4 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 59 lines checked |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 4 this patch: 4 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 08/12/2020 14:07:53+0200, Vladimir Oltean wrote: > Since this code should be called from pure switchdev as well as from > DSA, we must find a way to determine the bonding mask not by looking > directly at the net_device lowers of the bonding interface, since those > could have different private structures. > > We keep a pointer to the bonding upper interface, if present, in struct > ocelot_port. Then the bonding mask becomes the bitwise OR of all ports > that have the same bonding upper interface. This adds a duplication of > functionality with the current "lags" array, but the duplication will be > short-lived, since further patches will remove the latter completely. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/net/ethernet/mscc/ocelot.c | 29 ++++++++++++++++++++++------- > include/soc/mscc/ocelot.h | 2 ++ > 2 files changed, 24 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c > index 13e86dd71e5a..30dee1f957d1 100644 > --- a/drivers/net/ethernet/mscc/ocelot.c > +++ b/drivers/net/ethernet/mscc/ocelot.c > @@ -881,6 +881,24 @@ int ocelot_get_ts_info(struct ocelot *ocelot, int port, > } > EXPORT_SYMBOL(ocelot_get_ts_info); > > +static u32 ocelot_get_bond_mask(struct ocelot *ocelot, struct net_device *bond) > +{ > + u32 bond_mask = 0; > + int port; > + > + for (port = 0; port < ocelot->num_phys_ports; port++) { > + struct ocelot_port *ocelot_port = ocelot->ports[port]; > + > + if (!ocelot_port) > + continue; > + > + if (ocelot_port->bond == bond) > + bond_mask |= BIT(port); > + } > + > + return bond_mask; > +} > + > void ocelot_bridge_stp_state_set(struct ocelot *ocelot, int port, u8 state) > { > struct ocelot_port *ocelot_port = ocelot->ports[port]; > @@ -1272,17 +1290,12 @@ static void ocelot_setup_lag(struct ocelot *ocelot, int lag) > int ocelot_port_lag_join(struct ocelot *ocelot, int port, > struct net_device *bond) > { > - struct net_device *ndev; > u32 bond_mask = 0; > int lag, lp; > > - rcu_read_lock(); > - for_each_netdev_in_bond_rcu(bond, ndev) { > - struct ocelot_port_private *priv = netdev_priv(ndev); > + ocelot->ports[port]->bond = bond; > > - bond_mask |= BIT(priv->chip_port); > - } > - rcu_read_unlock(); > + bond_mask = ocelot_get_bond_mask(ocelot, bond); > > lp = __ffs(bond_mask); > > @@ -1315,6 +1328,8 @@ void ocelot_port_lag_leave(struct ocelot *ocelot, int port, > u32 port_cfg; > int i; > > + ocelot->ports[port]->bond = NULL; > + > /* Remove port from any lag */ > for (i = 0; i < ocelot->num_phys_ports; i++) > ocelot->lags[i] &= ~BIT(port); > diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h > index 50514c087231..b812bdff1da1 100644 > --- a/include/soc/mscc/ocelot.h > +++ b/include/soc/mscc/ocelot.h > @@ -597,6 +597,8 @@ struct ocelot_port { > phy_interface_t phy_mode; > > u8 *xmit_template; > + > + struct net_device *bond; > }; > > struct ocelot { > -- > 2.25.1 >
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 13e86dd71e5a..30dee1f957d1 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -881,6 +881,24 @@ int ocelot_get_ts_info(struct ocelot *ocelot, int port, } EXPORT_SYMBOL(ocelot_get_ts_info); +static u32 ocelot_get_bond_mask(struct ocelot *ocelot, struct net_device *bond) +{ + u32 bond_mask = 0; + int port; + + for (port = 0; port < ocelot->num_phys_ports; port++) { + struct ocelot_port *ocelot_port = ocelot->ports[port]; + + if (!ocelot_port) + continue; + + if (ocelot_port->bond == bond) + bond_mask |= BIT(port); + } + + return bond_mask; +} + void ocelot_bridge_stp_state_set(struct ocelot *ocelot, int port, u8 state) { struct ocelot_port *ocelot_port = ocelot->ports[port]; @@ -1272,17 +1290,12 @@ static void ocelot_setup_lag(struct ocelot *ocelot, int lag) int ocelot_port_lag_join(struct ocelot *ocelot, int port, struct net_device *bond) { - struct net_device *ndev; u32 bond_mask = 0; int lag, lp; - rcu_read_lock(); - for_each_netdev_in_bond_rcu(bond, ndev) { - struct ocelot_port_private *priv = netdev_priv(ndev); + ocelot->ports[port]->bond = bond; - bond_mask |= BIT(priv->chip_port); - } - rcu_read_unlock(); + bond_mask = ocelot_get_bond_mask(ocelot, bond); lp = __ffs(bond_mask); @@ -1315,6 +1328,8 @@ void ocelot_port_lag_leave(struct ocelot *ocelot, int port, u32 port_cfg; int i; + ocelot->ports[port]->bond = NULL; + /* Remove port from any lag */ for (i = 0; i < ocelot->num_phys_ports; i++) ocelot->lags[i] &= ~BIT(port); diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index 50514c087231..b812bdff1da1 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -597,6 +597,8 @@ struct ocelot_port { phy_interface_t phy_mode; u8 *xmit_template; + + struct net_device *bond; }; struct ocelot {
Since this code should be called from pure switchdev as well as from DSA, we must find a way to determine the bonding mask not by looking directly at the net_device lowers of the bonding interface, since those could have different private structures. We keep a pointer to the bonding upper interface, if present, in struct ocelot_port. Then the bonding mask becomes the bitwise OR of all ports that have the same bonding upper interface. This adds a duplication of functionality with the current "lags" array, but the duplication will be short-lived, since further patches will remove the latter completely. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/net/ethernet/mscc/ocelot.c | 29 ++++++++++++++++++++++------- include/soc/mscc/ocelot.h | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-)