TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: lan966x: Extend lan966x_foreign_bridging_check

Browse Source 
Extend lan966x_foreign_bridging_check to check also if the upper
interface is a lag device. Don't allow a lan966x port to be part of a
lag if it has foreign interfaces.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Horatiu Vultur
2022-08-17 21:34:46 +02:00
committed by David S. Miller
parent d6208adfc9
commit a751ea4d74
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
+24 -8
View File
@@ -326,23 +326,25 @@ static int lan966x_port_prechangeupper(struct net_device *dev,
return NOTIFY_DONE;
}
static int lan966x_foreign_bridging_check(struct net_device *bridge,
static int lan966x_foreign_bridging_check(struct net_device *upper,
bool *has_foreign,
bool *seen_lan966x,
struct netlink_ext_ack *extack)
{
struct lan966x *lan966x = NULL;
bool has_foreign = false;
struct net_device *dev;
struct list_head *iter;
if (!netif_is_bridge_master(bridge))
if (!netif_is_bridge_master(upper) &&
!netif_is_lag_master(upper))
return 0;
netdev_for_each_lower_dev(bridge, dev, iter) {
netdev_for_each_lower_dev(upper, dev, iter) {
if (lan966x_netdevice_check(dev)) {
struct lan966x_port *port = netdev_priv(dev);
if (lan966x) {
/* Bridge already has at least one port of a
/* Upper already has at least one port of a
* lan966x switch inside it, check that it's
* the same instance of the driver.
*/
@@ -353,15 +355,24 @@ static int lan966x_foreign_bridging_check(struct net_device *bridge,
}
} else {
/* This is the first lan966x port inside this
* bridge
* upper device
*/
lan966x = port->lan966x;
*seen_lan966x = true;
}
} else if (netif_is_lag_master(dev)) {
/* Allow to have bond interfaces that have only lan966x
* devices
*/
if (lan966x_foreign_bridging_check(dev, has_foreign,
seen_lan966x,
extack))
return -EINVAL;
} else {
has_foreign = true;
*has_foreign = true;
}
if (lan966x && has_foreign) {
if (*seen_lan966x && *has_foreign) {
NL_SET_ERR_MSG_MOD(extack,
"Bridging lan966x ports with foreign interfaces disallowed");
return -EINVAL;
@@ -374,7 +385,12 @@ static int lan966x_foreign_bridging_check(struct net_device *bridge,
static int lan966x_bridge_check(struct net_device *dev,
struct netdev_notifier_changeupper_info *info)
{
bool has_foreign = false;
bool seen_lan966x = false;
return lan966x_foreign_bridging_check(info->upper_dev,
&has_foreign,
&seen_lan966x,
info->info.extack);
}