From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: Tobias Waldekranz <tobias@waldekranz.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, UNGLinuxDriver@microchip.com,
Alexandre Belloni <alexandre.belloni@bootlin.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: [RFC PATCH net-next 05/16] net: mscc: ocelot: don't refuse bonding interfaces we can't offload
Date: Tue, 8 Dec 2020 14:07:51 +0200 [thread overview]
Message-ID: <20201208120802.1268708-6-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20201208120802.1268708-1-vladimir.oltean@nxp.com>
Since switchdev/DSA exposes network interfaces that fulfill many of the
same user space expectations that dedicated NICs do, it makes sense to
not deny bonding interfaces with a bonding policy that we cannot offload,
but instead allow the bonding driver to select the egress interface in
software.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
drivers/net/ethernet/mscc/ocelot_net.c | 38 ++++++++++----------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 47b620967156..77957328722a 100644
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -1022,6 +1022,15 @@ static int ocelot_netdevice_changeupper(struct net_device *dev,
}
}
if (netif_is_lag_master(info->upper_dev)) {
+ struct netdev_lag_upper_info *lag_upper_info;
+
+ lag_upper_info = info->upper_info;
+
+ /* Only offload what we can */
+ if (lag_upper_info &&
+ lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
+ return NOTIFY_DONE;
+
if (info->linking)
err = ocelot_port_lag_join(ocelot, port,
info->upper_dev);
@@ -1037,10 +1046,16 @@ static int
ocelot_netdevice_lag_changeupper(struct net_device *dev,
struct netdev_notifier_changeupper_info *info)
{
+ struct netdev_lag_upper_info *lag_upper_info = info->upper_info;
struct net_device *lower;
struct list_head *iter;
int err = NOTIFY_DONE;
+ /* Can't offload LAG => also do bridging in software */
+ if (lag_upper_info &&
+ lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
+ return NOTIFY_DONE;
+
netdev_for_each_lower_dev(dev, lower, iter) {
err = ocelot_netdevice_changeupper(lower, info);
if (err)
@@ -1056,29 +1071,6 @@ static int ocelot_netdevice_event(struct notifier_block *unused,
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
switch (event) {
- case NETDEV_PRECHANGEUPPER: {
- struct netdev_notifier_changeupper_info *info = ptr;
- struct netdev_lag_upper_info *lag_upper_info;
- struct netlink_ext_ack *extack;
-
- if (!ocelot_netdevice_dev_check(dev))
- break;
-
- if (!netif_is_lag_master(info->upper_dev))
- break;
-
- lag_upper_info = info->upper_info;
-
- if (lag_upper_info &&
- lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) {
- extack = netdev_notifier_info_to_extack(&info->info);
- NL_SET_ERR_MSG_MOD(extack, "LAG device using unsupported Tx type");
-
- return NOTIFY_BAD;
- }
-
- break;
- }
case NETDEV_CHANGEUPPER: {
struct netdev_notifier_changeupper_info *info = ptr;
--
2.25.1
next prev parent reply other threads:[~2020-12-08 12:09 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 ` Vladimir Oltean [this message]
2020-12-15 15:56 ` [RFC PATCH net-next 05/16] net: mscc: ocelot: don't refuse bonding interfaces we can't offload 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
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=20201208120802.1268708-6-vladimir.oltean@nxp.com \
--to=vladimir.oltean@nxp.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tobias@waldekranz.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).