From: Alexandre Belloni <alexandre.belloni@bootlin•com>
To: Vladimir Oltean <vladimir.oltean@nxp•com>
Cc: Tobias Waldekranz <tobias@waldekranz•com>,
"David S . Miller" <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>,
netdev@vger•kernel.org, UNGLinuxDriver@microchip•com,
Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
Vivien Didelot <vivien.didelot@gmail•com>,
Claudiu Manoil <claudiu.manoil@nxp•com>
Subject: Re: [RFC PATCH net-next 07/16] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device
Date: Tue, 15 Dec 2020 17:36:07 +0100 [thread overview]
Message-ID: <20201215163607.GK1781038@piout.net> (raw)
In-Reply-To: <20201208120802.1268708-8-vladimir.oltean@nxp.com>
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
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2020-12-15 16:37 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 12:07 [RFC PATCH net-next 00/16] LAG offload for Ocelot DSA switches Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 01/16] net: mscc: ocelot: offload bridge port flags to device Vladimir Oltean
2020-12-15 14:37 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 02/16] net: mscc: ocelot: allow offloading of bridge on top of LAG Vladimir Oltean
2020-12-15 14:43 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 03/16] net: mscc: ocelot: rename ocelot_netdevice_port_event to ocelot_netdevice_changeupper Vladimir Oltean
2020-12-15 15:01 ` Alexandre Belloni
2020-12-15 15:27 ` Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 04/16] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event Vladimir Oltean
2020-12-15 15:52 ` Alexandre Belloni
2020-12-15 15:56 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 05/16] net: mscc: ocelot: don't refuse bonding interfaces we can't offload Vladimir Oltean
2020-12-15 15:56 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 06/16] net: mscc: ocelot: use ipv6 in the aggregation code Vladimir Oltean
2020-12-15 16:03 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 07/16] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device Vladimir Oltean
2020-12-15 16:36 ` Alexandre Belloni [this message]
2020-12-08 12:07 ` [RFC PATCH net-next 08/16] net: mscc: ocelot: avoid unneeded "lp" variable in LAG join Vladimir Oltean
2020-12-15 16:47 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 09/16] net: mscc: ocelot: use "lag" variable name in ocelot_bridge_stp_state_set Vladimir Oltean
2020-12-15 16:49 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 10/16] net: mscc: ocelot: reapply bridge forwarding mask on bonding join/leave Vladimir Oltean
2020-12-16 12:29 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 11/16] net: mscc: ocelot: set up logical port IDs centrally Vladimir Oltean
2020-12-16 20:15 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 12/16] net: mscc: ocelot: drop the use of the "lags" array Vladimir Oltean
2020-12-16 21:29 ` Alexandre Belloni
2021-01-15 11:05 ` Vladimir Oltean
2021-01-15 12:02 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 13/16] net: mscc: ocelot: rename aggr_count to num_ports_in_lag Vladimir Oltean
2020-12-16 21:31 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 14/16] net: mscc: ocelot: rebalance LAGs on link up/down events Vladimir Oltean
2020-12-16 21:32 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 15/16] net: dsa: felix: propagate the LAG offload ops towards the ocelot lib Vladimir Oltean
2020-12-08 12:08 ` [RFC PATCH net-next 16/16] net: dsa: ocelot: tell DSA that we can offload link aggregation Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215163607.GK1781038@piout.net \
--to=alexandre.belloni@bootlin$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=claudiu.manoil@nxp$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tobias@waldekranz$(echo .)com \
--cc=vivien.didelot@gmail$(echo .)com \
--cc=vladimir.oltean@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox