net/mlx5e: Offload internal port as encap route device

When pefroming encap action, a route lookup is performed
to find the routing device the packet should be forwarded
to after the encapsulation. This is the device that has the
local tunnel ip address.

This change adds support to offload an encap rule where the
route device ends up being an ovs internal port.
In such case, the driver will add a HW rule that will encapsulate
the packet with the tunnel header and will overwrite the vport
metadata in reg_c0 to the internal port metadata value.
Finally, the packet will be forwarded to the root table to be
processed again with the indication that it came from an internal
port.

Signed-off-by: Ariel Levkovich <lariel@nvidia.com>
Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index d7e613d0139a2fea1378fe088162110ddb1ea18a..c57180d030c7ea2e17fa8f2cd9ebb5a1af03a57f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -83,7 +83,8 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv,
         */
        *route_dev = dev;
        if (!netdev_port_same_parent_id(priv->netdev, real_dev) ||
-           dst_is_lag_dev || is_vlan_dev(*route_dev))
+           dst_is_lag_dev || is_vlan_dev(*route_dev) ||
+           netif_is_ovs_master(*route_dev))
                *out_dev = uplink_dev;
        else if (mlx5e_eswitch_rep(dev) &&
                 mlx5e_is_valid_eswitch_fwd_dev(priv, dev))

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
index 1c44c6c345f5dc7966b26117750970621b246edc..660cca73c36c8f54a3b57c6850b2d1ce997dd52c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
@@ -13,6 +13,30 @@ enum {
        MLX5E_ROUTE_ENTRY_VALID     = BIT(0),
 };
 
+static int mlx5e_set_int_port_tunnel(struct mlx5e_priv *priv,
+                                    struct mlx5_flow_attr *attr,
+                                    struct mlx5e_encap_entry *e,
+                                    int out_index)
+{
+       struct net_device *route_dev;
+       int err = 0;
+
+       route_dev = dev_get_by_index(dev_net(e->out_dev), e->route_dev_ifindex);
+
+       if (!route_dev || !netif_is_ovs_master(route_dev))
+               goto out;
+
+       err = mlx5e_set_fwd_to_int_port_actions(priv, attr, e->route_dev_ifindex,
+                                               MLX5E_TC_INT_PORT_EGRESS,
+                                               &attr->action, out_index);
+
+out:
+       if (route_dev)
+               dev_put(route_dev);
+
+       return err;
+}
+
 struct mlx5e_route_key {
        int ip_version;
        union {
@@ -809,6 +833,17 @@ attach_flow:
        if (err)
                goto out_err;
 
+       err = mlx5e_set_int_port_tunnel(priv, attr, e, out_index);
+       if (err == -EOPNOTSUPP) {
+               /* If device doesn't support int port offload,
+                * redirect to uplink vport.
+                */
+               mlx5_core_dbg(priv->mdev, "attaching int port as encap dev not supported, using uplink\n");
+               err = 0;
+       } else if (err) {
+               goto out_err;
+       }
+
        flow->encaps[out_index].e = e;
        list_add(&flow->encaps[out_index].list, &e->flows);
        flow->encaps[out_index].index = out_index;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 21c37a1a4796cbb8fb574f02d67d98410337dd71..3a82ca79de64e3b68256375c9e65f0e05c18a2c3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1458,7 +1458,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
                        goto err_out;
 
                if (esw_attr->dests[out_index].flags &
-                   MLX5_ESW_DEST_CHAIN_WITH_SRC_PORT_CHANGE)
+                   MLX5_ESW_DEST_CHAIN_WITH_SRC_PORT_CHANGE &&
+                   !esw_attr->dest_int_port)
                        vf_tun = true;
                out_priv = netdev_priv(encap_dev);
                rpriv = out_priv->ppriv;
@@ -1566,7 +1567,8 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
 
        for (out_index = 0; out_index < MLX5_MAX_FLOW_FWD_VPORTS; out_index++) {
                if (esw_attr->dests[out_index].flags &
-                   MLX5_ESW_DEST_CHAIN_WITH_SRC_PORT_CHANGE)
+                   MLX5_ESW_DEST_CHAIN_WITH_SRC_PORT_CHANGE &&
+                   !esw_attr->dest_int_port)
                        vf_tun = true;
                if (esw_attr->dests[out_index].flags & MLX5_ESW_DEST_ENCAP) {
                        mlx5e_detach_encap(priv, flow, out_index);