net/mlx5e: Offload flow rules to active lower representor

When a bond device is created over one or more non uplink representors,
and when a flow rule is offloaded to such bond device, offload a rule
to the active lower device.

Assuming that this is active-backup lag, the rules should be offloaded
to the active lower device which is the representor of the direct
path (not the failover).

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Vu Pham <vuhuong@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index f3e65a15c950145e6d725fc6bd62b6553d8269de..58f797da4d8d56f3745cae85932d67df4ecbd528 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -50,6 +50,7 @@
 #include <net/arp.h>
 #include <net/ipv6_stubs.h>
 #include <net/bareudp.h>
+#include <net/bonding.h>
 #include "en.h"
 #include "en_rep.h"
 #include "en/rep/tc.h"
@@ -3759,6 +3760,28 @@ static int parse_tc_vlan_action(struct mlx5e_priv *priv,
        return 0;
 }
 
+static struct net_device *get_fdb_out_dev(struct net_device *uplink_dev,
+                                         struct net_device *out_dev)
+{
+       struct net_device *fdb_out_dev = out_dev;
+       struct net_device *uplink_upper;
+
+       rcu_read_lock();
+       uplink_upper = netdev_master_upper_dev_get_rcu(uplink_dev);
+       if (uplink_upper && netif_is_lag_master(uplink_upper) &&
+           uplink_upper == out_dev) {
+               fdb_out_dev = uplink_dev;
+       } else if (netif_is_lag_master(out_dev)) {
+               fdb_out_dev = bond_option_active_slave_get_rcu(netdev_priv(out_dev));
+               if (fdb_out_dev &&
+                   (!mlx5e_eswitch_rep(fdb_out_dev) ||
+                    !netdev_port_same_parent_id(fdb_out_dev, uplink_dev)))
+                       fdb_out_dev = NULL;
+       }
+       rcu_read_unlock();
+       return fdb_out_dev;
+}
+
 static int add_vlan_push_action(struct mlx5e_priv *priv,
                                struct mlx5_esw_flow_attr *attr,
                                struct net_device **out_dev,
@@ -4074,7 +4097,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                        } else if (netdev_port_same_parent_id(priv->netdev, out_dev)) {
                                struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
                                struct net_device *uplink_dev = mlx5_eswitch_uplink_get_proto_dev(esw, REP_ETH);
-                               struct net_device *uplink_upper;
 
                                if (is_duplicated_output_device(priv->netdev,
                                                                out_dev,
@@ -4086,14 +4108,9 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                                ifindexes[if_count] = out_dev->ifindex;
                                if_count++;
 
-                               rcu_read_lock();
-                               uplink_upper =
-                                       netdev_master_upper_dev_get_rcu(uplink_dev);
-                               if (uplink_upper &&
-                                   netif_is_lag_master(uplink_upper) &&
-                                   uplink_upper == out_dev)
-                                       out_dev = uplink_dev;
-                               rcu_read_unlock();
+                               out_dev = get_fdb_out_dev(uplink_dev, out_dev);
+                               if (!out_dev)
+                                       return -ENODEV;
 
                                if (is_vlan_dev(out_dev)) {
                                        err = add_vlan_push_action(priv, attr,